propagate from branch 'im.pidgin.pidgin' (head e9d99eb2fc24b21c30a6956d81d8c9b81dc70d79)soc.2008.vv

            to branch 'im.pidgin.soc.2008.vv' (head 41f7d454556672156e373e3019b5a8dca4864a78)

271 files changed, 36343 insertions, 62805 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index a3bbccf3db..d71546c74c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -379,6 +379,7 @@ Shreevatsa R
 Dylan Simon <dylan@dylex.net>
 Ettore Simone
 John Silvestri
+Mukund Sivaraman
 Craig Slusher
 Alex Smith
 Brad Smith
@@ -393,6 +394,7 @@ Peter Speybrouck
 Lex Spoon
 Chris Stafford
 Kevin Stange
+Jakub Steiner
 Richard Stellingwerff
 Charlie Stockman
 David Stoddard
diff --git a/ChangeLog b/ChangeLog
index add7cedb75..16c3a68a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.0 (??/??/2008):
+version 2.5.0 (08/17/2008):
 	libpurple:
 	* Ability to create custom smileys (currently only the MSN protocol
 	  utilizes the feature). (Thanks to Mauro Sérgio Ferreira Brasil,
@@ -9,6 +9,8 @@ version 2.5.0 (??/??/2008):
 	  to specify a system-wide SSL CA certificates directory.  When set,
 	  we don't install our SSL CA certs, so it's important that the
 	  libpurple package depend on the CA certificates.
+	* Add SSL Certificates support to the NSS SSL plugin. (Thanks to Lou
+	  Cipher)
 
 	XMPP:
 	* Fix a bug that caused the UI to not refresh and caused the client
diff --git a/ChangeLog.API b/ChangeLog.API
index 64ebded44b..ebd39d08c6 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -6,7 +6,7 @@ version ?.?.? (??/??/????):
 		* PurpleMedia API
 		* xmlnode_get_parent
 
-version 2.5.0 (??/??/2008):
+version 2.5.0 (08/17/2008):
 	libpurple:
 		Added:
 		* Connection flag PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY to indicate
@@ -29,6 +29,9 @@ version 2.5.0 (??/??/2008):
 		* purple_get_host_name
 		* purple_util_fetch_url_len (temporary function overload to add max_len param)
 		* purple_util_fetch_url_request_len
+		* purple_prpl_send_attention
+		* purple_prpl_got_attention
+		* purple_prpl_got_attention_in_chat
 
 		Deprecated:
 		* purple_blist_update_buddy_icon
@@ -38,6 +41,8 @@ version 2.5.0 (??/??/2008):
 		* pidgin_set_custom_buddy_icon
 		* purple_util_fetch_url_len
 		* purple_util_fetch_url_request_len
+		* serv_send_attention
+		* serv_got_attention
 
 		Changed:
 		* xmlnode_copy now copies the prefix and namespace map for nodes.
diff --git a/ChangeLog.win32 b/ChangeLog.win32
index 5f16051d03..9ed7a763f4 100644
--- a/ChangeLog.win32
+++ b/ChangeLog.win32
@@ -1,5 +1,8 @@
-version 2.5.0 (??/??/2008):
+version 2.5.0 (08/17/2008):
 	* Don't install the GSSAPI SASL plugin on NT4 to avoid an error popup.
+	* Use the Kerberos for Windows libraries installed on the system (if
+	  present) instead of including enough to load the plugin (Kfw still
+	  needed to be installed for it to actually work before this change).
 	* Upgrade to Perl 5.10 (System Perl runtime must be upgraded for Perl
 	  plugins to continue to work).
 	* Upgrade SILC to use the 1.1.7 toolkit
diff --git a/NEWS b/NEWS
index e33c13573a..b4fcb7d385 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,31 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+2.5.0 (08/17/2008):
+	Daniel: Lots of good stuff in this release.  Lots of people have worked
+	very hard on the updated MSN protocol, and it's finally time to bring
+	it to the world!  There are myriad bugfixes, including some important
+	ones so you should be sure to update.
+
+	Hylke: Finally MSNP15 support. To celebrate this I refreshed a lot of
+	the smilies used in the protocol and added the long awaited indispensable
+	bunny icon. I think this is one of those releases that will make a lot
+	of users happy, especially MSN users.
+
+	Elliott: Oh look, my first NEWS! Well anyway, with that new MSNP15
+	support, this release is set up to be a huge success and a total flop
+	all at the same time. Here's hoping it's the "huge success" one for you.
+	Those icon changes that Hylke made, while minor, really make things look
+	a little cleaner, I think. Oh yea, did I mention that MSNP15 stuff?
+
+	Mark: Speaking of MSNP15, we'd like to welcome Elliott Sales de Andrade
+	as a full fledged developer!  He took the last few strides mushing the
+	new MSN code into shape.  Then he decided that wasn't enough and started
+	doing other great stuff.
+
+	Ka-Hing: "Reject"ing a certificate after your account is signed off is
+	not recommended. Deleting the file after you start sending it is also
+	discouraged.
+
 2.4.3 (07/01/2008):
 	Richard: This release includes important bug fixes.  I'm just cutting
 	the release.  Thank you to the real heroes who did the fixing!
diff --git a/configure.ac b/configure.ac
index 51cea4297e..15e630841e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2074,9 +2074,12 @@ if test "$enable_tcl" = yes; then
 	TCLCONFIG=no
 	TCLCONFIGDIRS="/usr/lib \
 			/usr/lib64 \
+			/usr/lib/tcl8.5 \
 			/usr/lib/tcl8.4 \
 			/usr/lib/tcl8.3 \
 			/usr/lib/tcl8.2 \
+			/usr/lib64/tcl8.5 \
+			/usr/lib64/tcl8.4 \
 			/System/Library/Tcl/8.3 \
 			/usr/local/lib"
 	for dir in $with_tclconfig $TCLCONFIGDIRS; do
diff --git a/finch/gntconv.c b/finch/gntconv.c
index 0a424b17fa..bb56ccb093 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -1289,6 +1289,7 @@ cmd_show_window(PurpleConversation *conv, const char *cmd, char **args, char **e
 	return PURPLE_CMD_STATUS_OK;
 }
 
+#if GLIB_CHECK_VERSION(2,6,0)
 static PurpleCmdRet
 cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
 {
@@ -1329,6 +1330,7 @@ cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char *
 
 	return PURPLE_CMD_STATUS_OK;
 }
+#endif
 
 static PurpleCmdRet
 users_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
@@ -1414,6 +1416,7 @@ void finch_conversation_init()
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
 	                  cmd_show_window, _("statuses: Show the savedstatuses window."), finch_savedstatus_show_all);
 
+#if GLIB_CHECK_VERSION(2,6,0)
 	/* Allow customizing the message colors using a command during run-time */
 	purple_cmd_register("msgcolor", "www", PURPLE_CMD_P_DEFAULT,
 			PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
@@ -1423,6 +1426,7 @@ void finch_conversation_init()
 				                 "    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>"
 								 "EXAMPLE:<br>    msgcolor send cyan default"),
 			NULL);
+#endif
 
 	purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(),
 					PURPLE_CALLBACK(update_buddy_typing), NULL);
diff --git a/libpurple/accountopt.h b/libpurple/accountopt.h
index ecc41b5a91..85aa181149 100644
--- a/libpurple/accountopt.h
+++ b/libpurple/accountopt.h
@@ -139,8 +139,10 @@ PurpleAccountOption *purple_account_option_string_new(const char *text,
  * The list passed will be owned by the account option, and the
  * strings inside will be freed automatically.
  *
- * The list is a list of PurpleKeyValuePair items. The key is the ID stored and
- * used internally, and the <tt>(const char *)</tt> value is the label displayed.
+ * The list is a list of #PurpleKeyValuePair items. The key is the label that
+ * should be displayed to the user, and the <tt>(const char *)</tt> value is
+ * the internal ID that should be passed to purple_account_set_string() to
+ * choose that value.
  *
  * @param text      The text of the option.
  * @param pref_name The account preference name for the option.
@@ -304,7 +306,10 @@ purple_account_option_get_masked(const PurpleAccountOption *option);
  *
  * @param option The account option.
  *
- * @constreturn The list values.
+ * @constreturn A list of #PurpleKeyValuePair, mapping the human-readable
+ *              description of the value to the <tt>(const char *)</tt> that
+ *              should be passed to purple_account_set_string() to set the
+ *              option.
  */
 GList *purple_account_option_get_list(const PurpleAccountOption *option);
 
diff --git a/libpurple/certificate.c b/libpurple/certificate.c
index ca2a3421f3..04c59d0ae0 100644
--- a/libpurple/certificate.c
+++ b/libpurple/certificate.c
@@ -746,7 +746,7 @@ x509_ca_init(void)
 						   "ca-certs", NULL));
 #else
 # ifdef SSL_CERTIFICATES_DIR
-		x509_ca_paths = g_list_append(NULL, SSL_CERTIFICATES_DIR);
+		x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR));
 # else
 		x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR,
 						   "purple", "ca-certs", NULL));
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
index 407067c8ae..34fbaa9c0a 100644
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -80,8 +80,6 @@ send_typed_cb(gpointer data)
 		purple_conv_im_set_type_again(PURPLE_CONV_IM(conv), 1);
 
 		serv_send_typing(gc, name, PURPLE_TYPED);
-		purple_signal_emit(purple_conversations_get_handle(),
-						 "buddy-typed", conv->account, conv->name);
 
 		purple_debug(PURPLE_DEBUG_MISC, "conversation", "typed...\n");
 	}
diff --git a/libpurple/eventloop.h b/libpurple/eventloop.h
index 50b1bf580a..1d363cc89a 100644
--- a/libpurple/eventloop.h
+++ b/libpurple/eventloop.h
@@ -67,6 +67,10 @@ struct _PurpleEventLoopUiOps
 	 *
 	 * Analogous to g_timeout_add in glib.
 	 *
+	 * Note: On Win32, this function may be called from a thread other than
+	 * the libpurple thread.  You should make sure to detect this situation
+	 * and to only call "function" from the libpurple thread.
+	 *
 	 * @param interval the interval in <em>milliseconds</em> between calls
 	 *                 to @a function.
 	 * @param data     arbitrary data to be passed to @a function at each
diff --git a/libpurple/network.c b/libpurple/network.c
index a990eff11e..a03c4c1a88 100644
--- a/libpurple/network.c
+++ b/libpurple/network.c
@@ -351,7 +351,9 @@ purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkList
 	}
 	flags = fcntl(listenfd, F_GETFL);
 	fcntl(listenfd, F_SETFL, flags | O_NONBLOCK);
-
+#ifndef _WIN32
+	fcntl(listenfd, F_SETFD, FD_CLOEXEC);
+#endif
 	actual_port = purple_network_get_port_from_fd(listenfd);
 
 	purple_debug_info("network", "Listening on port: %hu\n", actual_port);
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index 1486d874f7..a62f6b9f8f 100644
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -60,6 +60,7 @@ typedef struct
 
 static const PRIOMethods *_nss_methods = NULL;
 static PRDescIdentity _identity;
+static PurpleCertificateScheme x509_nss;
 
 /* Thank you, Evolution */
 static void
@@ -172,6 +173,7 @@ ssl_auth_cert(void *arg, PRFileDesc *socket, PRBool checksig,
 #endif
 }
 
+#if 0
 static SECStatus
 ssl_bad_cert(void *arg, PRFileDesc *socket)
 {
@@ -211,6 +213,7 @@ ssl_bad_cert(void *arg, PRFileDesc *socket)
 
 	return status;
 }
+#endif
 
 static gboolean
 ssl_nss_init(void)
@@ -227,6 +230,82 @@ ssl_nss_uninit(void)
 }
 
 static void
+ssl_nss_verified_cb(PurpleCertificateVerificationStatus st,
+		       gpointer userdata)
+{
+	PurpleSslConnection *gsc = (PurpleSslConnection *) userdata;
+
+	if (st == PURPLE_CERTIFICATE_VALID) {
+		/* Certificate valid? Good! Do the connection! */
+		gsc->connect_cb(gsc->connect_cb_data, gsc, PURPLE_INPUT_READ);
+	} else {
+		/* Otherwise, signal an error */
+		if(gsc->error_cb != NULL)
+			gsc->error_cb(gsc, PURPLE_SSL_CERTIFICATE_INVALID,
+				      gsc->connect_cb_data);
+		purple_ssl_close(gsc);
+	}
+}
+
+/** Transforms an NSS containing an X.509 certificate into a Certificate instance
+ *
+ * @param cert   Certificate to transform
+ * @return A newly allocated Certificate
+ */
+static PurpleCertificate *
+x509_import_from_nss(CERTCertificate* cert)
+{
+	/* New certificate to return */
+	PurpleCertificate * crt;
+
+	/* Allocate the certificate and load it with data */
+	crt = g_new0(PurpleCertificate, 1);
+	crt->scheme = &x509_nss;
+	crt->data = CERT_DupCertificate(cert);
+
+	return crt;
+}
+
+static GList *
+ssl_nss_get_peer_certificates(PRFileDesc *socket, PurpleSslConnection * gsc)
+{
+	CERTCertificate *curcert;
+	CERTCertificate *issuerCert;
+	PurpleCertificate * newcrt;
+
+	/* List of Certificate instances to return */
+	GList * peer_certs = NULL;
+	int count;
+	int64 now = PR_Now();
+	
+	curcert = SSL_PeerCertificate(socket);
+	if (curcert == NULL) {
+		purple_debug_error("nss", "could not DupCertificate\n");
+		return NULL;
+	}
+	
+	for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
+		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName);
+		newcrt = x509_import_from_nss(curcert);
+		peer_certs = g_list_append(peer_certs, newcrt);
+
+		if (curcert->isRoot) {
+			break;
+		}
+		issuerCert = CERT_FindCertIssuer(curcert, now, certUsageSSLServer);
+		if (!issuerCert) {
+			purple_debug_error("nss", "partial certificate chain\n");
+			break;
+		}
+		CERT_DestroyCertificate(curcert);
+		curcert = issuerCert;
+	}
+	CERT_DestroyCertificate(curcert);
+
+	return peer_certs;
+}
+
+static void
 ssl_nss_handshake_cb(gpointer data, int fd, PurpleInputCondition cond)
 {
 	PurpleSslConnection *gsc = (PurpleSslConnection *)data;
@@ -256,7 +335,25 @@ ssl_nss_handshake_cb(gpointer data, int fd, PurpleInputCondition cond)
 	purple_input_remove(nss_data->handshake_handler);
 	nss_data->handshake_handler = 0;
 
-	gsc->connect_cb(gsc->connect_cb_data, gsc, cond);
+	/* If a Verifier was given, hand control over to it */
+	if (gsc->verifier) {
+		GList *peers;
+		/* First, get the peer cert chain */
+		peers = ssl_nss_get_peer_certificates(nss_data->in, gsc);
+
+		/* Now kick off the verification process */
+		purple_certificate_verify(gsc->verifier,
+				gsc->host,
+				peers,
+				ssl_nss_verified_cb,
+				gsc);
+
+		purple_certificate_destroy_list(peers);
+	} else {
+		/* Otherwise, just call the "connection complete"
+		   callback */
+		gsc->connect_cb(gsc->connect_cb_data, gsc, cond);
+	}
 }
 
 static void
@@ -310,7 +407,10 @@ ssl_nss_connect(PurpleSslConnection *gsc)
 	SSL_AuthCertificateHook(nss_data->in,
 							(SSLAuthCertificate)ssl_auth_cert,
 							(void *)CERT_GetDefaultCertDB());
+#if 0
+	/* No point in hooking BadCert, since ssl_auth_cert always succeeds */
 	SSL_BadCertHook(nss_data->in, (SSLBadCertHandler)ssl_bad_cert, NULL);
+#endif
 
 	if(gsc->host)
 		SSL_SetURL(nss_data->in, gsc->host);
@@ -566,7 +666,20 @@ static gboolean
 x509_signed_by(PurpleCertificate * crt,
 	       PurpleCertificate * issuer)
 {
-	return TRUE;
+	CERTCertificate *subjectCert;
+	CERTCertificate *issuerCert;
+	SECStatus st;
+	
+	issuerCert = X509_NSS_DATA(issuer);
+	g_return_val_if_fail(issuerCert, FALSE);
+
+	subjectCert = X509_NSS_DATA(crt);
+	g_return_val_if_fail(subjectCert, FALSE);
+
+	if ( PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0 )
+		return FALSE;
+	st = CERT_VerifySignedData(&subjectCert->signatureWrap, issuerCert, PR_Now(), NULL);
+	return st == SECSuccess;
 }
 
 static GByteArray *
diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c
index b3c7a342a5..2e67567d8d 100644
--- a/libpurple/protocols/bonjour/bonjour_ft.c
+++ b/libpurple/protocols/bonjour/bonjour_ft.c
@@ -633,6 +633,9 @@ bonjour_sock5_request_cb(gpointer data, gint source, PurpleInputCondition cond)
 
 			flags = fcntl(acceptfd, F_GETFL);
 			fcntl(acceptfd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+			fcntl(acceptfd, F_SETFD, FD_CLOEXEC);
+#endif
 
 			purple_input_remove(xfer->watcher);
 			close(source);
diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
index b509a40be5..fce9d025ee 100644
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -637,6 +637,9 @@ _server_socket_handler(gpointer data, int server_socket, PurpleInputCondition co
 
 	flags = fcntl(client_socket, F_GETFL);
 	fcntl(client_socket, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(client_socket, F_SETFD, FD_CLOEXEC);
+#endif
 
 	/* Look for the buddy that has opened the conversation and fill information */
 	address_text = inet_ntoa(their_addr.sin_addr);
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index 9c63606351..4b8de2ca3a 100644
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -1834,7 +1834,7 @@ static int ggp_to_gg_status(PurpleStatus *status, char **msg)
 	int new_status, new_status_descr;
 	const char *new_msg;
 
-	g_return_val_if_fail(msg == NULL, 0);
+	g_return_val_if_fail(msg != NULL, 0);
 
 	purple_debug_info("gg", "ggp_to_gg_status: Requested status = %s\n",
 			status_id);
diff --git a/libpurple/protocols/irc/dcc_send.c b/libpurple/protocols/irc/dcc_send.c
index 5c60abd5e4..61937c8e8e 100644
--- a/libpurple/protocols/irc/dcc_send.c
+++ b/libpurple/protocols/irc/dcc_send.c
@@ -245,7 +245,7 @@ static gssize irc_dccsend_send_write(const guchar *buffer, size_t size, PurpleXf
 static void irc_dccsend_send_connected(gpointer data, int source, PurpleInputCondition cond) {
 	PurpleXfer *xfer = (PurpleXfer *) data;
 	struct irc_xfer_send_data *xd = xfer->data;
-	int conn;
+	int conn, flags;
 
 	conn = accept(xd->fd, NULL, 0);
 	if (conn == -1) {
@@ -262,6 +262,12 @@ static void irc_dccsend_send_connected(gpointer data, int source, PurpleInputCon
 	close(xd->fd);
 	xd->fd = -1;
 
+	flags = fcntl(conn, F_GETFL);
+	fcntl(conn, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(conn, F_SETFD, FD_CLOEXEC);
+#endif
+
 	xd->inpa = purple_input_add(conn, PURPLE_INPUT_READ, irc_dccsend_send_read, xfer);
 	/* Start the transfer */
 	purple_xfer_start(xfer, conn, NULL, 0);
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index 785c09b38b..0d9ed7afe9 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -37,6 +37,8 @@
 #include "pep.h"
 #include "adhoccommands.h"
 
+#define MAX_HTTP_BUDDYICON_BYTES (200 * 1024)
+
 typedef struct {
 	long idle_seconds;
 } JabberBuddyInfoResource;
@@ -1535,18 +1537,27 @@ void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xml
 			}
 		}
 		if(goodinfo) {
-			const char *url = xmlnode_get_attrib(goodinfo,"url");
+			const char *url = xmlnode_get_attrib(goodinfo, "url");
 			const char *id = xmlnode_get_attrib(goodinfo,"id");
 			
 			/* the avatar might either be stored in a pep node, or on a HTTP/HTTPS URL */
 			if(!url)
 				jabber_pep_request_item(js, from, AVATARNAMESPACEDATA, id, do_buddy_avatar_update_data);
 			else {
+				PurpleUtilFetchUrlData *url_data;
 				JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1);
 				info->js = js;
-				info->from = g_strdup(from);
-				info->id = g_strdup(id);
-				purple_util_fetch_url(url, TRUE, NULL, TRUE, do_buddy_avatar_update_fromurl, info);
+
+				url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE,
+										  MAX_HTTP_BUDDYICON_BYTES,
+										  do_buddy_avatar_update_fromurl, info);
+				if (url_data) {
+					info->from = g_strdup(from);
+					info->id = g_strdup(id);
+					js->url_datas = g_slist_prepend(js->url_datas, url_data);
+				} else
+					g_free(info);
+
 			}
 		}
 	}
diff --git a/libpurple/protocols/jabber/caps.c b/libpurple/protocols/jabber/caps.c
index 3b3bb07d61..33b27eca00 100644
--- a/libpurple/protocols/jabber/caps.c
+++ b/libpurple/protocols/jabber/caps.c
@@ -438,8 +438,6 @@ static void jabber_caps_client_iqcb(JabberStream *js, xmlnode *packet, gpointer
 	/* collect data and fetch all exts */
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
 		"http://jabber.org/protocol/disco#info");
-	xmlnode *child;
-	GList *iter;
 	jabber_caps_cbplususerdata *userdata = data;
 
 	/* TODO: Better error checking! */
@@ -447,6 +445,8 @@ static void jabber_caps_client_iqcb(JabberStream *js, xmlnode *packet, gpointer
 	if (query) {
 		JabberCapsValue *value = g_new0(JabberCapsValue, 1);
 		JabberCapsKey *key = g_new0(JabberCapsKey, 1);
+		xmlnode *child;
+		GList *iter;
 
 		value->ext = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_caps_ext_destroy_value);
 
@@ -476,23 +476,29 @@ static void jabber_caps_client_iqcb(JabberStream *js, xmlnode *packet, gpointer
 		}
 		g_hash_table_replace(capstable, key, value);
 		jabber_caps_store();
-	}
 
-	/* fetch all exts */
-	for(iter = userdata->ext; iter; iter = g_list_next(iter)) {
-		JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
-		xmlnode *query = xmlnode_get_child_with_namespace(iq->node, "query", "http://jabber.org/protocol/disco#info");
-		char *node = g_strdup_printf("%s#%s", userdata->node, (const char*)iter->data);
-		jabber_ext_userdata *ext_data = g_new0(jabber_ext_userdata, 1);
-		ext_data->node = node;
-		ext_data->userdata = userdata;
 
-		xmlnode_set_attrib(query, "node", node);
-		xmlnode_set_attrib(iq->node, "to", userdata->who);
+		/* fetch all exts */
+		for(iter = userdata->ext; iter; iter = g_list_next(iter)) {
+			JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET,
+				"http://jabber.org/protocol/disco#info");
+			xmlnode *query = xmlnode_get_child_with_namespace(iq->node,
+				"query", "http://jabber.org/protocol/disco#info");
+			char *node = g_strdup_printf("%s#%s", userdata->node, (const char*)iter->data);
+			jabber_ext_userdata *ext_data = g_new0(jabber_ext_userdata, 1);
+			ext_data->node = node;
+			ext_data->userdata = userdata;
 
-		jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, ext_data);
-		jabber_iq_send(iq);
-	}
+			xmlnode_set_attrib(query, "node", node);
+			xmlnode_set_attrib(iq->node, "to", userdata->who);
+
+			jabber_iq_set_callback(iq, jabber_caps_ext_iqcb, ext_data);
+			jabber_iq_send(iq);
+		}
+
+	} else
+		/* Don't wait for the ext discoveries; they aren't going to happen */
+		userdata->extOutstanding = 0;
 
 	jabber_caps_get_info_check_completion(userdata);
 }
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 69fb1c86a1..241be17706 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -1341,6 +1341,11 @@ void jabber_close(PurpleConnection *gc)
 		js->bs_proxies = g_list_delete_link(js->bs_proxies, js->bs_proxies);
 	}
 
+	while(js->url_datas) {
+		purple_util_fetch_url_cancel(js->url_datas->data);
+		js->url_datas = g_slist_delete_link(js->url_datas, js->url_datas);
+	}
+
 	g_free(js->stream_id);
 	if(js->user)
 		jabber_id_free(js->user);
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index 7d50c8aa33..a5a1570f6a 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -238,6 +238,11 @@ struct _JabberStream
 	PurpleSrvResponse *srv_rec;
 	guint srv_rec_idx;
 	guint max_srv_rec_idx;
+	/**
+	 * This linked list contains PurpleUtilFetchUrlData structs
+	 * for when we lookup buddy icons from a url
+	 */
+	GSList *url_datas;
 
 #ifdef USE_VV
 	/* keep a hash table of JingleSessions */
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index aa6a6b9703..24c273731c 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -614,7 +614,7 @@ jabber_si_xfer_bytestreams_send_connected_cb(gpointer data, gint source,
 {
 	PurpleXfer *xfer = data;
 	JabberSIXfer *jsx = xfer->data;
-	int acceptfd;
+	int acceptfd, flags;
 
 	purple_debug_info("jabber", "in jabber_si_xfer_bytestreams_send_connected_cb\n");
 
@@ -631,6 +631,12 @@ jabber_si_xfer_bytestreams_send_connected_cb(gpointer data, gint source,
 	close(source);
 	jsx->local_streamhost_fd = -1;
 
+	flags = fcntl(acceptfd, F_GETFL);
+	fcntl(acceptfd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(acceptfd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	xfer->watcher = purple_input_add(acceptfd, PURPLE_INPUT_READ,
 					 jabber_si_xfer_bytestreams_send_read_cb, xfer);
 }
@@ -967,7 +973,7 @@ static void jabber_si_xfer_free(PurpleXfer *xfer)
 	g_free(jsx->rxqueue);
 	g_free(jsx);
 	xfer->data = NULL;
-	
+
 	purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p", jsx);
 }
 
diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c
index b05731524c..8bf40cf44e 100644
--- a/libpurple/protocols/msn/contact.c
+++ b/libpurple/protocols/msn/contact.c
@@ -214,6 +214,7 @@ static void
 msn_create_address_book(MsnSession *session)
 {
 	gchar *body;
+	gchar *token_str;
 
 	g_return_if_fail(session != NULL);
 	g_return_if_fail(session->user != NULL);
@@ -221,9 +222,11 @@ msn_create_address_book(MsnSession *session)
 	
 	purple_debug_info("msn", "Creating an Address Book.\n");
 
-	body = g_markup_printf_escaped(MSN_ADD_ADDRESSBOOK_TEMPLATE,
-		msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS),
-		session->user->passport);
+	token_str = g_markup_escape_text(
+		msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS), -1);
+	body = g_strdup_printf(MSN_ADD_ADDRESSBOOK_TEMPLATE,
+		token_str, session->user->passport);
+	g_free(token_str);
 
 	msn_soap_message_send(session,
 		msn_soap_message_new(MSN_ADD_ADDRESSBOOK_SOAP_ACTION,
@@ -398,6 +401,7 @@ msn_get_contact_list(MsnSession *session,
 {
 	gchar *body = NULL;
 	gchar *update_str = NULL;
+	gchar *token_str;
 	GetContactListCbData cb_data = { session, partner_scenario };
 	const gchar *partner_scenario_str = MsnSoapPartnerScenarioText[partner_scenario];
 
@@ -405,12 +409,14 @@ msn_get_contact_list(MsnSession *session,
 
 	if (update_time != NULL) {
 		purple_debug_info("msn", "CL Last update time: %s\n", update_time);
-		update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML,update_time);
+		update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML, update_time);
 	}
 
-	body = g_markup_printf_escaped(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str,
-		msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS),
-		update_str ? update_str : "");
+	token_str = g_markup_escape_text(
+		msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS), -1);
+	body = g_strdup_printf(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str,
+		token_str, update_str ? update_str : "");
+	g_free(token_str);
 
 	msn_soap_message_send(session,
 		msn_soap_message_new(MSN_GET_CONTACT_SOAP_ACTION,
@@ -798,6 +804,7 @@ msn_get_address_book(MsnSession *session,
 	const char *dynamicItemLastChange)
 {
 	char *body, *update_str = NULL;
+	gchar *token_str;
 
 	purple_debug_misc("msn", "Getting Address Book\n");
 
@@ -807,10 +814,13 @@ msn_get_address_book(MsnSession *session,
 	else if (LastChanged != NULL)
 		update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, LastChanged);
 
-	body = g_markup_printf_escaped(MSN_GET_ADDRESS_TEMPLATE,
+	token_str = g_markup_escape_text(
+		msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS), -1);
+	body = g_strdup_printf(MSN_GET_ADDRESS_TEMPLATE,
 		MsnSoapPartnerScenarioText[partner_scenario],
-		msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS),
+		token_str,
 		update_str ? update_str : "");
+	g_free(token_str);
 
 	msn_soap_message_send(session,
 		msn_soap_message_new(MSN_GET_ADDRESS_SOAP_ACTION,
diff --git a/libpurple/protocols/msn/contact.h b/libpurple/protocols/msn/contact.h
index 45fccff653..04a9a4f9d7 100644
--- a/libpurple/protocols/msn/contact.h
+++ b/libpurple/protocols/msn/contact.h
@@ -26,6 +26,7 @@
 #define _MSN_CONTACT_H_
 
 #include "session.h"
+#include "soap.h"
 
 #define MSN_APPLICATION_ID "CFE80F9D-180F-4399-82AB-413F33A1FA11"
 
@@ -604,7 +605,7 @@ struct _MsnCallbackState
 	xmlnode *token;
 	const gchar *post_action;
 	const gchar *post_url;
-	/* MsnSoapCallback */ void *cb;
+	MsnSoapCallback cb;
 };
 
 typedef enum
diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c
index 434944d1e9..7c5b1a5005 100644
--- a/libpurple/protocols/msn/directconn.c
+++ b/libpurple/protocols/msn/directconn.c
@@ -158,17 +158,20 @@ create_listener(int port)
 
 	flags = fcntl(fd, F_GETFL);
 	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
 
 	return fd;
 }
 
-static size_t
+static gssize
 msn_directconn_write(MsnDirectConn *directconn,
 					 const char *data, size_t len)
 {
 	char *buffer, *tmp;
 	size_t buf_size;
-	size_t ret;
+	gssize ret;
 	guint32 sent_len;
 
 	g_return_val_if_fail(directconn != NULL, 0);
@@ -274,7 +277,8 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnDirectConn* directconn;
 	char *body;
-	size_t len, body_len;
+	size_t body_len;
+	gssize len;
 
 	purple_debug_info("msn", "read_cb: %d, %d\n", source, cond);
 
diff --git a/libpurple/protocols/msn/httpconn.c b/libpurple/protocols/msn/httpconn.c
index 624186cf07..3db6381e6d 100644
--- a/libpurple/protocols/msn/httpconn.c
+++ b/libpurple/protocols/msn/httpconn.c
@@ -274,7 +274,8 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 	MsnSession *session;
 	char buf[MSN_BUF_LEN];
 	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
+	gssize len;
+	int cur_len;
 	char *result_msg = NULL;
 	size_t result_len = 0;
 	gboolean error = FALSE;
@@ -405,7 +406,8 @@ static void
 httpconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnHttpConn *httpconn;
-	int ret, writelen;
+	gssize ret;
+	int writelen;
 
 	httpconn = data;
 	writelen = purple_circ_buffer_get_max_read(httpconn->tx_buf);
@@ -727,7 +729,8 @@ connect_cb(gpointer data, gint source, const gchar *error_message)
 	}
 	else
 	{
-		purple_debug_error("msn", "HTTP: Connection error\n");
+		purple_debug_error("msn", "HTTP: Connection error: %s\n",
+		                   error_message ? error_message : "(null)");
 		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT);
 	}
 }
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index a6b5cdc36b..0e6b5128b9 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -48,6 +48,7 @@
 #include "slplink.h"
 
 #if PHOTO_SUPPORT
+#define MAX_HTTP_BUDDYICON_BYTES (200 * 1024)
 #include "imgstore.h"
 #endif
 
@@ -162,7 +163,7 @@ msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **
 
 	username = purple_conversation_get_name(conv);
 
-	serv_send_attention(gc, username, MSN_NUDGE);
+	purple_prpl_send_attention(gc, username, MSN_NUDGE);
 
 	return PURPLE_CMD_RET_OK;
 }
@@ -712,10 +713,16 @@ msn_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboolean f
 		if (name != NULL && *name) {
 			char *tmp2;
 
+			tmp2 = g_markup_escape_text(name, -1);
 			if (purple_presence_is_idle(presence)) {
-				tmp2 = g_markup_printf_escaped("%s/%s", name, _("Idle"));
-			} else {
-				tmp2 = g_markup_escape_text(name, -1);
+				char *idle;
+				char *tmp3;
+				/* Never know what those translations might end up like... */
+				idle = g_markup_escape_text(_("Idle"), -1);
+				tmp3 = g_strdup_printf("%s/%s", tmp2, idle);
+				g_free(idle);
+				g_free(tmp2);
+				tmp2 = tmp3;
 			}
 
 			if (psm != NULL && *psm) {
@@ -1886,6 +1893,7 @@ msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data,
 	purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text);
 
 	/* Make sure the connection is still valid */
+	/* TODO: Instead of this, we should be canceling this when we disconnect */
 	if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL)
 	{
 		purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n");
@@ -2275,7 +2283,7 @@ msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data,
 	/* Try to put the photo in there too, if there's one */
 	if (photo_url_text)
 	{
-		purple_util_fetch_url(photo_url_text, FALSE, NULL, FALSE, msn_got_photo,
+		purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE, MAX_HTTP_BUDDYICON_BYTES, msn_got_photo,
 					   info2_data);
 	}
 	else
@@ -2301,6 +2309,7 @@ msn_got_photo(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 	char *photo_url_text = info2_data->photo_url_text;
 
 	/* Make sure the connection is still valid if we got here by fetching a photo url */
+	/* TODO: Instead of this, we should be canceling this when we disconnect */
 	if (url_text && (error_message != NULL ||
 					 g_list_find(purple_connections_get_all(), info_data->gc) == NULL))
 	{
diff --git a/libpurple/protocols/msn/nexus.c b/libpurple/protocols/msn/nexus.c
index a016e5a33d..d6e5500b84 100644
--- a/libpurple/protocols/msn/nexus.c
+++ b/libpurple/protocols/msn/nexus.c
@@ -379,7 +379,8 @@ msn_nexus_connect(MsnNexus *nexus)
 {
 	MsnSession *session = nexus->session;
 	const char *username;
-	char *password;
+	const char *password;
+	char *password_xml;
 	GString *domains;
 	char *request;
 	int i;
@@ -390,7 +391,8 @@ msn_nexus_connect(MsnNexus *nexus)
 	msn_session_set_login_step(session, MSN_LOGIN_STEP_GET_COOKIE);
 
 	username = purple_account_get_username(session->account);
-	password = g_markup_escape_text(purple_connection_get_password(session->account->gc), 16);
+	password = purple_connection_get_password(session->account->gc);
+	password_xml = g_markup_escape_text(password, MIN(strlen(password), 16));
 
 	purple_debug_info("msn", "Logging on %s, with policy '%s', nonce '%s'\n",
 	                  username, nexus->policy, nexus->nonce);
@@ -405,8 +407,8 @@ msn_nexus_connect(MsnNexus *nexus)
 		                           nexus->policy);
 	}
 
-	request = g_strdup_printf(MSN_SSO_TEMPLATE, username, password, domains->str);
-	g_free(password);
+	request = g_strdup_printf(MSN_SSO_TEMPLATE, username, password_xml, domains->str);
+	g_free(password_xml);
 	g_string_free(domains, TRUE);
 
 	soap = msn_soap_message_new(NULL, xmlnode_from_str(request, -1));
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index 9d11bd432d..ddf48700d4 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -1173,7 +1173,7 @@ not_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, size_t len)
 static void
 not_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	cmdproc->servconn->payload_len = atoi(cmd->params[0]);
+	cmd->payload_len = atoi(cmd->params[0]);
 	cmdproc->last_cmd->payload_cb = not_cmd_post;
 }
 
diff --git a/libpurple/protocols/msn/page.c b/libpurple/protocols/msn/page.c
index c35b4bf1d3..a357af4da7 100644
--- a/libpurple/protocols/msn/page.c
+++ b/libpurple/protocols/msn/page.c
@@ -50,12 +50,15 @@ char *
 msn_page_gen_payload(const MsnPage *page, size_t *ret_size)
 {
 	char *str;
+	char *body;
 
 	g_return_val_if_fail(page != NULL, NULL);
 
-	str = g_markup_printf_escaped(
+	body = g_markup_escape_text(msn_page_get_body(page), -1);
+	str = g_strdup_printf(
 			"<TEXT xml:space=\"preserve\" enc=\"utf-8\">%s</TEXT>",
-			msn_page_get_body(page));
+			body);
+	g_free(body);
 
 	if (ret_size != NULL)
 		*ret_size = strlen(str);
diff --git a/libpurple/protocols/msn/servconn.c b/libpurple/protocols/msn/servconn.c
index 96a164f391..a3bc5996f7 100644
--- a/libpurple/protocols/msn/servconn.c
+++ b/libpurple/protocols/msn/servconn.c
@@ -301,7 +301,8 @@ static void
 servconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnServConn *servconn = data;
-	int ret, writelen;
+	gssize ret;
+	int writelen;
 
 	writelen = purple_circ_buffer_get_max_read(servconn->tx_buf);
 
@@ -385,7 +386,8 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 	MsnSession *session;
 	char buf[MSN_BUF_LEN];
 	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
+	gssize len;
+	int cur_len;
 
 	servconn = data;
 	session = servconn->session;
@@ -399,7 +401,7 @@ read_cb(gpointer data, gint source, PurpleInputCondition cond)
 
 	} else if (len <= 0) {
 		purple_debug_error("msn", "servconn read error,"
-		                          "len: %d, errno: %d, error: %s\n",
+		                          "len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n",
 		                          len, errno, g_strerror(errno));
 		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
 
@@ -555,6 +557,9 @@ create_listener(int port)
 
 	flags = fcntl(fd, F_GETFL);
 	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
 
 	return fd;
 }
diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index 027ed1865e..35fb93563d 100644
--- a/libpurple/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
@@ -57,6 +57,9 @@ msn_session_destroy(MsnSession *session)
 
 	session->destroying = TRUE;
 
+	if (session->connected)
+		msn_session_disconnect(session);
+
 	if (session->soap_cleanup_handle)
 		purple_timeout_remove(session->soap_cleanup_handle);
 
@@ -84,9 +87,6 @@ msn_session_destroy(MsnSession *session)
 	if (session->notification != NULL)
 		msn_notification_destroy(session->notification);
 
-	if (session->connected)
-		msn_session_disconnect(session);
-
 	msn_userlist_destroy(session->userlist);
 
 	g_free(session->psm);
diff --git a/libpurple/protocols/msn/soap.c b/libpurple/protocols/msn/soap.c
index 30c59e4aea..f4fa5372b2 100644
--- a/libpurple/protocols/msn/soap.c
+++ b/libpurple/protocols/msn/soap.c
@@ -38,7 +38,7 @@
 #endif
 
 #define SOAP_TIMEOUT (5 * 60)
-#define MSN_UNSAFE_DEBUG 1
+
 typedef struct _MsnSoapRequest {
 	char *path;
 	MsnSoapMessage *message;
@@ -312,10 +312,10 @@ msn_soap_process(MsnSoapConnection *conn) {
 
 #ifndef MSN_UNSAFE_DEBUG
 	if (conn->current_request->secure)
-		purple_debug_info("soap", "Received secure request.\n");
+		purple_debug_misc("soap", "Received secure request.\n");
 	else
 #endif
-	purple_debug_info("soap", "current %s\n", conn->buf->str);
+	purple_debug_misc("soap", "current %s\n", conn->buf->str);
 
 	cursor = conn->buf->str + conn->handled_len;
 
@@ -514,10 +514,10 @@ msn_soap_connection_run(gpointer data)
 
 #ifndef MSN_UNSAFE_DEBUG
 			if (req->secure)
-				purple_debug_info("soap", "Sending secure request.\n");
+				purple_debug_misc("soap", "Sending secure request.\n");
 			else
 #endif
-			purple_debug_info("soap", "%s\n", conn->buf->str);
+			purple_debug_misc("soap", "%s\n", conn->buf->str);
 
 			conn->handled_len = 0;
 			conn->current_request = req;
diff --git a/libpurple/protocols/msn/state.c b/libpurple/protocols/msn/state.c
index e58a448524..666799e428 100644
--- a/libpurple/protocols/msn/state.c
+++ b/libpurple/protocols/msn/state.c
@@ -61,23 +61,23 @@ msn_build_psm(const char *psmstr,const char *mediastr, const char *guidstr)
 
 	psmNode = xmlnode_new("PSM");
 	if(psmstr != NULL){
-		xmlnode_insert_data(psmNode,psmstr,strlen(psmstr));
+		xmlnode_insert_data(psmNode, psmstr, -1);
 	}
-	xmlnode_insert_child(dataNode,psmNode);
+	xmlnode_insert_child(dataNode, psmNode);
 
 	mediaNode = xmlnode_new("CurrentMedia");
 	if(mediastr != NULL){
-		xmlnode_insert_data(mediaNode,mediastr,strlen(mediastr));
+		xmlnode_insert_data(mediaNode, mediastr, -1);
 	}
-	xmlnode_insert_child(dataNode,mediaNode);
+	xmlnode_insert_child(dataNode, mediaNode);
 
 	guidNode = xmlnode_new("MachineGuid");
 	if(guidstr != NULL){
-		xmlnode_insert_data(guidNode,guidstr,strlen(guidstr));
+		xmlnode_insert_data(guidNode, guidstr, -1);
 	}
-	xmlnode_insert_child(dataNode,guidNode);
+	xmlnode_insert_child(dataNode, guidNode);
 
-	result = xmlnode_to_str(dataNode,&length);
+	result = xmlnode_to_str(dataNode, &length);
 	xmlnode_free(dataNode);
 	return result;
 }
diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c
index 3e113f7dab..78c6d35410 100644
--- a/libpurple/protocols/msn/switchboard.c
+++ b/libpurple/protocols/msn/switchboard.c
@@ -114,6 +114,11 @@ msn_switchboard_destroy(MsnSwitchBoard *swboard)
 	session = swboard->session;
 	session->switches = g_list_remove(session->switches, swboard);
 
+	for (l = session->slplinks; l; l = l->next) {
+		MsnSlpLink *slplink = l->data;
+		if (slplink->swboard == swboard) slplink->swboard = NULL;
+	}
+
 #if 0
 	/* This should never happen or we are in trouble. */
 	if (swboard->servconn != NULL)
@@ -540,7 +545,7 @@ release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
 	payload = msn_message_gen_payload(msg, &payload_len);
 
 #ifdef MSN_DEBUG_SB
-	purple_debug_info("msn", "SB length:{%d}", payload_len);
+	purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}", payload_len);
 	msn_message_show_readable(msg, "SB SEND", FALSE);
 #endif
 
diff --git a/libpurple/protocols/msn/transaction.h b/libpurple/protocols/msn/transaction.h
index 93f6341980..98bffc61cc 100644
--- a/libpurple/protocols/msn/transaction.h
+++ b/libpurple/protocols/msn/transaction.h
@@ -45,7 +45,7 @@ struct _MsnTransaction
 	char *command;
 	char *params;
 
-	int timer;
+	guint timer;
 
 	void *data; /**< The data to be used on the different callbacks. */
 	GHashTable *callbacks;
diff --git a/libpurple/protocols/msnp9/directconn.c b/libpurple/protocols/msnp9/directconn.c
index ba7066729d..cfe9e7382f 100644
--- a/libpurple/protocols/msnp9/directconn.c
+++ b/libpurple/protocols/msnp9/directconn.c
@@ -159,6 +159,9 @@ create_listener(int port)
 
 	flags = fcntl(fd, F_GETFL);
 	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
 
 	return fd;
 }
diff --git a/libpurple/protocols/msnp9/msn.c b/libpurple/protocols/msnp9/msn.c
index f7c7d5ab90..29cdd1728c 100644
--- a/libpurple/protocols/msnp9/msn.c
+++ b/libpurple/protocols/msnp9/msn.c
@@ -162,7 +162,7 @@ msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **
 
 	username = purple_conversation_get_name(conv);
 
-	serv_send_attention(gc, username, MSN_NUDGE);
+	purple_prpl_send_attention(gc, username, MSN_NUDGE);
 
 	return PURPLE_CMD_RET_OK;
 }
diff --git a/libpurple/protocols/msnp9/servconn.c b/libpurple/protocols/msnp9/servconn.c
index cdbe0efbdc..6c1bcce865 100644
--- a/libpurple/protocols/msnp9/servconn.c
+++ b/libpurple/protocols/msnp9/servconn.c
@@ -547,6 +547,9 @@ create_listener(int port)
 
 	flags = fcntl(fd, F_GETFL);
 	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
 
 	return fd;
 }
diff --git a/libpurple/protocols/myspace/zap.c b/libpurple/protocols/myspace/zap.c
index d21c8ca40d..d4ba1ee566 100644
--- a/libpurple/protocols/myspace/zap.c
+++ b/libpurple/protocols/myspace/zap.c
@@ -183,7 +183,7 @@ msim_send_zap_from_menu(PurpleBlistNode *node, gpointer zap_num_ptr)
 
 	zap = GPOINTER_TO_INT(zap_num_ptr);
 
-	serv_send_attention(session->gc, buddy->name, zap);
+	purple_prpl_send_attention(session->gc, buddy->name, zap);
 }
 
 /** Return menu, if any, for a buddy list node. */
@@ -241,7 +241,7 @@ msim_incoming_zap(MsimSession *session, MsimMessage *msg)
 
 	zap = CLAMP(zap, 0, 9);
 
-	serv_got_attention(session->gc, username, zap);
+	purple_prpl_got_attention(session->gc, username, zap);
 
 	g_free(msg_text);
 	g_free(username);
diff --git a/libpurple/protocols/oscar/family_oservice.c b/libpurple/protocols/oscar/family_oservice.c
index 4d95bc8cb2..8308201653 100644
--- a/libpurple/protocols/oscar/family_oservice.c
+++ b/libpurple/protocols/oscar/family_oservice.c
@@ -29,7 +29,7 @@
 
 /* Subtype 0x0002 - Client Online */
 void
-aim_clientready(OscarData *od, FlapConnection *conn)
+aim_srv_clientready(OscarData *od, FlapConnection *conn)
 {
 	ByteStream bs;
 	aim_snacid_t snacid;
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index c55d11dea3..578bb7c867 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -1192,7 +1192,7 @@ flap_connection_established_bos(OscarData *od, FlapConnection *conn)
 static void
 flap_connection_established_admin(OscarData *od, FlapConnection *conn)
 {
-	aim_clientready(od, conn);
+	aim_srv_clientready(od, conn);
 	purple_debug_info("oscar", "connected to admin\n");
 
 	if (od->chpass) {
@@ -1237,7 +1237,7 @@ flap_connection_established_chat(OscarData *od, FlapConnection *conn)
 	struct chat_connection *chatcon;
 	static int id = 1;
 
-	aim_clientready(od, conn);
+	aim_srv_clientready(od, conn);
 
 	chatcon = find_oscar_chat_by_conn(gc, conn);
 	if (chatcon) {
@@ -1249,7 +1249,7 @@ flap_connection_established_chat(OscarData *od, FlapConnection *conn)
 static void
 flap_connection_established_chatnav(OscarData *od, FlapConnection *conn)
 {
-	aim_clientready(od, conn);
+	aim_srv_clientready(od, conn);
 	aim_chatnav_reqrights(od, conn);
 }
 
@@ -1258,7 +1258,7 @@ flap_connection_established_alert(OscarData *od, FlapConnection *conn)
 {
 	aim_email_sendcookies(od);
 	aim_email_activate(od);
-	aim_clientready(od, conn);
+	aim_srv_clientready(od, conn);
 }
 
 static void
@@ -1266,7 +1266,7 @@ flap_connection_established_bart(OscarData *od, FlapConnection *conn)
 {
 	PurpleConnection *gc = od->gc;
 
-	aim_clientready(od, conn);
+	aim_srv_clientready(od, conn);
 
 	od->iconconnecting = FALSE;
 
@@ -1635,6 +1635,7 @@ static void damn_you(gpointer data, gint source, PurpleInputCondition c)
 	char in = '\0';
 	int x = 0;
 	unsigned char m[17];
+	GString *msg;
 
 	while (read(pos->fd, &in, 1) == 1) {
 		if (in == '\n')
@@ -1665,11 +1666,14 @@ static void damn_you(gpointer data, gint source, PurpleInputCondition c)
 				"from " AIMHASHDATA "--that's bad.\n");
 	}
 	m[16] = '\0';
-	purple_debug_misc("oscar", "Sending hash: ");
+
+	msg = g_string_new("Sending hash: ");
 	for (x = 0; x < 16; x++)
-		purple_debug_misc(NULL, "%02hhx ", (unsigned char)m[x]);
+		g_string_append_printf(msg, "%02hhx ", (unsigned char)m[x]);
+	g_string_append(msg, "\n");
+	purple_debug_misc("oscar", msg->str);
+	g_string_free(msg, TRUE);
 
-	purple_debug_misc(NULL, "\n");
 	purple_input_remove(pos->inpa);
 	close(pos->fd);
 	aim_sendmemblock(od, pos->conn, 0, 16, m, AIM_SENDMEMBLOCK_FLAG_ISHASH);
@@ -3766,7 +3770,7 @@ static int purple_bosrights(OscarData *od, FlapConnection *conn, FlapFrame *fr,
 
 	purple_debug_info("oscar", "buddy list loaded\n");
 
-	aim_clientready(od, conn);
+	aim_srv_clientready(od, conn);
 
 	if (purple_account_get_user_info(account) != NULL)
 		serv_set_info(gc, purple_account_get_user_info(account));
@@ -4926,19 +4930,19 @@ static int purple_ssi_parserights(OscarData *od, FlapConnection *conn, FlapFrame
 	va_list ap;
 	int numtypes;
 	guint16 *maxitems;
+	GString *msg;
 
 	va_start(ap, fr);
 	numtypes = va_arg(ap, int);
 	maxitems = va_arg(ap, guint16 *);
 	va_end(ap);
 
-	purple_debug_misc("oscar", "ssi rights:");
-
+	msg = g_string_new("ssi rights:");
 	for (i=0; i<numtypes; i++)
-		purple_debug_misc(NULL, " max type 0x%04x=%hd,",
-				   i, maxitems[i]);
-
-	purple_debug_misc(NULL, "\n");
+		g_string_append_printf(msg, " max type 0x%04x=%hd,", i, maxitems[i]);
+	g_string_append(msg, "\n");
+	purple_debug_misc("oscar", msg->str);
+	g_string_free(msg, TRUE);
 
 	if (numtypes >= 0)
 		od->rights.maxbuddies = maxitems[0];
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index 6b51938458..8077b87635 100644
--- a/libpurple/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
@@ -607,13 +607,10 @@ struct aim_redirect_data
 	} chat;
 };
 
-void aim_clientready(OscarData *od, FlapConnection *conn);
 int aim_request_login(OscarData *od, FlapConnection *conn, const char *sn);
 int aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *password, gboolean truncate_pass, ClientInfo *ci, const char *key, gboolean allow_multiple_logins);
 /* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid);
 
-void aim_cleansnacs(OscarData *, int maxage);
-
 void oscar_data_addhandler(OscarData *od, guint16 family, guint16 subtype, aim_rxcallback_t newhandler, guint16 flags);
 aim_rxcallback_t aim_callhandler(OscarData *od, guint16 family, guint16 subtype);
 
@@ -651,6 +648,7 @@ void oscar_data_destroy(OscarData *);
 
 
 /* 0x0001 - family_oservice.c */
+/* 0x0002 */ void aim_srv_clientready(OscarData *od, FlapConnection *conn);
 /* 0x0004 */ void aim_srv_requestnew(OscarData *od, guint16 serviceid);
 /* 0x0006 */ void aim_srv_reqrates(OscarData *od, FlapConnection *conn);
 /* 0x0008 */ void aim_srv_rates_addparam(OscarData *od, FlapConnection *conn);
@@ -1609,6 +1607,7 @@ void aim_initsnachash(OscarData *od);
 aim_snacid_t aim_newsnac(OscarData *, aim_snac_t *newsnac);
 aim_snacid_t aim_cachesnac(OscarData *od, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen);
 aim_snac_t *aim_remsnac(OscarData *, aim_snacid_t id);
+void aim_cleansnacs(OscarData *, int maxage);
 int aim_putsnac(ByteStream *, guint16 family, guint16 type, guint16 flags, aim_snacid_t id);
 
 struct chatsnacinfo {
diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
index 39400b9b5a..7d4068245e 100644
--- a/libpurple/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
@@ -636,6 +636,10 @@ peer_connection_listen_cb(gpointer data, gint source, PurpleInputCondition cond)
 
 	flags = fcntl(conn->fd, F_GETFL);
 	fcntl(conn->fd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(conn->fd, F_SETFD, FD_CLOEXEC);
+#endif
+
 	purple_input_remove(conn->watcher_incoming);
 
 	peer_connection_finalize_connection(conn);
diff --git a/libpurple/protocols/qq/ChangeLog b/libpurple/protocols/qq/ChangeLog
index 1ef12628c6..b60517a9b1 100644
--- a/libpurple/protocols/qq/ChangeLog
+++ b/libpurple/protocols/qq/ChangeLog
@@ -1,3 +1,22 @@
+2008.08.10 - csyfek <csyfek(at)gmail.com>
+	* Commit to Pidgin
+
+2008.08.06 - ccpaging <ecc_hy(at)hotmail.com>
+	* Rename names of variables, Group, to Room
+	* Functions of group_network merged into qq_network and qq_process
+	* Canceled managing glist of group packet, add sub_cmdd and room_id  to transaction
+	* Fixed error of demo group:
+		If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet.
+
+2008.08.04 - ccpaging <ecc_hy(at)hotmail.com>
+	* Use new crypt/decrypt functions
+	* Rename crypt.c/h to qq_crypt.c/h
+	* Clean code of decrypt functions
+	* Fixed decryption failure
+
+2008.08.04 - csyfek <csyfek(at)gmail.com>
+	* Update AUTHORS
+
 2008.08.03 - csyfek <csyfek(at)gmail.com>
 	* Commit lost files to Pidgin
 
diff --git a/libpurple/protocols/qq/Makefile.am b/libpurple/protocols/qq/Makefile.am
index 84a83f51d7..2b6f34a934 100644
--- a/libpurple/protocols/qq/Makefile.am
+++ b/libpurple/protocols/qq/Makefile.am
@@ -12,8 +12,8 @@ QQSOURCES = \
 	buddy_opt.h \
 	char_conv.c \
 	char_conv.h \
-	crypt.c \
-	crypt.h \
+	qq_crypt.c \
+	qq_crypt.h \
 	file_trans.c \
 	file_trans.h \
 	group.c \
@@ -32,8 +32,6 @@ QQSOURCES = \
 	group_info.h \
 	group_join.c \
 	group_join.h \
-	group_network.c \
-	group_network.h \
 	group_opt.c \
 	group_opt.h \
 	group_search.c \
diff --git a/libpurple/protocols/qq/Makefile.mingw b/libpurple/protocols/qq/Makefile.mingw
index 0341cb59f9..527ab6978c 100644
--- a/libpurple/protocols/qq/Makefile.mingw
+++ b/libpurple/protocols/qq/Makefile.mingw
@@ -43,7 +43,7 @@ C_SRC = \
 	buddy_list.c \
 	buddy_opt.c \
 	char_conv.c \
-	crypt.c \
+	qq_crypt.c \
 	file_trans.c \
 	group.c \
 	group_conv.c \
@@ -53,7 +53,6 @@ C_SRC = \
 	group_im.c \
 	group_info.c \
 	group_join.c \
-	group_network.c \
 	group_opt.c \
 	group_search.c \
 	header_info.c \
diff --git a/libpurple/protocols/qq/buddy_info.c b/libpurple/protocols/qq/buddy_info.c
index 3859189b22..85be58b884 100644
--- a/libpurple/protocols/qq/buddy_info.c
+++ b/libpurple/protocols/qq/buddy_info.c
@@ -32,7 +32,6 @@
 #include "buddy_list.h"
 #include "buddy_info.h"
 #include "char_conv.h"
-#include "crypt.h"
 #include "header_info.h"
 #include "qq_base.h"
 #include "qq_network.h"
@@ -688,26 +687,18 @@ static void create_modify_info_dialogue(PurpleConnection *gc, const contact_info
 }
 
 /* process the reply of modify_info packet */
-void qq_process_modify_info_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+void qq_process_modify_info_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len;
-	guint8 *data;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		data[len] = '\0';
-		if (qd->uid == atoi((gchar *) data)) {	/* return should be my uid */
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "Update info ACK OK\n");
-			purple_notify_info(gc, NULL, _("Your information has been updated"), NULL);
-		}
-	} else {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt modify info reply\n");
+
+	data[data_len] = '\0';
+	if (qd->uid == atoi((gchar *) data)) {	/* return should be my uid */
+		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Update info ACK OK\n");
+		purple_notify_info(gc, NULL, _("Your information has been updated"), NULL);
 	}
 }
 
@@ -858,10 +849,8 @@ static void qq_refresh_buddy_and_myself(contact_info *info, PurpleConnection *gc
 }
 
 /* process reply to get_info packet */
-void qq_process_get_info_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+void qq_process_get_info_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
-	gint len;
-	guint8 *data;
 	gchar **segments;
 	qq_info_query *query;
 	qq_data *qd;
@@ -869,52 +858,46 @@ void qq_process_get_info_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
 	GList *list, *query_list;
 	PurpleNotifyUserInfo *user_info;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
 	list = query_list = NULL;
-	len = buf_len;
-	data = g_newa(guint8, len);
 	info = NULL;
 
-	if (qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		if (NULL == (segments = split_data(data, len, "\x1e", QQ_CONTACT_FIELDS)))
-			return;
-
-		info = (contact_info *) segments;
-		if (qd->modifying_face && strtol(info->face, NULL, 10) != qd->my_icon) {
-			gchar *icon = g_strdup_printf("%d", qd->my_icon);
-			qd->modifying_face = FALSE;
-			g_free(info->face);
-			info->face = icon;
-			qq_send_packet_modify_info(gc, (contact_info *)segments);
-		}
+	if (NULL == (segments = split_data(data, data_len, "\x1e", QQ_CONTACT_FIELDS)))
+		return;
+
+	info = (contact_info *) segments;
+	if (qd->modifying_face && strtol(info->face, NULL, 10) != qd->my_icon) {
+		gchar *icon = g_strdup_printf("%d", qd->my_icon);
+		qd->modifying_face = FALSE;
+		g_free(info->face);
+		info->face = icon;
+		qq_send_packet_modify_info(gc, (contact_info *)segments);
+	}
 
-		qq_refresh_buddy_and_myself(info, gc);
-
-		query_list = qd->info_query;
-		/* ensure we're processing the right query */
-		while (query_list) {
-			query = (qq_info_query *) query_list->data;
-			if (query->uid == atoi(info->uid)) {
-				if (query->show_window) {
-					user_info = info_to_notify_user_info(info);
-					purple_notify_userinfo(gc, info->uid, user_info, NULL, NULL);
-					purple_notify_user_info_destroy(user_info);
-				} else if (query->modify_info) {
-					create_modify_info_dialogue(gc, info);
-				}
-				qd->info_query = g_list_remove(qd->info_query, qd->info_query->data);
-				g_free(query);
-				break;
+	qq_refresh_buddy_and_myself(info, gc);
+
+	query_list = qd->info_query;
+	/* ensure we're processing the right query */
+	while (query_list) {
+		query = (qq_info_query *) query_list->data;
+		if (query->uid == atoi(info->uid)) {
+			if (query->show_window) {
+				user_info = info_to_notify_user_info(info);
+				purple_notify_userinfo(gc, info->uid, user_info, NULL, NULL);
+				purple_notify_user_info_destroy(user_info);
+			} else if (query->modify_info) {
+				create_modify_info_dialogue(gc, info);
 			}
-			query_list = query_list->next;
+			qd->info_query = g_list_remove(qd->info_query, qd->info_query->data);
+			g_free(query);
+			break;
 		}
-
-		g_strfreev(segments);
-	} else {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt get info reply\n");
+		query_list = query_list->next;
 	}
+
+	g_strfreev(segments);
 }
 
 void qq_info_query_free(qq_data *qd)
@@ -975,25 +958,18 @@ void qq_send_packet_get_buddies_levels(PurpleConnection *gc)
 	qq_send_cmd(qd, QQ_CMD_GET_LEVEL, buf, size);
 }
 
-void qq_process_get_level_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+void qq_process_get_level_reply(guint8 *decr_buf, gint decr_len, PurpleConnection *gc)
 {
 	guint32 uid, onlineTime;
 	guint16 level, timeRemainder;
 	gchar *purple_name;
 	PurpleBuddy *b;
 	qq_buddy *q_bud;
-	gint decr_len, i;
-	guint8 *decr_buf;
+	gint i;
 	PurpleAccount *account = purple_connection_get_account(gc);
 	qq_data *qd = (qq_data *) gc->proto_data;
 	gint bytes = 0;
 
-	decr_len = buf_len;
-	decr_buf = g_new0(guint8, buf_len);
-	if (!qq_decrypt(buf, buf_len, qd->session_key, decr_buf, &decr_len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Couldn't decrypt get level packet\n");
-	}
-
 	decr_len--; 
 	if (decr_len % 12 != 0) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
@@ -1014,25 +990,34 @@ void qq_process_get_level_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
 		purple_debug(PURPLE_DEBUG_INFO, "QQ_LEVEL", 
 				"%d, tmOnline: %d, level: %d, tmRemainder: %d\n", 
 				uid, onlineTime, level, timeRemainder);
+		if (uid == qd->uid) {
+			qd->my_level = level;
+			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Got my levels as %d\n", qd->my_level);
+			continue;
+		}
+
 		purple_name = uid_to_purple_name(uid);
+		if (purple_name == NULL) {
+			continue;
+		}
+		
 		b = purple_find_buddy(account, purple_name);
-		q_bud = (b == NULL) ? NULL : (qq_buddy *) b->proto_data;
+		g_free(purple_name);
 
-		if (q_bud != NULL || uid == qd->uid) {
-			if (q_bud) {
-				q_bud->onlineTime = onlineTime;
-				q_bud->level = level;
-				q_bud->timeRemainder = timeRemainder;
-			}
-			if (uid == qd->uid) {
-				qd->my_level = level;
-			}
-		} else {
+		q_bud = NULL;
+		if (b != NULL) {
+			q_bud = (qq_buddy *) b->proto_data;
+		}
+		
+		if (q_bud == NULL) {
 			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-					"Got an online buddy %d, but not in my buddy list\n", uid);
+					"Got levels of %d not in my buddy list\n", uid);
+			continue;
 		}
-		g_free(purple_name);
+
+		q_bud->onlineTime = onlineTime;
+		q_bud->level = level;
+		q_bud->timeRemainder = timeRemainder;
 	}
-	g_free(decr_buf);
 }
 
diff --git a/libpurple/protocols/qq/buddy_info.h b/libpurple/protocols/qq/buddy_info.h
index ee66575144..853741fc0d 100644
--- a/libpurple/protocols/qq/buddy_info.h
+++ b/libpurple/protocols/qq/buddy_info.h
@@ -71,8 +71,8 @@ void qq_send_packet_get_info(PurpleConnection *gc, guint32 uid, gboolean show_wi
 void qq_set_my_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img);
 void qq_set_buddy_icon_for_user(PurpleAccount *account, const gchar *who, const gchar *icon_num, const gchar *iconfile);
 void qq_prepare_modify_info(PurpleConnection *gc);
-void qq_process_modify_info_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
-void qq_process_get_info_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
+void qq_process_modify_info_reply(guint8 *data, gint data_len, PurpleConnection *gc);
+void qq_process_get_info_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 void qq_info_query_free(qq_data *qd);
 void qq_send_packet_get_level(PurpleConnection *gc, guint32 uid);
 void qq_send_packet_get_buddies_levels(PurpleConnection *gc);
diff --git a/libpurple/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c
index 6ad75db382..437fd1bff9 100644
--- a/libpurple/protocols/qq/buddy_list.c
+++ b/libpurple/protocols/qq/buddy_list.c
@@ -34,7 +34,6 @@
 #include "buddy_list.h"
 #include "buddy_opt.h"
 #include "char_conv.h"
-#include "crypt.h"
 #include "header_info.h"
 #include "qq_base.h"
 #include "group.h"
@@ -103,7 +102,7 @@ void qq_send_packet_get_buddies_list(PurpleConnection *gc, guint16 position)
 }
 
 /* get all list, buddies & Quns with groupsid support */
-void qq_send_packet_get_all_list_with_group(PurpleConnection *gc, guint32 position)
+void qq_send_packet_get_buddies_and_rooms(PurpleConnection *gc, guint32 position)
 {
 	qq_data *qd = (qq_data *) gc->proto_data;
 	guint8 raw_data[16] = {0};
@@ -117,7 +116,7 @@ void qq_send_packet_get_all_list_with_group(PurpleConnection *gc, guint32 positi
 	bytes += qq_put32(raw_data + bytes, 0x00000000);
 	bytes += qq_put32(raw_data + bytes, position);
 
-	qq_send_cmd(qd, QQ_CMD_GET_ALL_LIST_WITH_GROUP, raw_data, bytes);
+	qq_send_cmd(qd, QQ_CMD_GET_BUDDIES_AND_ROOMS, raw_data, bytes);
 }
 
 /* parse the data into qq_buddy_status */
@@ -158,28 +157,20 @@ static gint get_buddy_status(qq_buddy_status *bs, guint8 *data)
 #define QQ_ONLINE_BUDDY_ENTRY_LEN       38
 
 /* process the reply packet for get_buddies_online packet */
-guint8 qq_process_get_buddies_online_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+guint8 qq_process_get_buddies_online_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len, bytes, bytes_buddy;
+	gint bytes, bytes_buddy;
 	gint count;
-	guint8 *data, position;
+	guint8  position;
 	PurpleBuddy *b;
 	qq_buddy *q_bud;
 	qq_buddy_online bo;
+	gchar *purple_name;
 
-	g_return_val_if_fail(buf != NULL && buf_len != 0, -1);
+	g_return_val_if_fail(data != NULL && data_len != 0, -1);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "processing get_buddies_online_reply\n");
-
-	if (!qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt buddies online");
-		return -1;
-	}
 
 	/* qq_show_packet("Get buddies online reply packet", data, len); */
 
@@ -187,11 +178,11 @@ guint8 qq_process_get_buddies_online_reply(guint8 *buf, gint buf_len, PurpleConn
 	bytes += qq_get8(&position, data + bytes);
 
 	count = 0;
-	while (bytes < len) {
-		if (len - bytes < QQ_ONLINE_BUDDY_ENTRY_LEN) {
+	while (bytes < data_len) {
+		if (data_len - bytes < QQ_ONLINE_BUDDY_ENTRY_LEN) {
 			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
 					"[buddies online] only %d, need %d", 
-					(len - bytes), QQ_ONLINE_BUDDY_ENTRY_LEN);
+					(data_len - bytes), QQ_ONLINE_BUDDY_ENTRY_LEN);
 			break;
 		}
 		memset(&bo, 0 ,sizeof(bo));
@@ -219,9 +210,22 @@ guint8 qq_process_get_buddies_online_reply(guint8 *buf, gint buf_len, PurpleConn
 			continue;
 		}	/* check if it is a valid entry */
 
+		if (bo.bs.uid == qd->uid) {
+			purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
+					"I am in online list %d\n", bo.bs.uid);
+			continue;
+		}
+
 		/* update buddy information */
-		b = purple_find_buddy(purple_connection_get_account(gc), 
-												uid_to_purple_name(bo.bs.uid) );
+		purple_name = uid_to_purple_name(bo.bs.uid);
+		if (purple_name == NULL) {
+			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+					"Got an online buddy %d, but not find purple name\n", bo.bs.uid);
+			continue;
+		}
+		b = purple_find_buddy(purple_connection_get_account(gc), purple_name);
+		g_free(purple_name);
+		
 		q_bud = (b == NULL) ? NULL : (qq_buddy *) b->proto_data;
 		if (q_bud == NULL) {
 			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
@@ -242,7 +246,7 @@ guint8 qq_process_get_buddies_online_reply(guint8 *buf, gint buf_len, PurpleConn
 		count++;
 	}
 
-	if(bytes > len) {
+	if(bytes > data_len) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
 				"qq_process_get_buddies_online_reply: Dangerous error! maybe protocol changed, notify developers!\n");
 	}
@@ -254,32 +258,31 @@ guint8 qq_process_get_buddies_online_reply(guint8 *buf, gint buf_len, PurpleConn
 
 
 /* process reply for get_buddies_list */
-guint16 qq_process_get_buddies_list_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
 	qq_buddy *q_bud;
-	gint len, bytes_expected, count;
+	gint bytes_expected, count;
 	gint bytes, buddy_bytes;
 	guint16 position, unknown;
-	guint8 *data, pascal_len;
+	guint8 pascal_len;
 	gchar *name;
 	PurpleBuddy *b;
 
-	g_return_val_if_fail(buf != NULL && buf_len != 0, -1);
+	g_return_val_if_fail(data != NULL && data_len != 0, -1);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
 
-	if (!qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt buddies list");
+	if (data_len <= 2) {
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "empty buddies list");
 		return -1;
 	}
+	/* qq_show_packet("QQ get buddies list", data, data_len); */
 	bytes = 0;
 	bytes += qq_get16(&position, data + bytes);
 	/* the following data is buddy list in this packet */
 	count = 0;
-	while (bytes < len) {
+	while (bytes < data_len) {
 		q_bud = g_new0(qq_buddy, 1);
 		/* set flag */
 		buddy_bytes = bytes;
@@ -311,11 +314,11 @@ guint16 qq_process_get_buddies_list_reply(guint8 *buf, gint buf_len, PurpleConne
 			count++;
 		}
 
-		if (QQ_DEBUG) {
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"buddy [%09d]: ext_flag=0x%02x, comm_flag=0x%02x, nick=%s\n",
-					q_bud->uid, q_bud->ext_flag, q_bud->comm_flag, q_bud->nickname);
-		}
+#if 1
+		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+				"buddy [%09d]: ext_flag=0x%02x, comm_flag=0x%02x, nick=%s\n",
+				q_bud->uid, q_bud->ext_flag, q_bud->comm_flag, q_bud->nickname);
+#endif
 
 		name = uid_to_purple_name(q_bud->uid);
 		b = purple_find_buddy(gc->account, name);
@@ -330,7 +333,7 @@ guint16 qq_process_get_buddies_list_reply(guint8 *buf, gint buf_len, PurpleConne
 		qq_update_buddy_contact(gc, q_bud);
 	}
 
-	if(bytes > len) {
+	if(bytes > data_len) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
 				"qq_process_get_buddies_list_reply: Dangerous error! maybe protocol changed, notify developers!");
 	}
@@ -340,36 +343,29 @@ guint16 qq_process_get_buddies_list_reply(guint8 *buf, gint buf_len, PurpleConne
 	return position;
 }
 
-guint32 qq_process_get_all_list_with_group_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len, i, j;
-	gint bytes = 0;
-	guint8 *data;
+	gint i, j;
+	gint bytes;
 	guint8 sub_cmd, reply_code;
 	guint32 unknown, position;
 	guint32 uid;
 	guint8 type, groupid;
 	qq_group *group;
 
-	g_return_val_if_fail(buf != NULL && buf_len != 0, -1);
+	g_return_val_if_fail(data != NULL && data_len != 0, -1);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (!qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt all list with group");
-		return -1;
-	}
 
+	bytes = 0;
 	bytes += qq_get8(&sub_cmd, data + bytes);
 	g_return_val_if_fail(sub_cmd == 0x01, -1);
 
 	bytes += qq_get8(&reply_code, data + bytes);
 	if(0 != reply_code) {
 		purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
-				"Get all list with group reply, reply_code(%d) is not zero", reply_code);
+				"qq_process_get_buddies_and_rooms, %d", reply_code);
 	}
 
 	bytes += qq_get32(&unknown, data + bytes);
@@ -377,7 +373,7 @@ guint32 qq_process_get_all_list_with_group_reply(guint8 *buf, gint buf_len, Purp
 	/* the following data is all list in this packet */
 	i = 0;
 	j = 0;
-	while (bytes < len) {
+	while (bytes < data_len) {
 		/* 00-03: uid */
 		bytes += qq_get32(&uid, data + bytes);
 		/* 04: type 0x1:buddy 0x4:Qun */
@@ -398,24 +394,24 @@ guint32 qq_process_get_all_list_with_group_reply(guint8 *buf, gint buf_len, Purp
 			 * qq_send_packet_get_buddies_list */
 			++i;
 		} else { /* a group */
-			group = qq_group_find_by_id(gc, uid, QQ_INTERNAL_ID);
+			group = qq_room_search_id(gc, uid);
 			if(group == NULL) {
+				purple_debug(PURPLE_DEBUG_INFO, "QQ",
+					"Not find room id %d in qq_process_get_buddies_and_rooms\n", uid);
 				qq_set_pending_id(&qd->adding_groups_from_server, uid, TRUE);
-				group = g_newa(qq_group, 1);
-				group->internal_group_id = uid;
-				qq_send_cmd_group_get_group_info(gc, group);
+				qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, uid);
 			} else {
 				group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
 				qq_group_refresh(gc, group);
-				qq_send_cmd_group_get_group_info(gc, group);
+				qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 			}
 			++j;
 		}
 	}
 
-	if(bytes > len) {
+	if(bytes > data_len) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-				"qq_process_get_all_list_with_group_reply: Dangerous error! maybe protocol changed, notify developers!");
+				"qq_process_get_buddies_and_rooms: Dangerous error! maybe protocol changed, notify developers!");
 	}
 
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Received %d buddies and %d groups, nextposition=%u\n", i, j, (guint) position);
@@ -505,26 +501,19 @@ void qq_send_packet_change_status(PurpleConnection *gc)
 }
 
 /* parse the reply packet for change_status */
-void qq_process_change_status_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+void qq_process_change_status_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len, bytes;
-	guint8 *data, reply;
+	gint bytes;
+	guint8 reply;
 	PurpleBuddy *b;
 	qq_buddy *q_bud;
 	gchar *name;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if ( !qq_decrypt(buf, buf_len, qd->session_key, data, &len) ) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt chg status reply\n");
-		return;
-	}
-
+	
 	bytes = 0;
 	bytes = qq_get8(&reply, data + bytes);
 	if (reply != QQ_CHANGE_ONLINE_STATUS_REPLY_OK) {
@@ -543,28 +532,19 @@ void qq_process_change_status_reply(guint8 *buf, gint buf_len, PurpleConnection
 }
 
 /* it is a server message indicating that one of my buddies has changed its status */
-void qq_process_buddy_change_status(guint8 *buf, gint buf_len, PurpleConnection *gc) 
+void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnection *gc) 
 {
 	qq_data *qd;
 	gint bytes;
 	guint32 my_uid;
-	guint8 *data;
-	gint data_len;
 	PurpleBuddy *b;
 	qq_buddy *q_bud;
 	qq_buddy_status bs;
 	gchar *name;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	data_len = buf_len;
-	data = g_newa(guint8, data_len);
-
-	if ( !qq_decrypt(buf, buf_len, qd->session_key, data, &data_len) ) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "[buddy status change] Failed decrypt\n");
-		return;
-	}
 
 	if (data_len < 35) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "[buddy status change] only %d, need 35 bytes\n", data_len);
@@ -606,18 +586,22 @@ void qq_process_buddy_change_status(guint8 *buf, gint buf_len, PurpleConnection
 /*TODO: maybe this should be qq_update_buddy_status() ?*/
 void qq_update_buddy_contact(PurpleConnection *gc, qq_buddy *q_bud)
 {
-	gchar *name;
+	gchar *purple_name;
 	PurpleBuddy *bud;
 	gchar *status_id;
 	
 	g_return_if_fail(q_bud != NULL);
 
-	name = uid_to_purple_name(q_bud->uid);
-	bud = purple_find_buddy(gc->account, name);
+	purple_name = uid_to_purple_name(q_bud->uid);
+	if (purple_name == NULL) {
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Not find purple name: %d\n", q_bud->uid);
+		return;
+	}
 
+	bud = purple_find_buddy(gc->account, purple_name);
 	if (bud == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "unknown buddy: %d\n", q_bud->uid);
-		g_free(name);
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Not find buddy: %d\n", q_bud->uid);
+		g_free(purple_name);
 		return;
 	}
 	
@@ -650,19 +634,19 @@ void qq_update_buddy_contact(PurpleConnection *gc, qq_buddy *q_bud)
 		break;
 	}
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "buddy %d %s\n", q_bud->uid, status_id);
-	purple_prpl_got_user_status(gc->account, name, status_id, NULL);
+	purple_prpl_got_user_status(gc->account, purple_name, status_id, NULL);
 
 	if (q_bud->comm_flag & QQ_COMM_FLAG_MOBILE && q_bud->status != QQ_BUDDY_OFFLINE)
-		purple_prpl_got_user_status(gc->account, name, "mobile", NULL);
+		purple_prpl_got_user_status(gc->account, purple_name, "mobile", NULL);
 	else
-		purple_prpl_got_user_status_deactive(gc->account, name, "mobile");
+		purple_prpl_got_user_status_deactive(gc->account, purple_name, "mobile");
 
 	if (q_bud->comm_flag & QQ_COMM_FLAG_VIDEO && q_bud->status != QQ_BUDDY_OFFLINE)
-		purple_prpl_got_user_status(gc->account, name, "video", NULL);
+		purple_prpl_got_user_status(gc->account, purple_name, "video", NULL);
 	else
-		purple_prpl_got_user_status_deactive(gc->account, name, "video");
+		purple_prpl_got_user_status_deactive(gc->account, purple_name, "video");
 
-	g_free(name);
+	g_free(purple_name);
 }
 
 /* refresh all buddies online/offline,
diff --git a/libpurple/protocols/qq/buddy_list.h b/libpurple/protocols/qq/buddy_list.h
index 976ec18aef..e1655757f0 100644
--- a/libpurple/protocols/qq/buddy_list.h
+++ b/libpurple/protocols/qq/buddy_list.h
@@ -49,13 +49,13 @@ enum {
 };
 
 void qq_send_packet_get_buddies_online(PurpleConnection *gc, guint8 position);
-guint8 qq_process_get_buddies_online_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
+guint8 qq_process_get_buddies_online_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 
 void qq_send_packet_get_buddies_list(PurpleConnection *gc, guint16 position);
-guint16 qq_process_get_buddies_list_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
+guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 
-void qq_send_packet_get_all_list_with_group(PurpleConnection *gc, guint32 position);
-guint32 qq_process_get_all_list_with_group_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
+void qq_send_packet_get_buddies_and_rooms(PurpleConnection *gc, guint32 position);
+guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConnection *gc);
 
 void qq_refresh_all_buddy_status(PurpleConnection *gc);
 
@@ -64,8 +64,8 @@ gboolean is_online(guint8 status);
 gint get_icon_offset(PurpleConnection *gc);
 
 void qq_send_packet_change_status(PurpleConnection *gc);
-void qq_process_change_status_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
-void qq_process_buddy_change_status(guint8 *buf, gint buf_len, PurpleConnection *gc);
+void qq_process_change_status_reply(guint8 *data, gint data_len, PurpleConnection *gc);
+void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnection *gc);
 
 void qq_refresh_all_buddy_status(PurpleConnection *gc);
 void qq_update_buddy_contact(PurpleConnection *gc, qq_buddy *q_bud);
diff --git a/libpurple/protocols/qq/buddy_opt.c b/libpurple/protocols/qq/buddy_opt.c
index f94f8b9a01..85356ca187 100644
--- a/libpurple/protocols/qq/buddy_opt.c
+++ b/libpurple/protocols/qq/buddy_opt.c
@@ -31,7 +31,6 @@
 #include "buddy_list.h"
 #include "buddy_opt.h"
 #include "char_conv.h"
-#include "crypt.h"
 #include "header_info.h"
 #include "im.h"
 #include "qq_base.h"
@@ -252,29 +251,18 @@ void qq_block_buddy_with_gc_and_uid(gc_and_uid *g)
 }
 
 /*  process reply to add_buddy_auth request */
-void qq_process_add_buddy_auth_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+void qq_process_add_buddy_auth_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len;
-	gint bytes = 0;
-	guint8 *data, reply;
 	gchar **segments, *msg_utf8;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (!qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt add buddy with auth reply\n");
-	}
-
-	bytes += qq_get8(&reply, data + bytes);
 
-	if (reply != QQ_ADD_BUDDY_AUTH_REPLY_OK) {
+	if (data[0] != QQ_ADD_BUDDY_AUTH_REPLY_OK) {
 		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Add buddy with auth request failed\n");
-		if (NULL == (segments = split_data(data, len, "\x1f", 2))) {
+		if (NULL == (segments = split_data(data, data_len, "\x1f", 2))) {
 			return;
 		}
 		msg_utf8 = qq_to_utf8(segments[1], QQ_CHARSET_DEFAULT);
@@ -286,26 +274,15 @@ void qq_process_add_buddy_auth_reply(guint8 *buf, gint buf_len, PurpleConnection
 }
 
 /* process the server reply for my request to remove a buddy */
-void qq_process_remove_buddy_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+void qq_process_remove_buddy_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len;
-	gint bytes = 0;
-	guint8 *data, reply;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (!qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt remove buddy reply\n");
-	}
 
-	bytes += qq_get8(&reply, data + bytes);
-
-	if (reply != QQ_REMOVE_BUDDY_REPLY_OK) {
+	if (data[0] != QQ_REMOVE_BUDDY_REPLY_OK) {
 		/* there is no reason return from server */
 		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Remove buddy fails\n");
 	} else {		/* if reply */
@@ -316,26 +293,15 @@ void qq_process_remove_buddy_reply(guint8 *buf, gint buf_len, PurpleConnection *
 }
 
 /* process the server reply for my request to remove myself from a buddy */
-void qq_process_remove_self_reply(guint8 *buf, gint buf_len, PurpleConnection *gc) 
+void qq_process_remove_self_reply(guint8 *data, gint data_len, PurpleConnection *gc) 
 {
 	qq_data *qd;
-	gint len;
-	gint bytes = 0;
-	guint8 *data, reply;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (!qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt remove self reply\n");
-	}
-
-	bytes += qq_get8(&reply, data + bytes);
 
-	if (reply != QQ_REMOVE_SELF_REPLY_OK) {
+	if (data[0] != QQ_REMOVE_SELF_REPLY_OK) {
 		/* there is no reason return from server */
 		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Remove self fails\n");
 	} else {		/* if reply */
@@ -345,23 +311,21 @@ void qq_process_remove_self_reply(guint8 *buf, gint buf_len, PurpleConnection *g
 	}
 }
 
-void qq_process_add_buddy_reply(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc)
+void qq_process_add_buddy_reply(guint8 *data, gint data_len, guint16 seq, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len, for_uid;
+	gint for_uid;
 	gchar *msg, **segments, *uid, *reply;
-	guint8 *data;
 	GList *list;
 	PurpleBuddy *b;
 	gc_and_uid *g;
 	qq_add_buddy_request *req;
 	gchar *nombre;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	for_uid = 0;
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
 
 	list = qd->add_buddy_request;
 	while (list != NULL) {
@@ -382,50 +346,45 @@ void qq_process_add_buddy_reply(guint8 *buf, gint buf_len, guint16 seq, PurpleCo
 		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Add buddy reply [%d] is for id [%d]\n", seq, for_uid);
 	}
 
-	data = g_newa(guint8, len);
-
-	if (qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		if (NULL == (segments = split_data(data, len, "\x1f", 2)))
-			return;
-		uid = segments[0];
-		reply = segments[1];
-		if (strtol(uid, NULL, 10) != qd->uid) {	/* should not happen */
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Add buddy reply is to [%s], not me!", uid);
-			g_strfreev(segments);
-			return;
-		}
-
-		if (strtol(reply, NULL, 10) > 0) {	/* need auth */
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Add buddy attempt fails, need authentication\n");
-			nombre = uid_to_purple_name(for_uid);
-			b = purple_find_buddy(gc->account, nombre);
-			if (b != NULL)
-				purple_blist_remove_buddy(b);
-			g = g_new0(gc_and_uid, 1);
-			g->gc = gc;
-			g->uid = for_uid;
-			msg = g_strdup_printf(_("User %d needs authentication"), for_uid);
-			purple_request_input(gc, NULL, msg,
-					_("Input request here"), /* TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands */
-					_("Would you be my friend?"),
-					TRUE, FALSE, NULL, _("Send"),
-					G_CALLBACK
-					(_qq_send_packet_add_buddy_auth_with_gc_and_uid),
-					_("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid),
-					purple_connection_get_account(gc), nombre, NULL,
-					g);
-			g_free(msg);
-			g_free(nombre);
-		} else {	/* add OK */
-			qq_add_buddy_by_recv_packet(gc, for_uid, TRUE, TRUE);
-			msg = g_strdup_printf(_("You have added %d to buddy list"), for_uid);
-			purple_notify_info(gc, NULL, msg, NULL);
-			g_free(msg);
-		}
+	if (NULL == (segments = split_data(data, data_len, "\x1f", 2)))
+		return;
+		
+	uid = segments[0];
+	reply = segments[1];
+	if (strtol(uid, NULL, 10) != qd->uid) {	/* should not happen */
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Add buddy reply is to [%s], not me!", uid);
 		g_strfreev(segments);
-	} else {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt add buddy reply\n");
+		return;
+	}
+
+	if (strtol(reply, NULL, 10) > 0) {	/* need auth */
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Add buddy attempt fails, need authentication\n");
+		nombre = uid_to_purple_name(for_uid);
+		b = purple_find_buddy(gc->account, nombre);
+		if (b != NULL)
+			purple_blist_remove_buddy(b);
+		g = g_new0(gc_and_uid, 1);
+		g->gc = gc;
+		g->uid = for_uid;
+		msg = g_strdup_printf(_("User %d needs authentication"), for_uid);
+		purple_request_input(gc, NULL, msg,
+				_("Input request here"), /* TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands */
+				_("Would you be my friend?"),
+				TRUE, FALSE, NULL, _("Send"),
+				G_CALLBACK
+				(_qq_send_packet_add_buddy_auth_with_gc_and_uid),
+				_("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid),
+				purple_connection_get_account(gc), nombre, NULL,
+				g);
+		g_free(msg);
+		g_free(nombre);
+	} else {	/* add OK */
+		qq_add_buddy_by_recv_packet(gc, for_uid, TRUE, TRUE);
+		msg = g_strdup_printf(_("You have added %d to buddy list"), for_uid);
+		purple_notify_info(gc, NULL, msg, NULL);
+		g_free(msg);
 	}
+	g_strfreev(segments);
 }
 
 PurpleGroup *qq_get_purple_group(const gchar *group_name)
diff --git a/libpurple/protocols/qq/buddy_opt.h b/libpurple/protocols/qq/buddy_opt.h
index ea8913aafc..af6cc7d8cb 100644
--- a/libpurple/protocols/qq/buddy_opt.h
+++ b/libpurple/protocols/qq/buddy_opt.h
@@ -46,9 +46,9 @@ void qq_block_buddy_with_gc_and_uid(gc_and_uid *g);
 void qq_do_nothing_with_gc_and_uid(gc_and_uid *g, const gchar *msg);
 
 void qq_process_remove_buddy_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
-void qq_process_remove_self_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
-void qq_process_add_buddy_reply(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc);
-void qq_process_add_buddy_auth_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
+void qq_process_remove_self_reply(guint8 *data, gint data_len, PurpleConnection *gc);
+void qq_process_add_buddy_reply(guint8 *data, gint data_len, guint16 seq, PurpleConnection *gc);
+void qq_process_add_buddy_auth_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 PurpleBuddy *qq_add_buddy_by_recv_packet(PurpleConnection *gc, guint32 uid, gboolean is_known, gboolean create);
 void qq_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group);
 
diff --git a/libpurple/protocols/qq/crypt.c b/libpurple/protocols/qq/crypt.c
deleted file mode 100644
index f2a1df5e0e..0000000000
--- a/libpurple/protocols/qq/crypt.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
- * @file crypt.c
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
- * QQ encryption algorithm
- * Convert from ASM code provided by PerlOICQ
- * 
- * Puzzlebird, Nov-Dec 2002
- */
-
-/* Notes: (QQ uses 16 rounds, and modified something...)
-
-IN : 64  bits of data in v[0] - v[1].
-OUT: 64  bits of data in w[0] - w[1].
-KEY: 128 bits of key  in k[0] - k[3].
-
-delta is chosen to be the real part of 
-the golden ratio: Sqrt(5/4) - 1/2 ~ 0.618034 multiplied by 2^32. 
-
-0x61C88647 is what we can track on the ASM codes.!!
-*/
-
-#include <string.h>
-
-#include "crypt.h"
-#include "debug.h"
-
-/* 1, fixed alignment problem, when compiled on different platform
- * 2, whether we need core debug
- * 20070717, s3e */
-#if 0 
-#define CORE_DEBUG
-#endif
-
-/********************************************************************
- * encryption 
- *******************************************************************/
-
-/* Tiny Encryption Algorithm (TEA) */
-static void qq_encipher(guint32 *const v, const guint32 *const k, guint32 *const w)
-{
-	register guint32
-		y = g_ntohl(v[0]), 
-		 z = g_ntohl(v[1]), 
-		 a = g_ntohl(k[0]), 
-		 b = g_ntohl(k[1]), 
-		 c = g_ntohl(k[2]), 
-		 d = g_ntohl(k[3]), 
-		 n = 0x10, 
-		 sum = 0, 
-		 delta = 0x9E3779B9;	/*  0x9E3779B9 - 0x100000000 = -0x61C88647 */
-
-	while (n-- > 0) {
-		sum += delta;
-		y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
-		z += ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
-	}
-
-	w[0] = g_htonl(y);
-	w[1] = g_htonl(z);
-}
-
-/* it can be the real random seed function */
-/* override with number, convenient for debug */
-#ifdef DEBUG
-static gint rand(void) {	
-	return 0xdead; 
-}
-#else
-#include <stdlib.h>
-#endif
-
-/* 64-bit blocks and some kind of feedback mode of operation */
-static inline void encrypt_block(guint8 *plain, guint8 *plain_pre_8, guint8 **crypted, 
-		guint8 **crypted_pre_8, const guint8 *const key, gint *count, 
-		gint *pos_in_block, gint *is_header) 
-{
-	/* loop it */
-	int j;
-	/* ships in encipher */
-	guint32 ptr_p[2];	/* 64 bits, guint32[2] */
-	guint32 ptr_k[4];	/* 128 bits, guint32[4] */
-	guint32 ptr_c[2];	/* 64 bits, guint32[2] */
-
-	/* prepare input text */
-#ifdef CORE_DEBUG
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ_CORE_DEBUG",
-		"!we are in encrypt_block! *pos_in_block comes: %d, *is_header comes: %d\n",
-		*pos_in_block, *is_header);
-#endif
-	for(j = 0; j < 8; j++) {
-#ifdef CORE_DEBUG
-		purple_debug(PURPLE_DEBUG_INFO, "QQ_CORE_DEBUG",
-			"plain[%d]: 0x%02x, plain_pre_8[%d]: 0x%02x\n",
-			j, plain[j], j, plain_pre_8[j]);
-#endif
-		if (!*is_header) {
-#ifdef CORE_DEBUG
-			purple_debug(PURPLE_DEBUG_INFO, "QQ_CORE_DEBUG",
-				"(*crypted_pre_8 + %d): 0x%02x\n",
-				j, *(*crypted_pre_8 + j));
-#endif
-			plain[j] ^= (*(*crypted_pre_8 + j));
-#ifdef CORE_DEBUG
-			purple_debug(PURPLE_DEBUG_INFO, "QQ_CORE_DEBUG",
-				"NOW plain[%d]: 0x%02x\n",
-				j, plain[j]);
-#endif
-		} else {
-			plain[j] ^= plain_pre_8[j];
-#ifdef CORE_DEBUG
-			purple_debug(PURPLE_DEBUG_INFO, "QQ_CORE_DEBUG",
-				"NOW plain[%d]: 0x%02x\n",
-				j, plain[j]);
-#endif
-		}
-	}
-
-	g_memmove(ptr_p, plain, 8);
-	g_memmove(ptr_k, key, 16);
-	g_memmove(ptr_c, *crypted, 8);
-
-	/* encrypt it */
-	qq_encipher(ptr_p, ptr_k, ptr_c);
-	
-	g_memmove(plain, ptr_p, 8);
-	g_memmove(*crypted, ptr_c, 8);
-
-	for(j = 0; j < 8; j++) {
-#ifdef CORE_DEBUG
-		purple_debug(PURPLE_DEBUG_INFO, "QQ_CORE_DEBUG",
-			"j: %d, *(*crypted + %d): 0x%02x, plain_pre_8[%d]: 0x%02x\n",
-			j, j, *(*crypted + j), j, plain_pre_8[j]);
-#endif
-		(*(*crypted + j)) ^= plain_pre_8[j];
-#ifdef CORE_DEBUG
-		purple_debug(PURPLE_DEBUG_INFO, "QQ_CORE_DEBUG",
-			"NOW *(*crypted + [%d]): 0x%02x\n",
-			j, *(*crypted + j));
-#endif
-	}
-	
-	memcpy(plain_pre_8, plain, 8);	/* prepare next */
-
-	*crypted_pre_8 = *crypted;	/* store position of previous 8 byte */
-	*crypted += 8;			/* prepare next output */
-	*count += 8;			/* outstrlen increase by 8 */
-	*pos_in_block = 0;		/* back to start */
-	*is_header = 0;			/* and exit header */
-}					/* encrypt_block */
-
-void qq_encrypt(const guint8 *const instr, gint instrlen, 
-		const guint8 *const key, 
-		guint8 *outstr, gint *outstrlen_ptr)
-{
-	guint8 plain[8],		/* plain text buffer */
-		plain_pre_8[8],		/* plain text buffer, previous 8 bytes */
-		*crypted,		/* crypted text */
-		*crypted_pre_8;		/* crypted text, previous 8 bytes */
-	const guint8 *inp;		/* current position in instr */
-	gint pos_in_block = 1,		/* loop in the byte */
-		is_header = 1,		/* header is one byte */
-		count = 0,		/* number of bytes being crypted */
-		padding = 0;		/* number of padding stuff */
-
-	pos_in_block = (instrlen + 0x0a) % 8;	/* header padding decided by instrlen */
-	if (pos_in_block)
-		pos_in_block = 8 - pos_in_block;
-
-	/* initialization vector */
-	plain[0] = (rand() & 0xf8) | pos_in_block;
-	memset(plain + 1, rand() & 0xff, pos_in_block++);
-
-	memset(plain_pre_8, 0x00, sizeof(plain_pre_8));
-
-	crypted = crypted_pre_8 = outstr;
-
-	padding = 1;		/* pad some stuff in header */
-	while (padding <= 2) {	/* at most two bytes */
-		if (pos_in_block < 8) {
-			plain[pos_in_block++] = rand() & 0xff;
-			padding++;
-		}
-		if (pos_in_block == 8) {
-			encrypt_block(plain, plain_pre_8, &crypted, &crypted_pre_8, 
-					key, &count, &pos_in_block, &is_header);
-		}
-	}
-
-	inp = instr;
-	while (instrlen > 0) {
-		if (pos_in_block < 8) {
-			plain[pos_in_block++] = *(inp++);
-			instrlen--;
-		}
-		if (pos_in_block == 8) {
-			encrypt_block(plain, plain_pre_8, &crypted, &crypted_pre_8, 
-					key, &count, &pos_in_block, &is_header);
-		}
-	}
-
-	padding = 1;		/* pad some stuff in tail */
-	while (padding <= 7) {	/* at most seven bytes */
-		if (pos_in_block < 8) {
-			plain[pos_in_block++] = 0x00;
-			padding++;
-		}
-		if (pos_in_block == 8) {
-			encrypt_block(plain, plain_pre_8, &crypted, &crypted_pre_8, 
-					key, &count, &pos_in_block, &is_header);
-		}
-	}
-
-	*outstrlen_ptr = count;
-}
-
-
-/******************************************************************** 
- * decryption 
- ********************************************************************/
-
-static void qq_decipher(guint32 *const v, const guint32 *const k, guint32 *const w)
-{
-	register guint32
-		y = g_ntohl(v[0]), 
-		z = g_ntohl(v[1]), 
-		a = g_ntohl(k[0]), 
-		b = g_ntohl(k[1]), 
-		c = g_ntohl(k[2]), 
-		d = g_ntohl(k[3]), 
-		n = 0x10, 
-		sum = 0xE3779B90,	/* why this ? must be related with n value */
-		delta = 0x9E3779B9;
-
-	/* sum = delta<<5, in general sum = delta * n */
-	while (n-- > 0) {
-		z -= ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
-		y -= ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
-		sum -= delta;
-	}
-
-	w[0] = g_htonl(y);
-	w[1] = g_htonl(z);
-}
-
-static gint decrypt_block(const guint8 **crypt_buff, const gint instrlen, 
-		const guint8 *const key, gint *context_start, 
-		guint8 *decrypted, gint *pos_in_block)
-{
-	/* loop */
-	int i;
-	/* ships in decipher */
-	guint32 ptr_v[2];
-	guint32 ptr_k[4];
-
-	if (*context_start == instrlen)
-		return 1;
-
-	for(i = 0; i < 8; i++) {
-		decrypted[i] ^= (*(*crypt_buff + i));
-	}
-	
-	g_memmove(ptr_v, decrypted, 8);
-	g_memmove(ptr_k, key, 16);
-
-	qq_decipher(ptr_v, ptr_k, ptr_v);
-
-	g_memmove(decrypted, ptr_v, 8);
-
-	*context_start += 8;
-	*crypt_buff += 8;
-	*pos_in_block = 0;
-
-	return 1;
-}
-
-/* return 0 if failed, 1 otherwise */
-gint qq_decrypt(const guint8 *const instr, gint instrlen, 
-		const guint8 *const key,
-		guint8 *outstr, gint *outstrlen_ptr)
-{
-	guint8 decrypted[8], m[8], *outp;
-	const guint8 *crypt_buff, *crypt_buff_pre_8;
-	gint count, context_start, pos_in_block, padding;
-	/* ships */
-	guint32 ptr_instr[2];
-	guint32 ptr_key[4];
-	guint32 ptr_decr[2];
-
-	/* at least 16 bytes and %8 == 0 */
-	if ((instrlen % 8) || (instrlen < 16)) { 
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-			"Ciphertext len is either too short or not a multiple of 8 bytes, read %d bytes\n", 
-			instrlen);
-		return 0;
-	}
-	g_memmove(ptr_instr, instr, 8);
-	g_memmove(ptr_key, key, 16);
-	g_memmove(ptr_decr, decrypted, 8);
-
-	qq_decipher(ptr_instr, ptr_key, ptr_decr);
-
-	g_memmove(decrypted, ptr_decr, 8);
-
-	pos_in_block = decrypted[0] & 0x7;
-	count = instrlen - pos_in_block - 10;	/* this is the plaintext length */
-	/* return if outstr buffer is not large enough or error plaintext length */
-	if (*outstrlen_ptr < count || count < 0) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Buffer len %d is less than real len %d", 
-			*outstrlen_ptr, count);
-		return 0;
-	}
-
-	memset(m, 0, 8);
-	crypt_buff_pre_8 = m;
-	*outstrlen_ptr = count;	/* everything is ok! set return string length */
-
-	crypt_buff = instr + 8;	/* address of real data start */
-	context_start = 8;	/* context is at the second block of 8 bytes */
-	pos_in_block++;		/* start of paddng stuff */
-
-	padding = 1;		/* at least one in header */
-	while (padding <= 2) {	/* there are 2 byte padding stuff in header */
-		if (pos_in_block < 8) {	/* bypass the padding stuff, it's nonsense data */
-			pos_in_block++;
-			padding++;
-		}
-		if (pos_in_block == 8) {
-			crypt_buff_pre_8 = instr;
-			if (!decrypt_block(&crypt_buff, instrlen, key, 
-						&context_start, decrypted, &pos_in_block)) {
-				purple_debug(PURPLE_DEBUG_ERROR, "QQ", "decrypt every 8 bytes error A");
-				return 0;
-			}
-		}
-	}
-
-	outp = outstr;
-	while (count != 0) {
-		if (pos_in_block < 8) {
-			*outp = crypt_buff_pre_8[pos_in_block] ^ decrypted[pos_in_block];
-			outp++;
-			count--;
-			pos_in_block++;
-		}
-		if (pos_in_block == 8) {
-			crypt_buff_pre_8 = crypt_buff - 8;
-			if (!decrypt_block(&crypt_buff, instrlen, key, 
-						&context_start, decrypted, &pos_in_block)) {
-				purple_debug(PURPLE_DEBUG_ERROR, "QQ", "decrypt every 8 bytes error B");
-				return 0;
-			}
-		}
-	}
-
-	for (padding = 1; padding < 8; padding++) {
-		if (pos_in_block < 8) {
-			if (crypt_buff_pre_8[pos_in_block] ^ decrypted[pos_in_block])
-				return 0;
-			pos_in_block++;
-		}
-		if (pos_in_block == 8) {
-			crypt_buff_pre_8 = crypt_buff;
-			if (!decrypt_block(&crypt_buff, instrlen, key, 
-						&context_start, decrypted, &pos_in_block)) {
-				purple_debug(PURPLE_DEBUG_ERROR, "QQ", "decrypt every 8 bytes error C");
-				return 0;
-			}
-		}
-	}
-
-	return 1;
-}
diff --git a/libpurple/protocols/qq/file_trans.c b/libpurple/protocols/qq/file_trans.c
index afdb89eead..1a08e25522 100644
--- a/libpurple/protocols/qq/file_trans.c
+++ b/libpurple/protocols/qq/file_trans.c
@@ -32,7 +32,7 @@
 #include "ft.h"
 #include "cipher.h"
 
-#include "crypt.h"
+#include "qq_crypt.h"
 #include "file_trans.h"
 #include "header_info.h"
 #include "im.h"
@@ -338,31 +338,30 @@ void qq_send_file_ctl_packet(PurpleConnection *gc, guint16 packet_type, guint32
 		raw_data, bytes,
 		"sending packet[%s]:", qq_get_file_cmd_desc(packet_type));
 
-	encrypted_len = bytes + 16;
-	encrypted_data = g_newa(guint8, encrypted_len);
-	qq_encrypt(raw_data, bytes, info->file_session_key, encrypted_data, &encrypted_len);
+	encrypted_data = g_newa(guint8, bytes + 16);
+	encrypted_len = qq_encrypt(encrypted_data, raw_data, bytes, info->file_session_key);
 	/*debug: try to decrypt it */
-	/*
-	   if (QQ_DEBUG) {
-	   guint8 *buf;
-	   int buflen;
-	   hex_dump = hex_dump_to_str(encrypted_data, encrypted_len);
-	   purple_debug(PURPLE_DEBUG_INFO, "QQ", "encrypted packet: \n%s", hex_dump);
-	   g_free(hex_dump);
-	   buf = g_newa(guint8, MAX_PACKET_SIZE);
-	   buflen = encrypted_len;
-	   if (qq_crypt(DECRYPT, encrypted_data, encrypted_len, info->file_session_key, buf, &buflen)) {
-	   purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypt success\n");
+
+#if 0
+	guint8 *buf;
+	int buflen;
+	hex_dump = hex_dump_to_str(encrypted_data, encrypted_len);
+	purple_debug(PURPLE_DEBUG_INFO, "QQ", "encrypted packet: \n%s", hex_dump);
+	g_free(hex_dump);
+	buf = g_newa(guint8, MAX_PACKET_SIZE);
+	buflen = encrypted_len;
+	if (qq_crypt(DECRYPT, encrypted_data, encrypted_len, info->file_session_key, buf, &buflen)) {
+		purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypt success\n");
 	   if (buflen == bytes && memcmp(raw_data, buf, buflen) == 0)
-	   purple_debug(PURPLE_DEBUG_INFO, "QQ", "checksum ok\n");
-	   hex_dump = hex_dump_to_str(buf, buflen);
-	   purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypted packet: \n%s", hex_dump);
-	   g_free(hex_dump);
-	   } else {
-	   purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypt fail\n");
-	   }
-	   }
-	   */
+			purple_debug(PURPLE_DEBUG_INFO, "QQ", "checksum ok\n");
+
+		hex_dump = hex_dump_to_str(buf, buflen);
+		purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypted packet: \n%s", hex_dump);
+		g_free(hex_dump);
+	 } else {
+		purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypt fail\n");
+	}
+#endif
 
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "<== send %s packet\n", qq_get_file_cmd_desc(packet_type));
 	_qq_send_file(gc, encrypted_data, encrypted_len, QQ_FILE_CONTROL_PACKET_TAG, info->to_uid);
@@ -498,7 +497,7 @@ static void _qq_send_file_data_packet(PurpleConnection *gc, guint16 packet_type,
  */
 
 
-static void _qq_process_recv_file_ctl_packet(PurpleConnection *gc, guint8 *data, gint len)
+static void _qq_process_recv_file_ctl_packet(PurpleConnection *gc, guint8 *data, gint data_len)
 {
 	gint bytes ;
 	gint decryped_bytes;
@@ -514,10 +513,9 @@ static void _qq_process_recv_file_ctl_packet(PurpleConnection *gc, guint8 *data,
 	bytes = 0;
 	bytes += _qq_get_file_header(&fh, data + bytes);
 
-	decrypted_data = g_newa(guint8, len);
-	decrypted_len = len;
-
-	if ( !qq_decrypt(data, len, qd->session_md5, decrypted_data, &decrypted_len) ) {
+	decrypted_data = g_newa(guint8, data_len);
+	decrypted_len = qq_decrypt(decrypted_data, data, data_len, qd->session_md5);
+	if ( decrypted_len <= 0 ) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt rcv file ctrl packet\n");
 		return;
 	}
diff --git a/libpurple/protocols/qq/group.c b/libpurple/protocols/qq/group.c
index e31e374260..bf5d9b0c09 100644
--- a/libpurple/protocols/qq/group.c
+++ b/libpurple/protocols/qq/group.c
@@ -32,17 +32,18 @@
 #include "group_info.h"
 #include "group_search.h"
 #include "utils.h"
-
+#include "qq_network.h"
+#include "header_info.h"
 #include "group.h"
 
 static void _qq_group_search_callback(PurpleConnection *gc, const gchar *input)
 {
-	guint32 external_group_id;
+	guint32 ext_id;
 
 	g_return_if_fail(input != NULL);
-	external_group_id = qq_string_to_dec_value(input);
+	ext_id = qq_string_to_dec_value(input);
 	/* 0x00000000 means search for demo group */
-	qq_send_cmd_group_search_group(gc, external_group_id);
+	qq_send_cmd_group_search_group(gc, ext_id);
 }
 
 static void _qq_group_search_cancel_callback(PurpleConnection *gc, const gchar *input)
@@ -104,7 +105,7 @@ PurpleRoomlist *qq_roomlist_get_list(PurpleConnection *gc)
 	fields = g_list_append(fields, f);
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_GROUP_KEY_INTERNAL_ID, TRUE);
 	fields = g_list_append(fields, f);
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_GROUP_KEY_GROUP_TYPE, TRUE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_GROUP_KEY_TYPE, TRUE);
 	fields = g_list_append(fields, f);
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, _("Auth"), QQ_GROUP_KEY_AUTH_TYPE, TRUE);
 	fields = g_list_append(fields, f);
@@ -145,12 +146,12 @@ void qq_roomlist_cancel(PurpleRoomlist *list)
 /* this should be called upon signin, even when we did not open group chat window */
 void qq_group_init(PurpleConnection *gc)
 {
-	gint i;
 	PurpleAccount *account;
 	PurpleChat *chat;
 	PurpleGroup *purple_group;
 	PurpleBlistNode *node;
 	qq_group *group;
+	gint count;
 
 	account = purple_connection_get_account(gc);
 
@@ -160,18 +161,25 @@ void qq_group_init(PurpleConnection *gc)
 		return;
 	}
 
-	i = 0;
-	for (node = ((PurpleBlistNode *) purple_group)->child; node != NULL; node = node->next)
-		if (PURPLE_BLIST_NODE_IS_CHAT(node)) {	/* got one */
-			chat = (PurpleChat *) node;
-			if (account != chat->account)
-				continue;	/* very important here ! */
-			group = qq_group_from_hashtable(gc, chat->components);
-			if (group != NULL) {
-				i++;
-				qq_send_cmd_group_get_group_info(gc, group);	/* get group info and members */
-			}
+	count = 0;
+	for (node = ((PurpleBlistNode *) purple_group)->child; node != NULL; node = node->next) {
+		if ( !PURPLE_BLIST_NODE_IS_CHAT(node)) {
+			continue;
 		}
+		/* got one */
+		chat = (PurpleChat *) node;
+		if (account != chat->account)	/* not qq account*/
+			continue;
+		group = qq_group_from_hashtable(gc, chat->components);
+		if (group == NULL)
+			continue;
+
+		if (group->id <= 0)
+			continue;
+
+		count++;
+		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
+	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Load %d QQ Qun configurations\n", i);
+	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Load %d QQ Qun configurations\n", count);
 }
diff --git a/libpurple/protocols/qq/group.h b/libpurple/protocols/qq/group.h
index 56fe705eda..5fe7987118 100644
--- a/libpurple/protocols/qq/group.h
+++ b/libpurple/protocols/qq/group.h
@@ -44,9 +44,9 @@ typedef struct _qq_group {
 	/* all these will be saved when we exit Purple */
 	qq_group_member_status my_status;	/* my status for this group */
 	gchar *my_status_desc;			/* my status description */
-	guint32 internal_group_id;
-	guint32 external_group_id;
-	guint8 group_type;			/* permanent or temporory */
+	guint32 id;
+	guint32 ext_id;
+	guint8 type8;			/* permanent or temporory */
 	guint32 creator_uid;
 	guint32 group_category;
 	guint8 auth_type;
diff --git a/libpurple/protocols/qq/group_find.c b/libpurple/protocols/qq/group_find.c
index 317de8b2c7..6ec1e92dcb 100644
--- a/libpurple/protocols/qq/group_find.c
+++ b/libpurple/protocols/qq/group_find.c
@@ -29,36 +29,8 @@
 #include "util.h"
 
 #include "group_find.h"
-#include "group_network.h"
 #include "utils.h"
 
-/* find the internal_group_id by the reply packet sequence
- * return TRUE if we have a record of it, return FALSE if not */
-gboolean qq_group_find_internal_group_id_by_seq(PurpleConnection *gc, guint16 seq, guint32 *internal_group_id)
-{
-	GList *list;
-	qq_data *qd;
-	group_packet *p;
-
-	if (internal_group_id == NULL)
-		return FALSE;
-	qd = (qq_data *) gc->proto_data;
-
-	list = qd->group_packets;
-	while (list != NULL) {
-		p = (group_packet *) (list->data);
-		if (p->send_seq == seq) {	/* found and remove */
-			*internal_group_id = p->internal_group_id;
-			qd->group_packets = g_list_remove(qd->group_packets, p);
-			g_free(p);
-			return TRUE;
-		}
-		list = list->next;
-	}
-
-	return FALSE;
-}
-
 /* find a qq_buddy by uid, called by im.c */
 qq_buddy *qq_group_find_member_by_uid(qq_group *group, guint32 uid)
 {
@@ -150,7 +122,30 @@ qq_group *qq_group_find_by_channel(PurpleConnection *gc, gint channel)
 }
 
 /* find a qq_group by its id, flag is QQ_INTERNAL_ID or QQ_EXTERNAL_ID */
-qq_group *qq_group_find_by_id(PurpleConnection *gc, guint32 id, gboolean flag)
+qq_group *qq_room_search_ext_id(PurpleConnection *gc, guint32 ext_id)
+{
+	GList *list;
+	qq_group *group;
+	qq_data *qd;
+
+	qd = (qq_data *) gc->proto_data;
+
+	if (qd->groups == NULL || ext_id <= 0)
+		return NULL;
+
+	list = qd->groups;
+	while (list != NULL) {
+		group = (qq_group *) list->data;
+		if (group->ext_id == ext_id) {
+			return group;
+		}
+		list = list->next;
+	}
+
+	return NULL;
+}
+
+qq_group *qq_room_search_id(PurpleConnection *gc, guint32 room_id)
 {
 	GList *list;
 	qq_group *group;
@@ -158,15 +153,15 @@ qq_group *qq_group_find_by_id(PurpleConnection *gc, guint32 id, gboolean flag)
 
 	qd = (qq_data *) gc->proto_data;
 
-	if (qd->groups == NULL || id <= 0)
+	if (qd->groups == NULL || room_id <= 0)
 		return NULL;
 
 	list = qd->groups;
 	while (list != NULL) {
 		group = (qq_group *) list->data;
-		if (flag == QQ_INTERNAL_ID ? 
-				(group->internal_group_id == id) : (group->external_group_id == id))
+		if (group->id == room_id) {
 			return group;
+		}
 		list = list->next;
 	}
 
diff --git a/libpurple/protocols/qq/group_find.h b/libpurple/protocols/qq/group_find.h
index b5d5fb714f..45e0b15657 100644
--- a/libpurple/protocols/qq/group_find.h
+++ b/libpurple/protocols/qq/group_find.h
@@ -29,14 +29,13 @@
 #include "connection.h"
 #include "group.h"
 
-#define QQ_INTERNAL_ID 0
-#define QQ_EXTERNAL_ID 1
-
 qq_buddy *qq_group_find_member_by_uid(qq_group *group, guint32 uid);
 void qq_group_remove_member_by_uid(qq_group *group, guint32 uid);
 qq_buddy *qq_group_find_or_add_member(PurpleConnection *gc, qq_group *group, guint32 member_uid);
-gboolean qq_group_find_internal_group_id_by_seq(PurpleConnection *gc, guint16 seq, guint32 *internal_group_id);
+gboolean qq_group_find_id_by_seq(PurpleConnection *gc, guint16 seq, guint32 *id);
 qq_group *qq_group_find_by_channel(PurpleConnection *gc, gint channel);
-qq_group *qq_group_find_by_id(PurpleConnection *gc, guint32 id, gboolean flag);
+
+qq_group *qq_room_search_ext_id(PurpleConnection *gc, guint32 ext_id);
+qq_group *qq_room_search_id(PurpleConnection *gc, guint32 room_id);
 
 #endif
diff --git a/libpurple/protocols/qq/group_free.c b/libpurple/protocols/qq/group_free.c
index 0900bb4e01..eb76ad5ae4 100644
--- a/libpurple/protocols/qq/group_free.c
+++ b/libpurple/protocols/qq/group_free.c
@@ -28,7 +28,6 @@
 
 #include "buddy_list.h"
 #include "group_free.h"
-#include "group_network.h"
 
 /* gracefully free all members in a group */
 static void qq_group_free_member(qq_group *group)
@@ -62,22 +61,6 @@ void qq_group_free(qq_group *group)
 	g_free(group);
 }
 
-/* clean up group_packets and free all contents */
-void qq_group_packets_free(qq_data *qd)
-{
-	group_packet *p;
-	gint i;
-
-	i = 0;
-	while (qd->group_packets != NULL) {
-		p = (group_packet *) (qd->group_packets->data);
-		qd->group_packets = g_list_remove(qd->group_packets, p);
-		g_free(p);
-		i++;
-	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "%d group packets are freed!\n", i);
-}
-
 void qq_group_free_all(qq_data *qd)
 {
 	qq_group *group;
diff --git a/libpurple/protocols/qq/group_free.h b/libpurple/protocols/qq/group_free.h
index dc90a7e1b9..759decd310 100644
--- a/libpurple/protocols/qq/group_free.h
+++ b/libpurple/protocols/qq/group_free.h
@@ -29,8 +29,6 @@
 #include "qq.h"
 #include "group.h"
 
-void qq_group_packets_free(qq_data *qd);
-
 void qq_group_free(qq_group *group);
 void qq_group_free_all(qq_data *qd);
 
diff --git a/libpurple/protocols/qq/group_im.c b/libpurple/protocols/qq/group_im.c
index aada103d70..f4b9cff90f 100644
--- a/libpurple/protocols/qq/group_im.c
+++ b/libpurple/protocols/qq/group_im.c
@@ -36,15 +36,16 @@
 #include "group_internal.h"
 #include "group_info.h"
 #include "group_im.h"
-#include "group_network.h"
 #include "group_opt.h"
 #include "im.h"
+#include "header_info.h"
 #include "packet_parse.h"
+#include "qq_network.h"
 #include "utils.h"
 
 typedef struct _qq_recv_group_im {
-	guint32 external_group_id;
-	guint8 group_type;
+	guint32 ext_id;
+	guint8 type8;
 	guint32 member_uid;
 	guint16 msg_seq;
 	time_t send_time;
@@ -68,12 +69,10 @@ void qq_send_packet_group_im(PurpleConnection *gc, qq_group *group, const gchar
 	purple_debug_info("QQ_MESG", "Send qun mesg filterd: %s\n", msg_filtered);
 	msg_len = strlen(msg_filtered);
 
-	data_len = 7 + msg_len + QQ_SEND_IM_AFTER_MSG_LEN;
+	data_len = 2 + msg_len + QQ_SEND_IM_AFTER_MSG_LEN;
 	raw_data = g_newa(guint8, data_len);
 
 	bytes = 0;
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_SEND_MSG);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
 	bytes += qq_put16(raw_data + bytes, msg_len + QQ_SEND_IM_AFTER_MSG_LEN);
 	bytes += qq_putdata(raw_data + bytes, (guint8 *) msg_filtered, msg_len);
 	send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL,
@@ -84,7 +83,7 @@ void qq_send_packet_group_im(PurpleConnection *gc, qq_group *group, const gchar
 	g_free(msg_filtered);
 
 	if (bytes == data_len)	/* create OK */
-		qq_send_group_cmd(gc, group, raw_data, data_len);
+		qq_send_room_cmd(gc, QQ_ROOM_CMD_SEND_MSG, group->id, raw_data, data_len);
 	else
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
 				"Fail creating group_im packet, expect %d bytes, build %d bytes\n", data_len, bytes);
@@ -99,33 +98,33 @@ void qq_process_group_cmd_im(guint8 *data, gint len, PurpleConnection *gc)
 }
 
 /* receive an application to join the group */
-void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, user_uid;
-	guint8 group_type;
+	guint32 ext_id, user_uid;
+	guint8 type8;
 	gchar *reason_utf8, *msg, *reason;
 	group_member_opt *g;
 	gchar *nombre;
 	gint bytes = 0;
 
-	g_return_if_fail(internal_group_id > 0 && data != NULL && len > 0);
+	g_return_if_fail(id > 0 && data != NULL && len > 0);
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&user_uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && user_uid > 0);
+	g_return_if_fail(ext_id > 0 && user_uid > 0);
 
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
-	msg = g_strdup_printf(_("User %d requested to join group %d"), user_uid, external_group_id);
+	msg = g_strdup_printf(_("User %d requested to join group %d"), user_uid, ext_id);
 	reason = g_strdup_printf(_("Reason: %s"), reason_utf8);
 
 	g = g_new0(group_member_opt, 1);
 	g->gc = gc;
-	g->internal_group_id = internal_group_id;
+	g->id = id;
 	g->member = user_uid;
 
 	nombre = uid_to_purple_name(user_uid);
@@ -150,10 +149,10 @@ void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 interna
 }
 
 /* the request to join a group is rejected */
-void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, admin_uid;
-	guint8 group_type;
+	guint32 ext_id, admin_uid;
+	guint8 type8;
 	gchar *reason_utf8, *msg, *reason;
 	qq_group *group;
 	gint bytes = 0;
@@ -162,21 +161,21 @@ void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 inte
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&admin_uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && admin_uid > 0);
+	g_return_if_fail(ext_id > 0 && admin_uid > 0);
 
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
 	msg = g_strdup_printf
-		(_("Your request to join group %d has been rejected by admin %d"), external_group_id, admin_uid);
+		(_("Your request to join group %d has been rejected by admin %d"), ext_id, admin_uid);
 	reason = g_strdup_printf(_("Reason: %s"), reason_utf8);
 
 	purple_notify_warning(gc, _("QQ Qun Operation"), msg, reason);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
 		qq_group_refresh(gc, group);
@@ -188,10 +187,10 @@ void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 inte
 }
 
 /* the request to join a group is approved */
-void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, admin_uid;
-	guint8 group_type;
+	guint32 ext_id, admin_uid;
+	guint8 type8;
 	gchar *reason_utf8, *msg;
 	qq_group *group;
 	gint bytes = 0;
@@ -200,20 +199,20 @@ void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 inte
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&admin_uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && admin_uid > 0);
+	g_return_if_fail(ext_id > 0 && admin_uid > 0);
 	/* it is also a "无" here, so do not display */
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
 	msg = g_strdup_printf
-		(_("Your request to join group %d has been approved by admin %d"), external_group_id, admin_uid);
+		(_("Your request to join group %d has been approved by admin %d"), ext_id, admin_uid);
 
 	purple_notify_warning(gc, _("QQ Qun Operation"), msg, NULL);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
 		qq_group_refresh(gc, group);
@@ -224,10 +223,10 @@ void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 inte
 }
 
 /* process the packet when removed from a group */
-void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, uid;
-	guint8 group_type;
+	guint32 ext_id, uid;
+	guint8 type8;
 	gchar *msg;
 	qq_group *group;
 	gint bytes = 0;
@@ -236,16 +235,16 @@ void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 inter
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && uid > 0);
+	g_return_if_fail(ext_id > 0 && uid > 0);
 
-	msg = g_strdup_printf(_("You [%d] have left group \"%d\""), uid, external_group_id);
+	msg = g_strdup_printf(_("You [%d] have left group \"%d\""), uid, ext_id);
 	purple_notify_info(gc, _("QQ Qun Operation"), msg, NULL);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
 		qq_group_refresh(gc, group);
@@ -255,10 +254,10 @@ void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 inter
 }
 
 /* process the packet when added to a group */
-void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, uid;
-	guint8 group_type;
+	guint32 ext_id, uid;
+	guint8 type8;
 	qq_group *group;
 	gchar *msg;
 	gint bytes = 0;
@@ -267,24 +266,24 @@ void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 interna
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && uid > 0);
+	g_return_if_fail(ext_id > 0 && uid > 0);
 
-	msg = g_strdup_printf(_("You [%d] have been added to group \"%d\""), uid, external_group_id);
+	msg = g_strdup_printf(_("You [%d] have been added to group \"%d\""), uid, ext_id);
 	purple_notify_info(gc, _("QQ Qun Operation"), msg, _("This group has been added to your buddy list"));
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
 		qq_group_refresh(gc, group);
 	} else {		/* no such group, try to create a dummy first, and then update */
-		group = qq_group_create_internal_record(gc, internal_group_id, external_group_id, NULL);
+		group = qq_group_create_internal_record(gc, id, ext_id, NULL);
 		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
 		qq_group_refresh(gc, group);
-		qq_send_cmd_group_get_group_info(gc, group);
+		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 		/* the return of this cmd will automatically update the group in blist */
 	}
 
@@ -292,7 +291,7 @@ void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 interna
 }
 
 /* recv an IM from a group chat */
-void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 internal_group_id, PurpleConnection *gc, guint16 im_type)
+void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type)
 {
 	gchar *msg_with_purple_smiley, *msg_utf8_encoded, *im_src_name;
 	guint16 unknown;
@@ -315,11 +314,11 @@ void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 internal_grou
 
 	im_group = g_newa(qq_recv_group_im, 1);
 
-	bytes += qq_get32(&(im_group->external_group_id), data + bytes);
-	bytes += qq_get8(&(im_group->group_type), data + bytes);
+	bytes += qq_get32(&(im_group->ext_id), data + bytes);
+	bytes += qq_get8(&(im_group->type8), data + bytes);
 
 	if(QQ_RECV_IM_TEMP_QUN_IM == im_type) {
-		bytes += qq_get32(&(internal_group_id), data + bytes);
+		bytes += qq_get32(&(id), data + bytes);
 	}
 
 	bytes += qq_get32(&(im_group->member_uid), bytes + data);
@@ -372,13 +371,13 @@ void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 internal_grou
 	else
 		msg_utf8_encoded = qq_to_utf8(msg_with_purple_smiley, QQ_CHARSET_DEFAULT);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->group_name_utf8, purple_connection_get_account(gc));
 	if (conv == NULL && purple_prefs_get_bool("/plugins/prpl/qq/prompt_group_msg_on_recv")) {
 		/* New conv should open, get group info*/
-		qq_send_cmd_group_get_group_info(gc, group);
+		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 		
 		serv_got_joined_chat(gc, qd->channel++, group->group_name_utf8);
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->group_name_utf8, purple_connection_get_account(gc));
diff --git a/libpurple/protocols/qq/group_im.h b/libpurple/protocols/qq/group_im.h
index 7b22ea4a5a..6d38cb2fc0 100644
--- a/libpurple/protocols/qq/group_im.h
+++ b/libpurple/protocols/qq/group_im.h
@@ -35,26 +35,26 @@ void qq_send_packet_group_im(PurpleConnection *gc, qq_group *group, const gchar
 void qq_process_group_cmd_im(guint8 *data, gint len, PurpleConnection *gc);
 
 /* void qq_process_recv_group_im(guint8 *data, guint8 **cursor, 
- * gint data_len, guint32 internal_group_id, PurpleConnection *gc, guint16 im_type); */
-void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 internal_group_id, PurpleConnection *gc, guint16 im_type);
+ * gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type); */
+void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type);
 
 /* void qq_process_recv_group_im_apply_join(guint8 *data, guint8 **cursor, gint len, 
- * guint32 internal_group_id, PurpleConnection *gc); */
-void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc);
+ * guint32 id, PurpleConnection *gc); */
+void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
 /* void qq_process_recv_group_im_been_rejected(guint8 *data, guint8 **cursor, gint len, 
- * guint32 internal_group_id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc);
+ * guint32 id, PurpleConnection *gc); */
+void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
 /* void qq_process_recv_group_im_been_approved(guint8 *data, guint8 **cursor, gint len, 
- * guint32 internal_group_id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc);
+ * guint32 id, PurpleConnection *gc); */
+void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
 /* void qq_process_recv_group_im_been_removed(guint8 *data, guint8 **cursor, gint len, 
- * guint32 internal_group_id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc);
+ * guint32 id, PurpleConnection *gc); */
+void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
 /* void qq_process_recv_group_im_been_added(guint8 *data,  guint8 **cursor, gint len, 
- * guint32 internal_group_id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc);
+ * guint32 id, PurpleConnection *gc); */
+void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 #endif
diff --git a/libpurple/protocols/qq/group_info.c b/libpurple/protocols/qq/group_info.c
index b7da8a4d3d..ba9b1536ea 100644
--- a/libpurple/protocols/qq/group_info.c
+++ b/libpurple/protocols/qq/group_info.c
@@ -32,7 +32,10 @@
 #include "group_internal.h"
 #include "group_info.h"
 #include "buddy_list.h"
-#include "group_network.h"
+#include "header_info.h"
+#include "packet_parse.h"
+#include "qq_network.h"
+#include "utils.h"
 
 /* we check who needs to update member info every minutes
  * this interval determines if their member info is outdated */
@@ -61,20 +64,6 @@ static void _qq_group_set_members_all_offline(qq_group *group)
 	}
 }
 
-/* send packet to get detailed information of one group */
-void qq_send_cmd_group_get_group_info(PurpleConnection *gc, qq_group *group)
-{
-	guint8 raw_data[16] = {0};
-	gint bytes = 0;
-
-	g_return_if_fail(group != NULL);
-
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_GET_GROUP_INFO);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
-
-	qq_send_group_cmd(gc, group, raw_data, bytes);
-}
-
 /* send packet to get online group member, called by keep_alive */
 void qq_send_cmd_group_all_get_online_members(PurpleConnection *gc)
 {
@@ -99,9 +88,6 @@ void qq_send_cmd_group_all_get_online_members(PurpleConnection *gc)
 
 void qq_send_cmd_group_get_online_members(PurpleConnection *gc, qq_group *group)
 {
-	guint8 raw_data[16] = {0};
-	gint bytes = 0;
-
 	g_return_if_fail(group != NULL);
 
 	/* only get online members when conversation window is on */
@@ -111,17 +97,14 @@ void qq_send_cmd_group_get_online_members(PurpleConnection *gc, qq_group *group)
 		return;
 	}
 
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_GET_ONLINE_MEMBER);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
-
-	qq_send_group_cmd(gc, group, raw_data, bytes);
+	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_ONLINES, group->id);
 }
 
 /* send packet to get info for each group member */
 void qq_send_cmd_group_get_members_info(PurpleConnection *gc, qq_group *group)
 {
 	guint8 *raw_data;
-	gint bytes, num, data_len;
+	gint bytes, num;
 	GList *list;
 	qq_buddy *member;
 
@@ -137,12 +120,9 @@ void qq_send_cmd_group_get_members_info(PurpleConnection *gc, qq_group *group)
 		return;
 	}
 
-	data_len = 5 + 4 * num;
-	raw_data = g_newa(guint8, data_len);
+	raw_data = g_newa(guint8, 4 * num);
 
 	bytes = 0;
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_GET_MEMBER_INFO);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
 
 	list = group->members;
 	while (list != NULL) {
@@ -152,16 +132,10 @@ void qq_send_cmd_group_get_members_info(PurpleConnection *gc, qq_group *group)
 		list = list->next;
 	}
 
-	if (bytes != data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-				"Fail create packet for %s\n", qq_group_cmd_get_desc(QQ_GROUP_CMD_GET_MEMBER_INFO));
-		return;
-	}
-
-	qq_send_group_cmd(gc, group, raw_data, bytes);
+	qq_send_room_cmd(gc, QQ_ROOM_CMD_GET_MEMBER_INFO, group->id, raw_data, bytes);
 }
 
-void qq_process_group_cmd_get_group_info(guint8 *data, gint len, PurpleConnection *gc)
+void qq_process_room_cmd_get_info(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_group *group;
 	qq_buddy *member;
@@ -169,33 +143,33 @@ void qq_process_group_cmd_get_group_info(guint8 *data, gint len, PurpleConnectio
 	PurpleConversation *purple_conv;
 	guint8 organization, role;
 	guint16 unknown, max_members;
-	guint32 member_uid, internal_group_id, external_group_id;
+	guint32 member_uid, id, ext_id;
 	GSList *pending_id;
 	guint32 unknown4;
 	guint8 unknown1;
 	gint bytes, num;
 	gchar *notice;
 
-	g_return_if_fail(data != NULL && len > 0);
+	g_return_if_fail(data != NULL && data_len > 0);
 	qd = (qq_data *) gc->proto_data;
 
 	bytes = 0;
-	bytes += qq_get32(&(internal_group_id), data + bytes);
-	g_return_if_fail(internal_group_id > 0);
+	bytes += qq_get32(&id, data + bytes);
+	g_return_if_fail(id > 0);
 
-	bytes += qq_get32(&(external_group_id), data + bytes);
-	g_return_if_fail(external_group_id > 0);
+	bytes += qq_get32(&ext_id, data + bytes);
+	g_return_if_fail(ext_id > 0);
 
-	pending_id = qq_get_pending_id(qd->adding_groups_from_server, internal_group_id);
+	pending_id = qq_get_pending_id(qd->adding_groups_from_server, id);
 	if (pending_id != NULL) {
-		qq_set_pending_id(&qd->adding_groups_from_server, internal_group_id, FALSE);
-		qq_group_create_internal_record(gc, internal_group_id, external_group_id, NULL);
+		qq_set_pending_id(&qd->adding_groups_from_server, id, FALSE);
+		qq_group_create_internal_record(gc, id, ext_id, NULL);
 	}
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	bytes += qq_get8(&(group->group_type), data + bytes);
+	bytes += qq_get8(&(group->type8), data + bytes);
 	bytes += qq_get32(&unknown4, data + bytes);	/* unknown 4 bytes */
 	bytes += qq_get32(&(group->creator_uid), data + bytes);
 	bytes += qq_get8(&(group->auth_type), data + bytes);
@@ -210,7 +184,7 @@ void qq_process_group_cmd_get_group_info(guint8 *data, gint len, PurpleConnectio
 	 * qunDestLen(qunDestcontent)) */
 	bytes += qq_get8(&unknown1, data + bytes);
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "type=%u creatorid=%u category=%u maxmembers=%u\n",
-			group->group_type, group->creator_uid, group->group_category, max_members);
+			group->type8, group->creator_uid, group->group_category, max_members);
 	
 	/* strlen + <str content> */
 	bytes += convert_as_pascal_string(data + bytes, &(group->group_name_utf8), QQ_CHARSET_DEFAULT);
@@ -223,23 +197,25 @@ void qq_process_group_cmd_get_group_info(guint8 *data, gint len, PurpleConnectio
 
 	num = 0;
 	/* now comes the member list separated by 0x00 */
-	while (bytes < len) {
+	while (bytes < data_len) {
 		bytes += qq_get32(&member_uid, data + bytes);
 		num++;
 		bytes += qq_get8(&organization, data + bytes);
 		bytes += qq_get8(&role, data + bytes);
 
-		/*
+#if 0
 		if(organization != 0 || role != 0) {
 			purple_debug(PURPLE_DEBUG_INFO, "QQ_GRP", "%d, organization=%d, role=%d\n", member_uid, organization, role);
 		}
-		*/
+#endif
+
 		member = qq_group_find_or_add_member(gc, group, member_uid);
 		if (member != NULL)
 			member->role = role;
 	}
-	if(bytes > len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "group_cmd_get_group_info: Dangerous error! maybe protocol changed, notify me!");
+	if(bytes > data_len) {
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+			"group_cmd_get_group_info: Dangerous error! maybe protocol changed, notify me!");
 	}
 
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "group \"%s\" has %d members\n", group->group_name_utf8, num);
@@ -265,9 +241,9 @@ void qq_process_group_cmd_get_group_info(guint8 *data, gint len, PurpleConnectio
 	purple_conv_chat_set_topic(PURPLE_CONV_CHAT(purple_conv), NULL, group->notice_utf8);
 }
 
-void qq_process_group_cmd_get_online_members(guint8 *data, gint len, PurpleConnection *gc)
+void qq_process_room_cmd_get_onlines(guint8 *data, gint len, PurpleConnection *gc)
 {
-	guint32 internal_group_id, member_uid;
+	guint32 id, member_uid;
 	guint8 unknown;
 	gint bytes, num;
 	qq_group *group;
@@ -281,14 +257,14 @@ void qq_process_group_cmd_get_online_members(guint8 *data, gint len, PurpleConne
 	}
 
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
+	bytes += qq_get32(&id, data + bytes);
 	bytes += qq_get8(&unknown, data + bytes);	/* 0x3c ?? */
-	g_return_if_fail(internal_group_id > 0);
+	g_return_if_fail(id > 0);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group == NULL) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-				"We have no group info for internal id [%d]\n", internal_group_id);
+				"We have no group info for internal id [%d]\n", id);
 		return;
 	}
 
@@ -311,11 +287,11 @@ void qq_process_group_cmd_get_online_members(guint8 *data, gint len, PurpleConne
 }
 
 /* process the reply to get_members_info packet */
-void qq_process_group_cmd_get_members_info(guint8 *data, gint len, PurpleConnection *gc)
+void qq_process_room_cmd_get_members(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
 	gint num;
-	guint32 internal_group_id, member_uid;
+	guint32 id, member_uid;
 	guint16 unknown;
 	qq_group *group;
 	qq_buddy *member;
@@ -323,11 +299,15 @@ void qq_process_group_cmd_get_members_info(guint8 *data, gint len, PurpleConnect
 
 	g_return_if_fail(data != NULL && len > 0);
 
+#if 0
+	qq_show_packet("qq_process_room_cmd_get_members", data, len);
+#endif
+
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
-	g_return_if_fail(internal_group_id > 0);
+	bytes += qq_get32(&id, data + bytes);
+	g_return_if_fail(id > 0);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
 	num = 0;
@@ -352,19 +332,18 @@ void qq_process_group_cmd_get_members_info(guint8 *data, gint len, PurpleConnect
 		member->nickname = g_strdup(nick);
 		g_free(nick);
 		
-		/*
-		if (QQ_DEBUG) {
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"member [%09d]: ext_flag=0x%02x, comm_flag=0x%02x, nick=%s\n",
-					member_uid, member->ext_flag, member->comm_flag, member->nickname);
-		}
-		*/
+#if 0
+		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+				"member [%09d]: ext_flag=0x%02x, comm_flag=0x%02x, nick=%s\n",
+				member_uid, member->ext_flag, member->comm_flag, member->nickname);
+#endif
 
 		member->last_refresh = time(NULL);
 	}
-	if(bytes > len) {
+	if (bytes > len) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
 				"group_cmd_get_members_info: Dangerous error! maybe protocol changed, notify developers!");
 	}
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Group \"%s\" obtained %d member info\n", group->group_name_utf8, num);
 }
+
diff --git a/libpurple/protocols/qq/group_info.h b/libpurple/protocols/qq/group_info.h
index d6497d5350..d2ac04fe0b 100644
--- a/libpurple/protocols/qq/group_info.h
+++ b/libpurple/protocols/qq/group_info.h
@@ -29,14 +29,12 @@
 #include "connection.h"
 #include "group.h"
 
-void qq_send_cmd_group_get_group_info(PurpleConnection *gc, qq_group *group);
 void qq_send_cmd_group_get_online_members(PurpleConnection *gc, qq_group *group);
 void qq_send_cmd_group_all_get_online_members(PurpleConnection *gc);
 
 void qq_send_cmd_group_get_members_info(PurpleConnection *gc, qq_group *group);
 
-void qq_process_group_cmd_get_group_info(guint8 *data, gint len, PurpleConnection *gc);
-void qq_process_group_cmd_get_online_members(guint8 *data, gint len, PurpleConnection *gc);
-void qq_process_group_cmd_get_members_info(guint8 *data, gint len, PurpleConnection *gc);
-
+void qq_process_room_cmd_get_info(guint8 *data, gint len, PurpleConnection *gc);
+void qq_process_room_cmd_get_onlines(guint8 *data, gint len, PurpleConnection *gc);
+void qq_process_room_cmd_get_members(guint8 *data, gint len, PurpleConnection *gc);
 #endif
diff --git a/libpurple/protocols/qq/group_internal.c b/libpurple/protocols/qq/group_internal.c
index 5af15b1a7e..997fda8a82 100644
--- a/libpurple/protocols/qq/group_internal.c
+++ b/libpurple/protocols/qq/group_internal.c
@@ -68,12 +68,12 @@ static void _qq_group_add_to_blist(PurpleConnection *gc, qq_group *group)
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", "You have added group \"%s\" to blist locally\n", group->group_name_utf8);
 }
 
-/* Create a dummy qq_group, which includes only internal_id, external_id,
+/* Create a dummy qq_group, which includes only internal_id, ext_id,
  * and potentially group_name_utf8, in case we need to call group_conv_show_window
  * right after creation. All other attributes are set to empty.
  * We need to send a get_group_info to the QQ server to update it right away */
 qq_group *qq_group_create_internal_record(PurpleConnection *gc,
-                guint32 internal_id, guint32 external_id, gchar *group_name_utf8)
+                guint32 internal_id, guint32 ext_id, gchar *group_name_utf8)
 {
         qq_group *group;
         qq_data *qd;
@@ -84,9 +84,9 @@ qq_group *qq_group_create_internal_record(PurpleConnection *gc,
         group = g_new0(qq_group, 1);
         group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
         group->my_status_desc = _qq_group_set_my_status_desc(group);
-        group->internal_group_id = internal_id;
-        group->external_group_id = external_id;
-        group->group_type = 0x01;       /* assume permanent Qun */
+        group->id = internal_id;
+        group->ext_id = ext_id;
+        group->type8 = 0x01;       /* assume permanent Qun */
         group->creator_uid = 10000;     /* assume by QQ admin */
         group->group_category = 0x01;
         group->auth_type = 0x02;        /* assume need auth */
@@ -101,7 +101,7 @@ qq_group *qq_group_create_internal_record(PurpleConnection *gc,
         return group;
 }
 
-void qq_group_delete_internal_record(qq_data *qd, guint32 internal_group_id)
+void qq_group_delete_internal_record(qq_data *qd, guint32 id)
 {
         qq_group *group;
         GList *list;
@@ -109,7 +109,7 @@ void qq_group_delete_internal_record(qq_data *qd, guint32 internal_group_id)
         list = qd->groups;
         while (list != NULL) {
                 group = (qq_group *) qd->groups->data;
-                if (internal_group_id == group->internal_group_id) {
+                if (id == group->id) {
                         qd->groups = g_list_remove(qd->groups, group);
                         qq_group_free(group);
                         break;
@@ -128,10 +128,10 @@ GHashTable *qq_group_to_hashtable(qq_group *group)
 	group->my_status_desc = _qq_group_set_my_status_desc(group);
 
 	g_hash_table_insert(components,
-			    g_strdup(QQ_GROUP_KEY_INTERNAL_ID), g_strdup_printf("%d", group->internal_group_id));
+			    g_strdup(QQ_GROUP_KEY_INTERNAL_ID), g_strdup_printf("%d", group->id));
 	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_EXTERNAL_ID),
-			    g_strdup_printf("%d", group->external_group_id));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_GROUP_TYPE), g_strdup_printf("%d", group->group_type));
+			    g_strdup_printf("%d", group->ext_id));
+	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_TYPE), g_strdup_printf("%d", group->type8));
 	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_CREATOR_UID), g_strdup_printf("%d", group->creator_uid));
 	g_hash_table_insert(components,
 			    g_strdup(QQ_GROUP_KEY_GROUP_CATEGORY), g_strdup_printf("%d", group->group_category));
@@ -157,12 +157,11 @@ qq_group *qq_group_from_hashtable(PurpleConnection *gc, GHashTable *data)
 	    (NULL ==
 	     g_hash_table_lookup(data,
 				 QQ_GROUP_KEY_MEMBER_STATUS) ?
-	     g_strdup_printf("%d",
-			     QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) :
+	     g_strdup_printf("%d", QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) :
 	     g_hash_table_lookup(data, QQ_GROUP_KEY_MEMBER_STATUS));
-	group->internal_group_id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_INTERNAL_ID));
-	group->external_group_id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_EXTERNAL_ID));
-	group->group_type = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_GROUP_TYPE));
+	group->id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_INTERNAL_ID));
+	group->ext_id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_EXTERNAL_ID));
+	group->type8 = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_TYPE));
 	group->creator_uid = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_CREATOR_UID));
 	group->group_category = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_GROUP_CATEGORY));
 	group->auth_type = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_AUTH_TYPE));
@@ -179,12 +178,12 @@ qq_group *qq_group_from_hashtable(PurpleConnection *gc, GHashTable *data)
 void qq_group_refresh(PurpleConnection *gc, qq_group *group)
 {
 	PurpleChat *chat;
-	gchar *external_group_id;
+	gchar *ext_id;
 	g_return_if_fail(group != NULL);
 
-	external_group_id = g_strdup_printf("%d", group->external_group_id);
-	chat = purple_blist_find_chat(purple_connection_get_account(gc), external_group_id);
-	g_free(external_group_id);
+	ext_id = g_strdup_printf("%d", group->ext_id);
+	chat = purple_blist_find_chat(purple_connection_get_account(gc), ext_id);
+	g_free(ext_id);
 	if (chat == NULL && group->my_status != QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) {
 		_qq_group_add_to_blist(gc, group);
 	} else if (chat != NULL) {	/* we have a local record, update its info */
@@ -198,12 +197,12 @@ void qq_group_refresh(PurpleConnection *gc, qq_group *group)
 				     g_strdup(QQ_GROUP_KEY_MEMBER_STATUS_DESC), g_strdup(group->my_status_desc));
 		g_hash_table_replace(chat->components,
 				     g_strdup(QQ_GROUP_KEY_INTERNAL_ID),
-				     g_strdup_printf("%d", group->internal_group_id));
+				     g_strdup_printf("%d", group->id));
 		g_hash_table_replace(chat->components,
 				     g_strdup(QQ_GROUP_KEY_EXTERNAL_ID),
-				     g_strdup_printf("%d", group->external_group_id));
+				     g_strdup_printf("%d", group->ext_id));
 		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_GROUP_TYPE), g_strdup_printf("%d", group->group_type));
+				     g_strdup(QQ_GROUP_KEY_TYPE), g_strdup_printf("%d", group->type8));
 		g_hash_table_replace(chat->components,
 				     g_strdup(QQ_GROUP_KEY_CREATOR_UID), g_strdup_printf("%d", group->creator_uid));
 		g_hash_table_replace(chat->components,
diff --git a/libpurple/protocols/qq/group_internal.h b/libpurple/protocols/qq/group_internal.h
index 123f5dd922..4dc11adb28 100644
--- a/libpurple/protocols/qq/group_internal.h
+++ b/libpurple/protocols/qq/group_internal.h
@@ -28,20 +28,20 @@
 #include <glib.h>
 #include "group.h"
 
-#define QQ_GROUP_KEY_MEMBER_STATUS      "my_status_code"
-#define QQ_GROUP_KEY_MEMBER_STATUS_DESC "my_status_desc"
-#define QQ_GROUP_KEY_INTERNAL_ID        "internal_group_id"
-#define QQ_GROUP_KEY_EXTERNAL_ID        "external_group_id"
-#define QQ_GROUP_KEY_GROUP_TYPE         "group_type"
-#define QQ_GROUP_KEY_CREATOR_UID        "creator_uid"
-#define QQ_GROUP_KEY_GROUP_CATEGORY     "group_category"
-#define QQ_GROUP_KEY_AUTH_TYPE          "auth_type"
-#define QQ_GROUP_KEY_GROUP_NAME_UTF8    "group_name_utf8"
-#define QQ_GROUP_KEY_GROUP_DESC_UTF8    "group_desc_utf8"
+#define QQ_GROUP_KEY_MEMBER_STATUS				"my_status_code"
+#define QQ_GROUP_KEY_MEMBER_STATUS_DESC	"my_status_desc"
+#define QQ_GROUP_KEY_INTERNAL_ID					"id"
+#define QQ_GROUP_KEY_EXTERNAL_ID					"ext_id"
+#define QQ_GROUP_KEY_TYPE								"type"
+#define QQ_GROUP_KEY_CREATOR_UID					"creator_uid"
+#define QQ_GROUP_KEY_GROUP_CATEGORY			"category"
+#define QQ_GROUP_KEY_AUTH_TYPE						"auth_type"
+#define QQ_GROUP_KEY_GROUP_NAME_UTF8			"name_utf8"
+#define QQ_GROUP_KEY_GROUP_DESC_UTF8			"desc_utf8"
 
 qq_group *qq_group_create_internal_record(PurpleConnection *gc, 
-		guint32 internal_id, guint32 external_id, gchar *group_name_utf8);
-void qq_group_delete_internal_record(qq_data *qd, guint32 internal_group_id);
+		guint32 internal_id, guint32 ext_id, gchar *group_name_utf8);
+void qq_group_delete_internal_record(qq_data *qd, guint32 id);
 
 GHashTable *qq_group_to_hashtable(qq_group *group);
 qq_group *qq_group_from_hashtable(PurpleConnection *gc, GHashTable *data);
diff --git a/libpurple/protocols/qq/group_join.c b/libpurple/protocols/qq/group_join.c
index bfa72b5d71..fa85eb8266 100644
--- a/libpurple/protocols/qq/group_join.c
+++ b/libpurple/protocols/qq/group_join.c
@@ -38,8 +38,10 @@
 #include "group_info.h"
 #include "group_join.h"
 #include "group_opt.h"
-#include "group_network.h"
 #include "group_search.h"
+#include "header_info.h"
+#include "packet_parse.h"
+#include "qq_network.h"
 
 enum {
 	QQ_GROUP_JOIN_OK = 0x01,
@@ -49,24 +51,21 @@ enum {
 static void _qq_group_exit_with_gc_and_id(gc_and_uid *g)
 {
 	PurpleConnection *gc;
-	guint32 internal_group_id;
+	guint32 id;
 	qq_group *group;
 
 	gc = g->gc;
-	internal_group_id = g->uid;
+	id = g->uid;
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	qq_send_cmd_group_exit_group(gc, group);
+	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_QUIT, group->id);
 }
 
 /* send packet to join a group without auth */
 void qq_send_cmd_group_join_group(PurpleConnection *gc, qq_group *group)
 {
-	guint8 raw_data[16] = {0};
-	gint bytes = 0;
-
 	g_return_if_fail(group != NULL);
 
 	if (group->my_status == QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) {
@@ -86,25 +85,21 @@ void qq_send_cmd_group_join_group(PurpleConnection *gc, qq_group *group)
 		break;
 	}
 
-	bytes = 0;
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_JOIN_GROUP);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
-
-	qq_send_group_cmd(gc, group, raw_data, bytes);
+	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_JOIN, group->id);
 }
 
 static void _qq_group_join_auth_with_gc_and_id(gc_and_uid *g, const gchar *reason_utf8)
 {
 	PurpleConnection *gc;
 	qq_group *group;
-	guint32 internal_group_id;
+	guint32 id;
 
 	gc = g->gc;
-	internal_group_id = g->uid;
+	id = g->uid;
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Can not find qq_group by internal_id: %d\n", internal_group_id);
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Can not find qq_group by internal_id: %d\n", id);
 		return;
 	} else {		/* everything is OK */
 		qq_send_cmd_group_auth(gc, group, QQ_GROUP_AUTH_REQUEST_APPLY, 0, reason_utf8);
@@ -118,12 +113,12 @@ static void _qq_group_join_auth(PurpleConnection *gc, qq_group *group)
 	g_return_if_fail(group != NULL);
 
 	purple_debug(PURPLE_DEBUG_INFO, "QQ", 
-			"Group (internal id: %d) needs authentication\n", group->internal_group_id);
+			"Group (internal id: %d) needs authentication\n", group->id);
 
 	msg = g_strdup_printf("Group \"%s\" needs authentication\n", group->group_name_utf8);
 	g = g_new0(gc_and_uid, 1);
 	g->gc = gc;
-	g->uid = group->internal_group_id;
+	g->uid = group->id;
 	purple_request_input(gc, NULL, msg,
 			   _("Input request here"),
 			   _("Would you be my friend?"), TRUE, FALSE, NULL,
@@ -139,7 +134,7 @@ void qq_send_cmd_group_auth(PurpleConnection *gc, qq_group *group, guint8 opt, g
 {
 	guint8 *raw_data;
 	gchar *reason_qq;
-	gint bytes, data_len;
+	gint bytes;
 
 	g_return_if_fail(group != NULL);
 
@@ -154,45 +149,22 @@ void qq_send_cmd_group_auth(PurpleConnection *gc, qq_group *group, guint8 opt, g
 		uid = 0;
 	}
 
-	data_len = 10 + strlen(reason_qq) + 1;
-	raw_data = g_newa(guint8, data_len);
+	raw_data = g_newa(guint8, 6 + strlen(reason_qq));
 
 	bytes = 0;
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_JOIN_GROUP_AUTH);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
 	bytes += qq_put8(raw_data + bytes, opt);
 	bytes += qq_put32(raw_data + bytes, uid);
 	bytes += qq_put8(raw_data + bytes, strlen(reason_qq));
 	bytes += qq_putdata(raw_data + bytes, (guint8 *) reason_qq, strlen(reason_qq));
 
-	if (bytes != data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-			   "Fail create packet for %s\n", qq_group_cmd_get_desc(QQ_GROUP_CMD_JOIN_GROUP_AUTH));
-		return;
-	}
-
-	qq_send_group_cmd(gc, group, raw_data, data_len);
-}
-
-/* send a packet to exit a group */
-void qq_send_cmd_group_exit_group(PurpleConnection *gc, qq_group *group)
-{
-	guint8 raw_data[16] = {0};
-	gint bytes = 0;
-
-	g_return_if_fail(group != NULL);
-
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_EXIT_GROUP);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
-
-	qq_send_group_cmd(gc, group, raw_data, bytes);
+	qq_send_room_cmd(gc, QQ_ROOM_CMD_AUTH, group->id, raw_data, bytes);
 }
 
 /* If comes here, cmd is OK already */
 void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
-	guint32 internal_group_id;
+	guint32 id;
 	PurpleChat *chat;
 	qq_group *group;
 	qq_data *qd;
@@ -207,15 +179,15 @@ void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *g
 	}
 
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
+	bytes += qq_get32(&id, data + bytes);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		chat = purple_blist_find_chat
-			    (purple_connection_get_account(gc), g_strdup_printf("%d", group->external_group_id));
+			    (purple_connection_get_account(gc), g_strdup_printf("%d", group->ext_id));
 		if (chat != NULL)
 			purple_blist_remove_chat(chat);
-		qq_group_delete_internal_record(qd, internal_group_id);
+		qq_group_delete_internal_record(qd, id);
 	}
 	purple_notify_info(gc, _("QQ Qun Operation"), _("You have successfully left the group"), NULL);
 }
@@ -224,7 +196,7 @@ void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *g
 void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
-	guint32 internal_group_id;
+	guint32 id;
 	qq_data *qd;
 
 	g_return_if_fail(data != NULL && len > 0);
@@ -236,8 +208,8 @@ void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnecti
 		return;
 	}
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
-	g_return_if_fail(internal_group_id > 0);
+	bytes += qq_get32(&id, data + bytes);
+	g_return_if_fail(id > 0);
 
 	purple_notify_info(gc, _("QQ Group Auth"),
 		     _("Your authorization request has been accepted by the QQ server"), NULL);
@@ -247,7 +219,7 @@ void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnecti
 void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
-	guint32 internal_group_id;
+	guint32 id;
 	guint8 reply;
 	qq_group *group;
 
@@ -260,11 +232,11 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 	}
 	
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
+	bytes += qq_get32(&id, data + bytes);
 	bytes += qq_get8(&reply, data + bytes);
 
 	/* join group OK */
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	/* need to check if group is NULL or not. */
 	g_return_if_fail(group != NULL);
 	switch (reply) {
@@ -274,12 +246,12 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 		qq_group_refresh(gc, group);
 		/* this must be shown before getting online members */
 		qq_group_conv_show_window(gc, group);
-		qq_send_cmd_group_get_group_info(gc, group);
+		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 		break;
 	case QQ_GROUP_JOIN_NEED_AUTH:
 		purple_debug(PURPLE_DEBUG_INFO, "QQ",
 			   "Fail joining group [%d] %s, needs authentication\n",
-			   group->external_group_id, group->group_name_utf8);
+			   group->ext_id, group->group_name_utf8);
 		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
 		qq_group_refresh(gc, group);
 		_qq_group_join_auth(gc, group);
@@ -287,7 +259,7 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 	default:
 		purple_debug(PURPLE_DEBUG_INFO, "QQ",
 			   "Error joining group [%d] %s, unknown reply: 0x%02x\n",
-			   group->external_group_id, group->group_name_utf8, reply);
+			   group->ext_id, group->group_name_utf8, reply);
 	}
 }
 
@@ -295,48 +267,48 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 void qq_group_join(PurpleConnection *gc, GHashTable *data)
 {
 	qq_data *qd;
-	gchar *external_group_id_ptr;
-	guint32 external_group_id;
+	gchar *ext_id_ptr;
+	guint32 ext_id;
 	qq_group *group;
 
 	g_return_if_fail(data != NULL);
 	qd = (qq_data *) gc->proto_data;
 
-	external_group_id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_EXTERNAL_ID);
-	g_return_if_fail(external_group_id_ptr != NULL);
+	ext_id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_EXTERNAL_ID);
+	g_return_if_fail(ext_id_ptr != NULL);
 	errno = 0;
-	external_group_id = strtol(external_group_id_ptr, NULL, 10);
+	ext_id = strtol(ext_id_ptr, NULL, 10);
 	if (errno != 0) {
 		purple_notify_error(gc, _("Error"),
 				_("You entered a group ID outside the acceptable range"), NULL);
 		return;
 	}
 
-	group = qq_group_find_by_id(gc, external_group_id, QQ_EXTERNAL_ID);
+	group = qq_room_search_ext_id(gc, ext_id);
 	if (group) {
 		qq_send_cmd_group_join_group(gc, group);
 	} else {
-		qq_set_pending_id(&qd->joining_groups, external_group_id, TRUE);
-		qq_send_cmd_group_search_group(gc, external_group_id);
+		qq_set_pending_id(&qd->joining_groups, ext_id, TRUE);
+		qq_send_cmd_group_search_group(gc, ext_id);
 	}
 }
 
 void qq_group_exit(PurpleConnection *gc, GHashTable *data)
 {
-	gchar *internal_group_id_ptr;
-	guint32 internal_group_id;
+	gchar *id_ptr;
+	guint32 id;
 	gc_and_uid *g;
 
 	g_return_if_fail(data != NULL);
 
-	internal_group_id_ptr = g_hash_table_lookup(data, "internal_group_id");
-	internal_group_id = strtol(internal_group_id_ptr, NULL, 10);
+	id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_INTERNAL_ID);
+	id = strtol(id_ptr, NULL, 10);
 
-	g_return_if_fail(internal_group_id > 0);
+	g_return_if_fail(id > 0);
 
 	g = g_new0(gc_and_uid, 1);
 	g->gc = gc;
-	g->uid = internal_group_id;
+	g->uid = id;
 
 	purple_request_action(gc, _("QQ Qun Operation"),
 			    _("Are you sure you want to leave this Qun?"),
diff --git a/libpurple/protocols/qq/group_join.h b/libpurple/protocols/qq/group_join.h
index 1c346717b6..4b0483b6e3 100644
--- a/libpurple/protocols/qq/group_join.h
+++ b/libpurple/protocols/qq/group_join.h
@@ -45,7 +45,6 @@ void qq_send_cmd_group_auth(PurpleConnection *gc, qq_group *group, guint8 opt, g
 void qq_group_join(PurpleConnection *gc, GHashTable *data);
 void qq_send_cmd_group_join_group(PurpleConnection *gc, qq_group *group);
 void qq_group_exit(PurpleConnection *gc, GHashTable *data);
-void qq_send_cmd_group_exit_group(PurpleConnection *gc, qq_group *group);
 void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *gc);
 void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnection *gc);
 void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *gc);
diff --git a/libpurple/protocols/qq/group_network.c b/libpurple/protocols/qq/group_network.c
deleted file mode 100644
index 71de4950cb..0000000000
--- a/libpurple/protocols/qq/group_network.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/**
- * @file group_network.c
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#include "internal.h"
-
-#include "debug.h"
-#include "notify.h"
-
-#include "char_conv.h"
-#include "crypt.h"
-#include "group_conv.h"
-#include "group_find.h"
-#include "group_internal.h"
-#include "group_im.h"
-#include "group_info.h"
-#include "group_join.h"
-#include "group_network.h"
-#include "group_opt.h"
-#include "group_search.h"
-#include "header_info.h"
-#include "qq_network.h"
-#include "utils.h"
-
-enum {
-	QQ_GROUP_CMD_REPLY_OK = 0x00,
-	QQ_GROUP_CMD_REPLY_SEARCH_ERROR = 0x02,
-	QQ_GROUP_CMD_REPLY_NOT_MEMBER = 0x0a
-};
-
-const gchar *qq_group_cmd_get_desc(qq_group_cmd cmd)
-{
-	switch (cmd) {
-	case QQ_GROUP_CMD_CREATE_GROUP:
-		return "QQ_GROUP_CMD_CREATE_GROUP";
-	case QQ_GROUP_CMD_MEMBER_OPT:
-		return "QQ_GROUP_CMD_MEMBER_OPT";
-	case QQ_GROUP_CMD_MODIFY_GROUP_INFO:
-		return "QQ_GROUP_CMD_MODIFY_GROUP_INFO";
-	case QQ_GROUP_CMD_GET_GROUP_INFO:
-		return "QQ_GROUP_CMD_GET_GROUP_INFO";
-	case QQ_GROUP_CMD_ACTIVATE_GROUP:
-		return "QQ_GROUP_CMD_ACTIVATE_GROUP";
-	case QQ_GROUP_CMD_SEARCH_GROUP:
-		return "QQ_GROUP_CMD_SEARCH_GROUP";
-	case QQ_GROUP_CMD_JOIN_GROUP:
-		return "QQ_GROUP_CMD_JOIN_GROUP";
-	case QQ_GROUP_CMD_JOIN_GROUP_AUTH:
-		return "QQ_GROUP_CMD_JOIN_GROUP_AUTH";
-	case QQ_GROUP_CMD_EXIT_GROUP:
-		return "QQ_GROUP_CMD_EXIT_GROUP";
-	case QQ_GROUP_CMD_SEND_MSG:
-		return "QQ_GROUP_CMD_SEND_MSG";
-	case QQ_GROUP_CMD_GET_ONLINE_MEMBER:
-		return "QQ_GROUP_CMD_GET_ONLINE_MEMBER";
-	case QQ_GROUP_CMD_GET_MEMBER_INFO:
-		return "QQ_GROUP_CMD_GET_MEMBER_INFO";
-	case QQ_GROUP_CMD_MODIFY_CARD:
-		return "QQ_GROUP_CMD_MODIFY_CARD";
-	case QQ_GROUP_CMD_REQUEST_ALL_REALNAMES:
-		return "QQ_GROUP_CMD_REQUEST_ALL_REALNAMES";
-	case QQ_GROUP_CMD_REQUEST_CARD:
-		return "QQ_GROUP_CMD_REQUEST_CARD";
-	case QQ_GROUP_CMD_SEND_IM_EX:
-		return "QQ_GROUP_CMD_SEND_IM_EX";
-	case QQ_GROUP_CMD_ADMIN:
-		return "QQ_GROUP_CMD_ADMIN";
-	case QQ_GROUP_CMD_TRANSFER:
-		return "QQ_GROUP_CMD_TRANSFER";
-	case QQ_GROUP_CMD_CREATE_TEMP_QUN:
-		return "QQ_GROUP_CMD_CREATE_TEMP_QUN";
-	case QQ_GROUP_CMD_MODIFY_TEMP_QUN_MEMBER:
-		return "QQ_GROUP_CMD_MODIFY_TEMP_QUN_MEMBER";
-	case QQ_GROUP_CMD_EXIT_TEMP_QUN:
-		return "QQ_GROUP_CMD_EXIT_TEMP_QUN";
-	case QQ_GROUP_CMD_GET_TEMP_QUN_INFO:
-		return "QQ_GROUP_CMD_GET_TEMP_QUN_INFO";
-	case QQ_GROUP_CMD_SEND_TEMP_QUN_IM:
-		return "QQ_GROUP_CMD_SEND_TEMP_QUN_IM";
-	case QQ_GROUP_CMD_GET_TEMP_QUN_MEMBERS:
-		return "QQ_GROUP_CMD_GET_TEMP_QUN_MEMBERS";
-	default:
-		return "Unknown QQ Group Command";
-	}
-}
-
-/* default process of reply error */
-static void _qq_process_group_cmd_reply_error_default(guint8 reply, guint8 *data, gint len, PurpleConnection *gc)
-{
-	gchar *msg, *msg_utf8;
-	g_return_if_fail(data != NULL && len > 0);
-
-	msg = g_strndup((gchar *) data, len);	/* it will append 0x00 */
-	msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
-	g_free(msg);
-	msg = g_strdup_printf(_("Code [0x%02X]: %s"), reply, msg_utf8);
-	purple_notify_error(gc, NULL, _("Group Operation Error"), msg);
-	g_free(msg);
-	g_free(msg_utf8);
-}
-
-/* default process, dump only */
-static void _qq_process_group_cmd_reply_default(guint8 *data, gint len, PurpleConnection *gc)
-{
-	g_return_if_fail(data != NULL && len > 0);
-
-	qq_hex_dump(PURPLE_DEBUG_INFO, "QQ",
-		data, len, 
-		"Dump unprocessed group cmd reply:");
-}
-
-/* The lower layer command of send group cmd */
-void qq_send_group_cmd(PurpleConnection *gc, qq_group *group, guint8 *raw_data, gint data_len)
-{
-	qq_data *qd;
-	group_packet *p;
-
-	g_return_if_fail(raw_data != NULL && data_len > 0);
-
-	qd = (qq_data *) gc->proto_data;
-
-	qq_send_cmd(qd, QQ_CMD_GROUP_CMD, raw_data, data_len);
-
-	p = g_new0(group_packet, 1);
-
-	p->send_seq = qd->send_seq;
-	if (group == NULL)
-		p->internal_group_id = 0;
-	else
-		p->internal_group_id = group->internal_group_id;
-
-	qd->group_packets = g_list_append(qd->group_packets, p);
-}
-
-/* the main entry of group cmd processing, called by qq_recv_core.c */
-void qq_process_group_cmd_reply(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc)
-{
-	qq_group *group;
-	qq_data *qd;
-	gint len, bytes;
-	guint32 internal_group_id;
-	guint8 *data, sub_cmd, reply;
-
-	g_return_if_fail(buf != NULL && buf_len != 0);
-
-	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (!qq_group_find_internal_group_id_by_seq(gc, seq, &internal_group_id)) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "We have no record of group cmd, seq [%d]\n", seq);
-		return;
-	}
-
-	if ( !qq_decrypt(buf, buf_len, qd->session_key, data, &len) ) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt group cmd reply\n");
-		return;
-	}
-
-	if (len <= 2) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Group cmd reply is too short, only %d bytes\n", len);
-		return;
-	}
-
-	bytes = 0;
-	bytes += qq_get8(&sub_cmd, data + bytes);
-	bytes += qq_get8(&reply, data + bytes);
-
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
-
-	if (reply != QQ_GROUP_CMD_REPLY_OK) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			   "Group cmd reply says cmd %s fails\n", qq_group_cmd_get_desc(sub_cmd));
-
-		if (group != NULL)
-			qq_set_pending_id(&qd->joining_groups, group->external_group_id, FALSE);
-
-		switch (reply) {	/* this should be all errors */
-		case QQ_GROUP_CMD_REPLY_NOT_MEMBER:
-			if (group != NULL) {
-				purple_debug(PURPLE_DEBUG_WARNING,
-					   "QQ",
-					   "You are not a member of group \"%s\"\n", group->group_name_utf8);
-				group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
-				qq_group_refresh(gc, group);
-			}
-			break;
-		case QQ_GROUP_CMD_REPLY_SEARCH_ERROR:
-			if (qd->roomlist != NULL) {
-				if (purple_roomlist_get_in_progress(qd->roomlist))
-					purple_roomlist_set_in_progress(qd->roomlist, FALSE);
-			}
-			_qq_process_group_cmd_reply_error_default(reply, data + bytes, len - bytes, gc);
-			break;
-		default:
-			_qq_process_group_cmd_reply_error_default(reply, data + bytes, len - bytes, gc);
-		}
-		return;
-	}
-
-	/* seems ok so far, so we process the reply according to sub_cmd */
-	switch (sub_cmd) {
-	case QQ_GROUP_CMD_GET_GROUP_INFO:
-		qq_process_group_cmd_get_group_info(data + bytes, len - bytes, gc);
-		if (group != NULL) {
-			qq_send_cmd_group_get_members_info(gc, group);
-			qq_send_cmd_group_get_online_members(gc, group);
-		}
-		break;
-	case QQ_GROUP_CMD_CREATE_GROUP:
-		qq_group_process_create_group_reply(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_MODIFY_GROUP_INFO:
-		qq_group_process_modify_info_reply(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_MEMBER_OPT:
-		qq_group_process_modify_members_reply(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_ACTIVATE_GROUP:
-		qq_group_process_activate_group_reply(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_SEARCH_GROUP:
-		qq_process_group_cmd_search_group(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_JOIN_GROUP:
-		qq_process_group_cmd_join_group(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_JOIN_GROUP_AUTH:
-		qq_process_group_cmd_join_group_auth(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_EXIT_GROUP:
-		qq_process_group_cmd_exit_group(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_SEND_MSG:
-		qq_process_group_cmd_im(data + bytes, len - bytes, gc);
-		break;
-	case QQ_GROUP_CMD_GET_ONLINE_MEMBER:
-		qq_process_group_cmd_get_online_members(data + bytes, len - bytes, gc);
-		if (group != NULL)
-			qq_group_conv_refresh_online_member(gc, group);
-		break;
-	case QQ_GROUP_CMD_GET_MEMBER_INFO:
-		qq_process_group_cmd_get_members_info(data + bytes, len - bytes, gc);
-		if (group != NULL)
-			qq_group_conv_refresh_online_member(gc, group);
-		break;
-	default:
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			   "Group cmd %s is processed by default\n", qq_group_cmd_get_desc(sub_cmd));
-		_qq_process_group_cmd_reply_default(data + bytes, len, gc);
-	}
-}
diff --git a/libpurple/protocols/qq/group_network.h b/libpurple/protocols/qq/group_network.h
deleted file mode 100644
index 7a287a34f6..0000000000
--- a/libpurple/protocols/qq/group_network.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @file group_network.h
- *
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#ifndef _QQ_GROUP_NETWORK_H_
-#define _QQ_GROUP_NETWORK_H_
-
-#include <glib.h>
-#include "connection.h"
-#include "group.h"
-#include "packet_parse.h"
-
-typedef enum {
-	QQ_GROUP_CMD_CREATE_GROUP = 0x01,
-	QQ_GROUP_CMD_MEMBER_OPT = 0x02,
-	QQ_GROUP_CMD_MODIFY_GROUP_INFO = 0x03,
-	QQ_GROUP_CMD_GET_GROUP_INFO = 0x04,
-	QQ_GROUP_CMD_ACTIVATE_GROUP = 0x05,
-	QQ_GROUP_CMD_SEARCH_GROUP = 0x06,
-	QQ_GROUP_CMD_JOIN_GROUP = 0x07,
-	QQ_GROUP_CMD_JOIN_GROUP_AUTH = 0x08,
-	QQ_GROUP_CMD_EXIT_GROUP = 0x09,
-	QQ_GROUP_CMD_SEND_MSG = 0x0a,
-	QQ_GROUP_CMD_GET_ONLINE_MEMBER = 0x0b,
-	QQ_GROUP_CMD_GET_MEMBER_INFO = 0x0c,
-
-	QQ_GROUP_CMD_MODIFY_CARD = 0x0E,
-	QQ_GROUP_CMD_REQUEST_ALL_REALNAMES = 0x0F,
-	QQ_GROUP_CMD_REQUEST_CARD = 0x10,
-	QQ_GROUP_CMD_SEND_IM_EX = 0x1A,
-	QQ_GROUP_CMD_ADMIN = 0x1B,
-	QQ_GROUP_CMD_TRANSFER = 0x1C,
-	QQ_GROUP_CMD_CREATE_TEMP_QUN = 0x30,
-	QQ_GROUP_CMD_MODIFY_TEMP_QUN_MEMBER = 0x31,
-	QQ_GROUP_CMD_EXIT_TEMP_QUN = 0x32,
-	QQ_GROUP_CMD_GET_TEMP_QUN_INFO = 0x33,
-	QQ_GROUP_CMD_SEND_TEMP_QUN_IM = 0x35,
-	QQ_GROUP_CMD_GET_TEMP_QUN_MEMBERS = 0x37,
-} qq_group_cmd;
-
-typedef struct _group_packet {
-	guint16 send_seq;
-	guint32 internal_group_id;
-} group_packet;
-
-const gchar *qq_group_cmd_get_desc(qq_group_cmd cmd);
-
-void qq_send_group_cmd(PurpleConnection *gc, qq_group *group, guint8 *raw_data, gint data_len);
-void qq_process_group_cmd_reply(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc);
-
-#endif
diff --git a/libpurple/protocols/qq/group_opt.c b/libpurple/protocols/qq/group_opt.c
index d673dc6a3c..5f7fcabfb2 100644
--- a/libpurple/protocols/qq/group_opt.c
+++ b/libpurple/protocols/qq/group_opt.c
@@ -34,9 +34,10 @@
 #include "group_internal.h"
 #include "group_info.h"
 #include "group_join.h"
-#include "group_network.h"
 #include "group_opt.h"
+#include "header_info.h"
 #include "packet_parse.h"
+#include "qq_network.h"
 #include "utils.h"
 
 static int _compare_guint32(const void *a,
@@ -68,13 +69,11 @@ static void _qq_group_member_opt(PurpleConnection *gc, qq_group *group, gint ope
 	data = g_newa(guint8, data_len);
 	
 	bytes = 0;
-	bytes += qq_put8(data + bytes, QQ_GROUP_CMD_MEMBER_OPT);
-	bytes += qq_put32(data + bytes, group->internal_group_id);
 	bytes += qq_put8(data + bytes, operation);
 	for (i = 0; i < count; i++)
 		bytes += qq_put32(data + bytes, members[i]);
 
-	qq_send_group_cmd(gc, group, data, bytes);
+	qq_send_room_cmd(gc, QQ_ROOM_CMD_MEMBER_OPT, group->id, data, bytes);
 }
 
 static void _qq_group_do_nothing_with_struct(group_member_opt *g)
@@ -86,8 +85,8 @@ static void _qq_group_do_nothing_with_struct(group_member_opt *g)
 static void _qq_group_reject_application_real(group_member_opt *g, gchar *msg_utf8)
 {
 	qq_group *group;
-	g_return_if_fail(g != NULL && g->gc != NULL && g->internal_group_id > 0 && g->member > 0);
-	group = qq_group_find_by_id(g->gc, g->internal_group_id, QQ_INTERNAL_ID);
+	g_return_if_fail(g != NULL && g->gc != NULL && g->id > 0 && g->member > 0);
+	group = qq_room_search_id(g->gc, g->id);
 	g_return_if_fail(group != NULL);
 	qq_send_cmd_group_auth(g->gc, group, QQ_GROUP_AUTH_REQUEST_REJECT, g->member, msg_utf8);
 	g_free(g);
@@ -131,8 +130,8 @@ void qq_group_reject_application_with_struct(group_member_opt *g)
 void qq_group_approve_application_with_struct(group_member_opt *g)
 {
 	qq_group *group;
-	g_return_if_fail(g != NULL && g->gc != NULL && g->internal_group_id > 0 && g->member > 0);
-	group = qq_group_find_by_id(g->gc, g->internal_group_id, QQ_INTERNAL_ID);
+	g_return_if_fail(g != NULL && g->gc != NULL && g->id > 0 && g->member > 0);
+	group = qq_room_search_id(g->gc, g->id);
 	g_return_if_fail(group != NULL);
 	qq_send_cmd_group_auth(g->gc, group, QQ_GROUP_AUTH_REQUEST_APPROVE, g->member, "");
 	qq_group_find_or_add_member(g->gc, group, g->member);
@@ -198,24 +197,24 @@ void qq_group_modify_members(PurpleConnection *gc, qq_group *group, guint32 *new
 void qq_group_process_modify_members_reply(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
-	guint32 internal_group_id;
+	guint32 id;
 	qq_group *group;
 	g_return_if_fail(data != NULL);
 
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
-	g_return_if_fail(internal_group_id > 0);
+	bytes += qq_get32(&id, data + bytes);
+	g_return_if_fail(id > 0);
 
 	/* we should have its info locally */
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in modify members for Qun %d\n", group->external_group_id);
+	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in modify members for Qun %d\n", group->ext_id);
 
 	purple_notify_info(gc, _("QQ Qun Operation"), _("You have successfully modified Qun member"), NULL);
 }
 
-void qq_group_modify_info(PurpleConnection *gc, qq_group *group)
+void qq_room_change_info(PurpleConnection *gc, qq_group *group)
 {
 	guint8 *data;
 	gint data_len;
@@ -228,16 +227,9 @@ void qq_group_modify_info(PurpleConnection *gc, qq_group *group)
 	group_desc = group->group_desc_utf8 == NULL ? "" : utf8_to_qq(group->group_desc_utf8, QQ_CHARSET_DEFAULT);
 	notice = group->notice_utf8 == NULL ? "" : utf8_to_qq(group->notice_utf8, QQ_CHARSET_DEFAULT);
 
-	data_len = 13 + 1 + strlen(group_name)
-	    + 1 + strlen(group_desc)
-	    + 1 + strlen(notice);
-
+	data_len = 64 + strlen(group_name) + strlen(group_desc) + strlen(notice);
 	data = g_newa(guint8, data_len);
 	bytes = 0;
-	/* 000-000 */
-	bytes += qq_put8(data + bytes, QQ_GROUP_CMD_MODIFY_GROUP_INFO);
-	/* 001-004 */
-	bytes += qq_put32(data + bytes, group->internal_group_id);
 	/* 005-005 */
 	bytes += qq_put8(data + bytes, 0x01);
 	/* 006-006 */
@@ -258,54 +250,52 @@ void qq_group_modify_info(PurpleConnection *gc, qq_group *group)
 	bytes += qq_put8(data + bytes, strlen(group_desc));
 	bytes += qq_putdata(data + bytes, (guint8 *) group_desc, strlen(group_desc));
 
-	if (bytes != data_len)	{
+	if (bytes > data_len) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-			   "Fail to create group_modify_info packet, expect %d bytes, wrote %d bytes\n",
+			   "Overflow in qq_room_change_info, max %d bytes, now %d bytes\n",
 			   data_len, bytes);
 		return;
 	}
-
-	qq_send_group_cmd(gc, group, data, bytes);
+	qq_send_room_cmd(gc, QQ_ROOM_CMD_CHANGE_INFO, group->id, data, bytes);
 }
 
 void qq_group_process_modify_info_reply(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
-	guint32 internal_group_id;
+	guint32 id;
 	qq_group *group;
 	g_return_if_fail(data != NULL);
 
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
-	g_return_if_fail(internal_group_id > 0);
+	bytes += qq_get32(&id, data + bytes);
+	g_return_if_fail(id > 0);
 
 	/* we should have its info locally */
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in modify info for Qun %d\n", group->external_group_id);
+	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in modify info for Qun %d\n", group->ext_id);
 	qq_group_refresh(gc, group);
 
 	purple_notify_info(gc, _("QQ Qun Operation"), _("You have successfully modified Qun information"), NULL);
 }
 
 /* we create a very simple group first, and then let the user to modify */
-void qq_group_create_with_name(PurpleConnection *gc, const gchar *name)
+void qq_room_create_new(PurpleConnection *gc, const gchar *name)
 {
-	gint data_len;
 	guint8 *data;
+	gint data_len;
 	gint bytes;
 	qq_data *qd;
 	g_return_if_fail(name != NULL);
 
 	qd = (qq_data *) gc->proto_data;
-	data_len = 7 + 1 + strlen(name) + 2 + 1 + 1 + 4;
+
+	data_len = 64 + strlen(name);
 	data = g_newa(guint8, data_len);
 
 	bytes = 0;
 	/* we create the simpleset group, only group name is given */
-	/* 000 */
-	bytes += qq_put8(data + bytes, QQ_GROUP_CMD_CREATE_GROUP);
 	/* 001 */
 	bytes += qq_put8(data + bytes, QQ_GROUP_TYPE_PERMANENT);
 	/* 002 */
@@ -322,14 +312,13 @@ void qq_group_create_with_name(PurpleConnection *gc, const gchar *name)
 	bytes += qq_put8(data + bytes, 0x00);	/* no group desc */
 	bytes += qq_put32(data + bytes, qd->uid);	/* I am member of coz */
 
-	if (bytes != data_len) {
+	if (bytes > data_len) {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-			   "Fail create create_group packet, expect %d bytes, written %d bytes\n",
+			   "Overflow in qq_room_create, max %d bytes, now %d bytes\n",
 			   data_len, bytes);
 		return;
 	}
-
-	qq_send_group_cmd(gc, NULL, data, bytes);
+	qq_send_room_cmd_noid(gc, QQ_ROOM_CMD_CREATE, data, bytes);
 }
 
 static void qq_group_setup_with_gc_and_uid(gc_and_uid *g)
@@ -337,7 +326,7 @@ static void qq_group_setup_with_gc_and_uid(gc_and_uid *g)
 	qq_group *group;
 	g_return_if_fail(g != NULL && g->gc != NULL && g->uid > 0);
 
-	group = qq_group_find_by_id(g->gc, g->uid, QQ_INTERNAL_ID);
+	group = qq_room_search_id(g->gc, g->uid);
 	g_return_if_fail(group != NULL);
 
 	/* TODO insert UI code here */
@@ -348,7 +337,7 @@ static void qq_group_setup_with_gc_and_uid(gc_and_uid *g)
 void qq_group_process_create_group_reply(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
-	guint32 internal_group_id, external_group_id;
+	guint32 id, ext_id;
 	qq_group *group;
 	gc_and_uid *g;
 	qq_data *qd;
@@ -358,23 +347,23 @@ void qq_group_process_create_group_reply(guint8 *data, gint len, PurpleConnectio
 	qd = (qq_data *) gc->proto_data;
 
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
-	bytes += qq_get32(&external_group_id, data + bytes);
-	g_return_if_fail(internal_group_id > 0 && external_group_id);
+	bytes += qq_get32(&id, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	g_return_if_fail(id > 0 && ext_id);
 
-	group = qq_group_create_internal_record(gc, internal_group_id, external_group_id, NULL);
+	group = qq_group_create_internal_record(gc, id, ext_id, NULL);
 	group->my_status = QQ_GROUP_MEMBER_STATUS_IS_ADMIN;
 	group->creator_uid = qd->uid;
 	qq_group_refresh(gc, group);
 
-	qq_group_activate_group(gc, internal_group_id);
-	qq_send_cmd_group_get_group_info(gc, group);
+	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_ACTIVATE, id);
+	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, id);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in create Qun, external ID %d\n", group->external_group_id);
+	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in create Qun, external ID %d\n", group->ext_id);
 
 	g = g_new0(gc_and_uid, 1);
 	g->gc = gc;
-	g->uid = internal_group_id;
+	g->uid = id;
 
 	purple_request_action(gc, _("QQ Qun Operation"),
 			    _("You have successfully created a Qun"),
@@ -387,54 +376,37 @@ void qq_group_process_create_group_reply(guint8 *data, gint len, PurpleConnectio
 			    _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid));
 }
 
-/* we have to activate group after creation, otherwise the group can not be searched */
-void qq_group_activate_group(PurpleConnection *gc, guint32 internal_group_id)
-{
-	guint8 data[16] = {0};
-	gint bytes = 0;
-	g_return_if_fail(internal_group_id > 0);
-
-	bytes = 0;
-	/* we create the simplest group, only group name is given */
-	/* 000 */
-	bytes += qq_put8(data + bytes, QQ_GROUP_CMD_ACTIVATE_GROUP);
-	/* 001-005 */
-	bytes += qq_put32(data + bytes, internal_group_id);
-
-	qq_send_group_cmd(gc, NULL, data, bytes);
-}
-
 void qq_group_process_activate_group_reply(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
-	guint32 internal_group_id;
+	guint32 id;
 	qq_group *group;
 	g_return_if_fail(data != NULL);
 
 	bytes = 0;
-	bytes += qq_get32(&internal_group_id, data + bytes);
-	g_return_if_fail(internal_group_id > 0);
+	bytes += qq_get32(&id, data + bytes);
+	g_return_if_fail(id > 0);
 
 	/* we should have its info locally */
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in activate Qun %d\n", group->external_group_id);
+	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in activate Qun %d\n", group->ext_id);
 }
 
 void qq_group_manage_group(PurpleConnection *gc, GHashTable *data)
 {
-	gchar *internal_group_id_ptr;
-	guint32 internal_group_id;
+	gchar *id_ptr;
+	guint32 id;
 	qq_group *group;
 
 	g_return_if_fail(data != NULL);
 
-	internal_group_id_ptr = g_hash_table_lookup(data, "internal_group_id");
-	internal_group_id = strtol(internal_group_id_ptr, NULL, 10);
-	g_return_if_fail(internal_group_id > 0);
+	id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_INTERNAL_ID);
+	id = strtol(id_ptr, NULL, 10);
+	g_return_if_fail(id > 0);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
 	/* XXX insert UI code here */
diff --git a/libpurple/protocols/qq/group_opt.h b/libpurple/protocols/qq/group_opt.h
index 7e176bf2b0..4a0cd43928 100644
--- a/libpurple/protocols/qq/group_opt.h
+++ b/libpurple/protocols/qq/group_opt.h
@@ -33,7 +33,7 @@
 
 typedef struct _group_member_opt {
 	PurpleConnection *gc;
-	guint32 internal_group_id;
+	guint32 id;
 	guint32 member;
 } group_member_opt;
 
@@ -48,7 +48,7 @@ enum {
 };
 
 void qq_group_modify_members(PurpleConnection *gc, qq_group *group, guint32 *new_members);
-void qq_group_modify_info(PurpleConnection *gc, qq_group *group);
+void qq_room_change_info(PurpleConnection *gc, qq_group *group);
 
 void qq_group_approve_application_with_struct(group_member_opt *g);
 void qq_group_reject_application_with_struct(group_member_opt *g);
@@ -57,8 +57,7 @@ void qq_group_search_application_with_struct(group_member_opt *g);
 void qq_group_process_modify_info_reply(guint8 *data, gint len, PurpleConnection *gc);
 void qq_group_process_modify_members_reply(guint8 *data, gint len, PurpleConnection *gc);
 void qq_group_manage_group(PurpleConnection *gc, GHashTable *data);
-void qq_group_create_with_name(PurpleConnection *gc, const gchar *name);
-void qq_group_activate_group(PurpleConnection *gc, guint32 internal_group_id);
+void qq_room_create_new(PurpleConnection *gc, const gchar *name);
 void qq_group_process_activate_group_reply(guint8 *data, gint len, PurpleConnection *gc);
 void qq_group_process_create_group_reply(guint8 *data, gint len, PurpleConnection *gc);
 
diff --git a/libpurple/protocols/qq/group_search.c b/libpurple/protocols/qq/group_search.c
index 435b353af5..c0ec194eb6 100644
--- a/libpurple/protocols/qq/group_search.c
+++ b/libpurple/protocols/qq/group_search.c
@@ -31,9 +31,11 @@
 #include "group_free.h"
 #include "group_internal.h"
 #include "group_join.h"
-#include "group_network.h"
 #include "group_search.h"
 #include "utils.h"
+#include "header_info.h"
+#include "packet_parse.h"
+#include "qq_network.h"
 
 enum {
 	QQ_GROUP_SEARCH_TYPE_BY_ID = 0x01,
@@ -41,20 +43,19 @@ enum {
 };
 
 /* send packet to search for qq_group */
-void qq_send_cmd_group_search_group(PurpleConnection *gc, guint32 external_group_id)
+void qq_send_cmd_group_search_group(PurpleConnection *gc, guint32 ext_id)
 {
 	guint8 raw_data[16] = {0};
 	gint bytes = 0;
 	guint8 type;
 
-	type = (external_group_id == 0x00000000) ? QQ_GROUP_SEARCH_TYPE_DEMO : QQ_GROUP_SEARCH_TYPE_BY_ID;
+	type = (ext_id == 0x00000000) ? QQ_GROUP_SEARCH_TYPE_DEMO : QQ_GROUP_SEARCH_TYPE_BY_ID;
 
 	bytes = 0;
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_SEARCH_GROUP);
 	bytes += qq_put8(raw_data + bytes, type);
-	bytes += qq_put32(raw_data + bytes, external_group_id);
+	bytes += qq_put32(raw_data + bytes, ext_id);
 
-	qq_send_group_cmd(gc, NULL, raw_data, bytes);
+	qq_send_room_cmd_noid(gc, QQ_ROOM_CMD_SEARCH, raw_data, bytes);
 }
 
 static void _qq_setup_roomlist(qq_data *qd, qq_group *group)
@@ -63,14 +64,14 @@ static void _qq_setup_roomlist(qq_data *qd, qq_group *group)
 	gchar field[11];
 
 	room = purple_roomlist_room_new(PURPLE_ROOMLIST_ROOMTYPE_ROOM, group->group_name_utf8, NULL);
-	g_snprintf(field, sizeof(field), "%d", group->external_group_id);
+	g_snprintf(field, sizeof(field), "%d", group->ext_id);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
 	g_snprintf(field, sizeof(field), "%d", group->creator_uid);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
 	purple_roomlist_room_add_field(qd->roomlist, room, group->group_desc_utf8);
-	g_snprintf(field, sizeof(field), "%d", group->internal_group_id);
+	g_snprintf(field, sizeof(field), "%d", group->id);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
-	g_snprintf(field, sizeof(field), "%d", group->group_type);
+	g_snprintf(field, sizeof(field), "%d", group->type8);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
 	g_snprintf(field, sizeof(field), "%d", group->auth_type);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
@@ -99,9 +100,9 @@ void qq_process_group_cmd_search_group(guint8 *data, gint len, PurpleConnection
 	bytes += qq_get8(&search_type, data + bytes);
 
 	/* now it starts with group_info_entry */
-	bytes += qq_get32(&(group.internal_group_id), data + bytes);
-	bytes += qq_get32(&(group.external_group_id), data + bytes);
-	bytes += qq_get8(&(group.group_type), data + bytes);
+	bytes += qq_get32(&(group.id), data + bytes);
+	bytes += qq_get32(&(group.ext_id), data + bytes);
+	bytes += qq_get8(&(group.type8), data + bytes);
 	bytes += qq_get16(&(unknown), data + bytes);
 	bytes += qq_get16(&(unknown), data + bytes);
 	bytes += qq_get32(&(group.creator_uid), data + bytes);
@@ -119,12 +120,12 @@ void qq_process_group_cmd_search_group(guint8 *data, gint len, PurpleConnection
 			"group_cmd_search_group: Dangerous error! maybe protocol changed, notify developers!");
 	}
 
-	pending_id = qq_get_pending_id(qd->joining_groups, group.external_group_id);
+	pending_id = qq_get_pending_id(qd->joining_groups, group.ext_id);
 	if (pending_id != NULL) {
-		qq_set_pending_id(&qd->joining_groups, group.external_group_id, FALSE);
-		if (qq_group_find_by_id(gc, group.internal_group_id, QQ_INTERNAL_ID) == NULL)
+		qq_set_pending_id(&qd->joining_groups, group.ext_id, FALSE);
+		if (qq_room_search_id(gc, group.id) == NULL)
 			qq_group_create_internal_record(gc, 
-					group.internal_group_id, group.external_group_id, group.group_name_utf8);
+					group.id, group.ext_id, group.group_name_utf8);
 		qq_send_cmd_group_join_group(gc, &group);
 	} else {
 		_qq_setup_roomlist(qd, &group);
diff --git a/libpurple/protocols/qq/header_info.c b/libpurple/protocols/qq/header_info.c
index 9c06db2944..d39594c128 100644
--- a/libpurple/protocols/qq/header_info.c
+++ b/libpurple/protocols/qq/header_info.c
@@ -61,58 +61,6 @@
 
 #define QQ_SERVER_0100 0x0100	/* server */
 
-/* given command alias, return the command name accordingly */
-const gchar *qq_get_cmd_desc(gint type)
-{
-	switch (type) {
-	case QQ_CMD_LOGOUT:
-		return "QQ_CMD_LOGOUT";
-	case QQ_CMD_KEEP_ALIVE:
-		return "QQ_CMD_KEEP_ALIVE";
-	case QQ_CMD_UPDATE_INFO:
-		return "QQ_CMD_UPDATE_INFO";
-	case QQ_CMD_SEARCH_USER:
-		return "QQ_CMD_SEARCH_USER";
-	case QQ_CMD_GET_USER_INFO:
-		return "QQ_CMD_GET_USER_INFO";
-	case QQ_CMD_ADD_BUDDY_WO_AUTH:
-		return "QQ_CMD_ADD_BUDDY_WO_AUTH";
-	case QQ_CMD_DEL_BUDDY:
-		return "QQ_CMD_DEL_BUDDY";
-	case QQ_CMD_BUDDY_AUTH:
-		return "QQ_CMD_BUDDY_AUTH";
-	case QQ_CMD_CHANGE_ONLINE_STATUS:
-		return "QQ_CMD_CHANGE_ONLINE_STATUS";
-	case QQ_CMD_ACK_SYS_MSG:
-		return "QQ_CMD_ACK_SYS_MSG";
-	case QQ_CMD_SEND_IM:
-		return "QQ_CMD_SEND_IM";
-	case QQ_CMD_RECV_IM:
-		return "QQ_CMD_RECV_IM";
-	case QQ_CMD_REMOVE_SELF:
-		return "QQ_CMD_REMOVE_SELF";
-	case QQ_CMD_LOGIN:
-		return "QQ_CMD_LOGIN";
-	case QQ_CMD_GET_BUDDIES_LIST:
-		return "QQ_CMD_GET_BUDDIES_LIST";
-	case QQ_CMD_GET_BUDDIES_ONLINE:
-		return "QQ_CMD_GET_BUDDIES_ONLINE";
-	case QQ_CMD_GROUP_CMD:
-		return "QQ_CMD_GROUP_CMD";
-	case QQ_CMD_GET_ALL_LIST_WITH_GROUP:
-		return "QQ_CMD_GET_ALL_LIST_WITH_GROUP";
-	case QQ_CMD_GET_LEVEL:
-		return "QQ_CMD_GET_LEVEL";
-	case QQ_CMD_TOKEN:
-		return "QQ_CMD_TOKEN";
-	case QQ_CMD_RECV_MSG_SYS:
-		return "QQ_CMD_RECV_MSG_SYS";
-	case QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS:
-		return "QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS";
-	default:
-		return "Unknown";
-	}
-}
 
 /* given source tag, return its description accordingly */
 const gchar *qq_get_ver_desc(gint source)
@@ -177,3 +125,112 @@ const gchar *qq_get_ver_desc(gint source)
 		return "Unknown";
 	}
 }
+
+/* given command alias, return the command name accordingly */
+const gchar *qq_get_cmd_desc(gint cmd)
+{
+	switch (cmd) {
+	case QQ_CMD_LOGOUT:
+		return "QQ_CMD_LOGOUT";
+	case QQ_CMD_KEEP_ALIVE:
+		return "QQ_CMD_KEEP_ALIVE";
+	case QQ_CMD_UPDATE_INFO:
+		return "QQ_CMD_UPDATE_INFO";
+	case QQ_CMD_SEARCH_USER:
+		return "QQ_CMD_SEARCH_USER";
+	case QQ_CMD_GET_USER_INFO:
+		return "QQ_CMD_GET_USER_INFO";
+	case QQ_CMD_ADD_BUDDY_WO_AUTH:
+		return "QQ_CMD_ADD_BUDDY_WO_AUTH";
+	case QQ_CMD_DEL_BUDDY:
+		return "QQ_CMD_DEL_BUDDY";
+	case QQ_CMD_BUDDY_AUTH:
+		return "QQ_CMD_BUDDY_AUTH";
+	case QQ_CMD_CHANGE_ONLINE_STATUS:
+		return "QQ_CMD_CHANGE_ONLINE_STATUS";
+	case QQ_CMD_ACK_SYS_MSG:
+		return "QQ_CMD_ACK_SYS_MSG";
+	case QQ_CMD_SEND_IM:
+		return "QQ_CMD_SEND_IM";
+	case QQ_CMD_RECV_IM:
+		return "QQ_CMD_RECV_IM";
+	case QQ_CMD_REMOVE_SELF:
+		return "QQ_CMD_REMOVE_SELF";
+	case QQ_CMD_LOGIN:
+		return "QQ_CMD_LOGIN";
+	case QQ_CMD_GET_BUDDIES_LIST:
+		return "QQ_CMD_GET_BUDDIES_LIST";
+	case QQ_CMD_GET_BUDDIES_ONLINE:
+		return "QQ_CMD_GET_BUDDIES_ONLINE";
+	case QQ_CMD_ROOM:
+		return "QQ_CMD_ROOM";
+	case QQ_CMD_GET_BUDDIES_AND_ROOMS:
+		return "QQ_CMD_GET_BUDDIES_AND_ROOMS";
+	case QQ_CMD_GET_LEVEL:
+		return "QQ_CMD_GET_LEVEL";
+	case QQ_CMD_TOKEN:
+		return "QQ_CMD_TOKEN";
+	case QQ_CMD_RECV_MSG_SYS:
+		return "QQ_CMD_RECV_MSG_SYS";
+	case QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS:
+		return "QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS";
+	default:
+		return "Unknown";
+	}
+}
+
+const gchar *qq_get_room_cmd_desc(gint room_cmd)
+{
+	switch (room_cmd) {
+	case QQ_ROOM_CMD_CREATE:
+		return "QQ_ROOM_CMD_CREATE";
+	case QQ_ROOM_CMD_MEMBER_OPT:
+		return "QQ_ROOM_CMD_MEMBER_OPT";
+	case QQ_ROOM_CMD_CHANGE_INFO:
+		return "QQ_ROOM_CMD_CHANGE_INFO";
+	case QQ_ROOM_CMD_GET_INFO:
+		return "QQ_ROOM_CMD_GET_INFO";
+	case QQ_ROOM_CMD_ACTIVATE:
+		return "QQ_ROOM_CMD_ACTIVATE";
+	case QQ_ROOM_CMD_SEARCH:
+		return "QQ_ROOM_CMD_SEARCH";
+	case QQ_ROOM_CMD_JOIN:
+		return "QQ_ROOM_CMD_JOIN";
+	case QQ_ROOM_CMD_AUTH:
+		return "QQ_ROOM_CMD_AUTH";
+	case QQ_ROOM_CMD_QUIT:
+		return "QQ_ROOM_CMD_QUIT";
+	case QQ_ROOM_CMD_SEND_MSG:
+		return "QQ_ROOM_CMD_SEND_MSG";
+	case QQ_ROOM_CMD_GET_ONLINES:
+		return "QQ_ROOM_CMD_GET_ONLINES";
+	case QQ_ROOM_CMD_GET_MEMBER_INFO:
+		return "QQ_ROOM_CMD_GET_MEMBER_INFO";
+	case QQ_ROOM_CMD_CHANGE_CARD:
+		return "QQ_ROOM_CMD_CHANGE_CARD";
+	case QQ_ROOM_CMD_GET_REALNAMES:
+		return "QQ_ROOM_CMD_GET_REALNAMES";
+	case QQ_ROOM_CMD_GET_CARD:
+		return "QQ_ROOM_CMD_GET_CARD";
+	case QQ_ROOM_CMD_SEND_IM_EX:
+		return "QQ_ROOM_CMD_SEND_IM_EX";
+	case QQ_ROOM_CMD_ADMIN:
+		return "QQ_ROOM_CMD_ADMIN";
+	case QQ_ROOM_CMD_TRANSFER:
+		return "QQ_ROOM_CMD_TRANSFER";
+	case QQ_ROOM_CMD_TEMP_CREATE:
+		return "QQ_ROOM_CMD_TEMP_CREATE";
+	case QQ_ROOM_CMD_TEMP_CHANGE_MEMBER:
+		return "QQ_ROOM_CMD_TEMP_CHANGE_MEMBER";
+	case QQ_ROOM_CMD_TEMP_QUIT:
+		return "QQ_ROOM_CMD_TEMP_QUIT";
+	case QQ_ROOM_CMD_TEMP_GET_INFO:
+		return "QQ_ROOM_CMD_TEMP_GET_INFO";
+	case QQ_ROOM_CMD_TEMP_SEND_IM:
+		return "QQ_ROOM_CMD_TEMP_SEND_IM";
+	case QQ_ROOM_CMD_TEMP_GET_MEMBERS:
+		return "QQ_ROOM_CMD_TEMP_GET_MEMBERS";
+	default:
+		return "Unknown QQ Room Command";
+	}
+}
diff --git a/libpurple/protocols/qq/header_info.h b/libpurple/protocols/qq/header_info.h
index 373e782ac8..caa671e78e 100644
--- a/libpurple/protocols/qq/header_info.h
+++ b/libpurple/protocols/qq/header_info.h
@@ -35,6 +35,8 @@
 
 #define QQ_CLIENT       0x0d55
 
+const gchar *qq_get_ver_desc(gint source);
+
 /* list of known QQ commands */
 enum {
 	QQ_CMD_LOGOUT = 0x0001,				/* log out */
@@ -56,8 +58,8 @@ enum {
 	QQ_CMD_GET_BUDDIES_LIST = 0x0026,		/* get buddies list */
 	QQ_CMD_GET_BUDDIES_ONLINE = 0x0027,		/* get online buddies list */
 	QQ_CMD_CELL_PHONE_2 = 0x0029,			/* cell phone 2 */
-	QQ_CMD_GROUP_CMD = 0x0030,			/* group command */
-	QQ_CMD_GET_ALL_LIST_WITH_GROUP = 0x0058,  
+	QQ_CMD_ROOM = 0x0030,			/* room command */
+	QQ_CMD_GET_BUDDIES_AND_ROOMS = 0x0058,  
 	QQ_CMD_GET_LEVEL = 0x005C,			/* get level for one or more buddies */
 	QQ_CMD_TOKEN  = 0x0062, 		/* get login token */
 	QQ_CMD_RECV_MSG_SYS = 0x0080,			/* receive a system message */
@@ -66,6 +68,34 @@ enum {
 
 const gchar *qq_get_cmd_desc(gint type);
 
-const gchar *qq_get_ver_desc(gint source);
+enum {
+	QQ_ROOM_CMD_CREATE = 0x01,
+	QQ_ROOM_CMD_MEMBER_OPT = 0x02,
+	QQ_ROOM_CMD_CHANGE_INFO = 0x03,
+	QQ_ROOM_CMD_GET_INFO = 0x04,
+	QQ_ROOM_CMD_ACTIVATE = 0x05,
+	QQ_ROOM_CMD_SEARCH = 0x06,
+	QQ_ROOM_CMD_JOIN = 0x07,
+	QQ_ROOM_CMD_AUTH = 0x08,
+	QQ_ROOM_CMD_QUIT = 0x09,
+	QQ_ROOM_CMD_SEND_MSG = 0x0a,
+	QQ_ROOM_CMD_GET_ONLINES = 0x0b,
+	QQ_ROOM_CMD_GET_MEMBER_INFO = 0x0c,
+
+	QQ_ROOM_CMD_CHANGE_CARD = 0x0E,
+	QQ_ROOM_CMD_GET_REALNAMES = 0x0F,
+	QQ_ROOM_CMD_GET_CARD = 0x10,
+	QQ_ROOM_CMD_SEND_IM_EX = 0x1A,
+	QQ_ROOM_CMD_ADMIN = 0x1B,
+	QQ_ROOM_CMD_TRANSFER = 0x1C,
+	QQ_ROOM_CMD_TEMP_CREATE = 0x30,
+	QQ_ROOM_CMD_TEMP_CHANGE_MEMBER = 0x31,
+	QQ_ROOM_CMD_TEMP_QUIT = 0x32,
+	QQ_ROOM_CMD_TEMP_GET_INFO = 0x33,
+	QQ_ROOM_CMD_TEMP_SEND_IM = 0x35,
+	QQ_ROOM_CMD_TEMP_GET_MEMBERS = 0x37,
+};
+
+const gchar *qq_get_room_cmd_desc(gint room_cmd);
 
 #endif
diff --git a/libpurple/protocols/qq/im.c b/libpurple/protocols/qq/im.c
index 1962d8aadc..15642528d1 100644
--- a/libpurple/protocols/qq/im.c
+++ b/libpurple/protocols/qq/im.c
@@ -35,7 +35,6 @@
 #include "buddy_list.h"
 #include "buddy_opt.h"
 #include "char_conv.h"
-#include "crypt.h"
 #include "group_im.h"
 #include "header_info.h"
 #include "im.h"
@@ -541,52 +540,35 @@ void qq_send_packet_im(PurpleConnection *gc, guint32 to_uid, gchar *msg, gint ty
 }
 
 /* parse the reply to send_im */
-void qq_process_send_im_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+void qq_process_send_im_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len;
-	guint8 *data, reply;
-	gint bytes = 0;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		bytes += qq_get8(&reply, data + bytes);
-		if (reply != QQ_SEND_IM_REPLY_OK) {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Send IM fail\n");
-			purple_notify_error(gc, _("Error"), _("Failed to send IM."), NULL);
-		}
-		else
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "IM ACK OK\n");
-	} else {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt send im reply\n");
+
+	if (data[0] != QQ_SEND_IM_REPLY_OK) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Send IM fail\n");
+		purple_notify_error(gc, _("Error"), _("Failed to send IM."), NULL);
+	}	else {
+		purple_debug(PURPLE_DEBUG_INFO, "QQ", "IM ACK OK\n");
 	}
 }
 
 /* I receive a message, mainly it is text msg,
  * but we need to proess other types (group etc) */
-void qq_process_recv_im(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc)
+void qq_process_recv_im(guint8 *data, gint data_len, guint16 seq, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len, bytes;
-	guint8 *data;
+	gint bytes;
 	qq_recv_im_header *im_header;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (!qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt rev im\n");
-	}
 
-	if (len < 16) {	/* we need to ack with the first 16 bytes */
+	if (data_len < 16) {	/* we need to ack with the first 16 bytes */
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "IM is too short\n");
 		return;
 	} else {
@@ -594,9 +576,9 @@ void qq_process_recv_im(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection
 	}
 
 	/* check len first */
-	if (len < 20) {	/* length of im_header */
+	if (data_len < 20) {	/* length of im_header */
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-				"Fail read recv IM header, len should longer than 20 bytes, read %d bytes\n", len);
+				"Fail read recv IM header, len should longer than 20 bytes, read %d bytes\n", data_len);
 		return;
 	}
 
@@ -617,7 +599,7 @@ void qq_process_recv_im(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection
 	}
 
 	/* check bytes */
-	if (bytes >= len - 1) {
+	if (bytes >= data_len - 1) {
 		purple_debug (PURPLE_DEBUG_WARNING, "QQ", "Received IM is empty\n");
 		return;
 	}
@@ -626,57 +608,57 @@ void qq_process_recv_im(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection
 		case QQ_RECV_IM_TO_BUDDY:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM from buddy [%d], I am in his/her buddy list\n", im_header->sender_uid);
-			_qq_process_recv_normal_im(data + bytes, len - bytes, gc); /* position and rest length */
+			_qq_process_recv_normal_im(data + bytes, data_len - bytes, gc); /* position and rest length */
 			break;
 		case QQ_RECV_IM_TO_UNKNOWN:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM from buddy [%d], I am a stranger to him/her\n", im_header->sender_uid);
-			_qq_process_recv_normal_im(data + bytes, len - bytes, gc);
+			_qq_process_recv_normal_im(data + bytes, data_len - bytes, gc);
 			break;
 		case QQ_RECV_IM_UNKNOWN_QUN_IM:
 		case QQ_RECV_IM_TEMP_QUN_IM:
 		case QQ_RECV_IM_QUN_IM:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ", "IM from group, internal_id [%d]\n", im_header->sender_uid);
-			/* sender_uid is in fact internal_group_id */
-			qq_process_recv_group_im(data + bytes, len - bytes, im_header->sender_uid, gc, im_header->im_type);
+			/* sender_uid is in fact id */
+			qq_process_recv_group_im(data + bytes, data_len - bytes, im_header->sender_uid, gc, im_header->im_type);
 			break;
 		case QQ_RECV_IM_ADD_TO_QUN:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM from group, added by group internal_id [%d]\n", im_header->sender_uid);
-			/* sender_uid is in fact internal_group_id
+			/* sender_uid is group id
 			 * we need this to create a dummy group and add to blist */
-			qq_process_recv_group_im_been_added(data + bytes, len - bytes, im_header->sender_uid, gc);
+			qq_process_recv_group_im_been_added(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_DEL_FROM_QUN:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM from group, removed by group internal_ID [%d]\n", im_header->sender_uid);
-			/* sender_uid is in fact internal_group_id */
-			qq_process_recv_group_im_been_removed(data + bytes, len - bytes, im_header->sender_uid, gc);
+			/* sender_uid is group id */
+			qq_process_recv_group_im_been_removed(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_APPLY_ADD_TO_QUN:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM from group, apply to join group internal_ID [%d]\n", im_header->sender_uid);
-			/* sender_uid is in fact internal_group_id */
-			qq_process_recv_group_im_apply_join(data + bytes, len - bytes, im_header->sender_uid, gc);
+			/* sender_uid is group id */
+			qq_process_recv_group_im_apply_join(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_APPROVE_APPLY_ADD_TO_QUN:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM for group system info, approved by group internal_id [%d]\n",
 					im_header->sender_uid);
-			/* sender_uid is in fact internal_group_id */
-			qq_process_recv_group_im_been_approved(data + bytes, len - bytes, im_header->sender_uid, gc);
+			/* sender_uid is group id */
+			qq_process_recv_group_im_been_approved(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_REJCT_APPLY_ADD_TO_QUN:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM for group system info, rejected by group internal_id [%d]\n",
 					im_header->sender_uid);
-			/* sender_uid is in fact internal_group_id */
-			qq_process_recv_group_im_been_rejected(data + bytes, len - bytes, im_header->sender_uid, gc);
+			/* sender_uid is group id */
+			qq_process_recv_group_im_been_rejected(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_SYS_NOTIFICATION:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"IM from [%d], should be a system administrator\n", im_header->sender_uid);
-			_qq_process_recv_sys_im(data + bytes, len - bytes, gc);
+			_qq_process_recv_sys_im(data + bytes, data_len - bytes, gc);
 			break;
 		default:
 			purple_debug(PURPLE_DEBUG_WARNING, "QQ",
diff --git a/libpurple/protocols/qq/im.h b/libpurple/protocols/qq/im.h
index bbdda78fd5..5e55413b23 100644
--- a/libpurple/protocols/qq/im.h
+++ b/libpurple/protocols/qq/im.h
@@ -59,7 +59,7 @@ guint8 *qq_get_send_im_tail(const gchar *font_color,
 			    gboolean is_bold, gboolean is_italic, gboolean is_underline, gint len);
 
 void qq_send_packet_im(PurpleConnection *gc, guint32 to_uid, gchar *msg, gint type);
-void qq_process_recv_im(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc);
-void qq_process_send_im_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
+void qq_process_recv_im(guint8 *data, gint data_len, guint16 seq, PurpleConnection *gc);
+void qq_process_send_im_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 
 #endif
diff --git a/libpurple/protocols/qq/qq.c b/libpurple/protocols/qq/qq.c
index 83adbc860f..0e7a591267 100644
--- a/libpurple/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
@@ -42,7 +42,6 @@
 #include "buddy_opt.h"
 #include "buddy_list.h"
 #include "char_conv.h"
-#include "crypt.h"
 #include "group.h"
 #include "group_find.h"
 #include "group_im.h"
@@ -551,7 +550,7 @@ static void _qq_menu_create_permanent_group(PurplePluginAction * action)
 			   _("Input Qun name here"),
 			   _("Only QQ members can create permanent Qun"),
 			   "OpenQ", FALSE, FALSE, NULL,
-			   _("Create"), G_CALLBACK(qq_group_create_with_name), _("Cancel"), NULL, gc);
+			   _("Create"), G_CALLBACK(qq_room_create_new), _("Cancel"), NULL, gc);
 }
 */
 
diff --git a/libpurple/protocols/qq/qq.h b/libpurple/protocols/qq/qq.h
index 0eeea31e41..2c21d2959c 100644
--- a/libpurple/protocols/qq/qq.h
+++ b/libpurple/protocols/qq/qq.h
@@ -35,7 +35,6 @@
 #include "roomlist.h"
 
 #define QQ_KEY_LENGTH       16
-#define QQ_DEBUG            1	/* whether we are doing DEBUG */
 
 #ifdef _WIN32
 const char *qq_win32_buddy_icon_dir(void);
@@ -138,7 +137,6 @@ struct _qq_data {
 	gint channel;			/* the id for opened chat conversation */
 
 	GList *groups;
-	GList *group_packets;
 	GSList *joining_groups;
 	GSList *adding_groups_from_server; /* internal ids of groups the server wants in my blist */
 	GList *buddies;
diff --git a/libpurple/protocols/qq/qq_base.c b/libpurple/protocols/qq/qq_base.c
index e4f00c793d..b1b5ed9e9e 100644
--- a/libpurple/protocols/qq/qq_base.c
+++ b/libpurple/protocols/qq/qq_base.c
@@ -30,7 +30,7 @@
 #include "buddy_info.h"
 #include "buddy_list.h"
 #include "char_conv.h"
-#include "crypt.h"
+#include "qq_crypt.h"
 #include "group.h"
 #include "header_info.h"
 #include "qq_base.h"
@@ -161,7 +161,7 @@ static gint8 process_login_ok(PurpleConnection *gc, guint8 *data, gint len)
 	bytes += qq_get8(&lrop.result, data + bytes);
 	/* 001-016: session key */
 	bytes += qq_getdata(lrop.session_key, sizeof(lrop.session_key), data + bytes);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Get session_key done\n");
+	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Got session_key\n");
 	/* 017-020: login uid */
 	bytes += qq_get32(&lrop.uid, data + bytes);
 	/* 021-024: server detected user public IP */
@@ -300,23 +300,26 @@ void qq_send_packet_login(PurpleConnection *gc)
 
 	g_return_if_fail(qd->token != NULL && qd->token_len > 0);
 
-	raw_data = g_newa(guint8, QQ_LOGIN_DATA_LENGTH);
-	memset(raw_data, 0, QQ_LOGIN_DATA_LENGTH);
-
-	encrypted_data = g_newa(guint8, QQ_LOGIN_DATA_LENGTH + 16);	/* 16 bytes more */
 #ifdef DEBUG
 	memset(qd->inikey, 0x01, sizeof(qd->inikey));
 #else
 	for (bytes = 0; bytes < sizeof(qd->inikey); bytes++)	{
-		qd->inikey[bytes] = (guint8) (g_random_int_range(0, 255) % 256);
+		qd->inikey[bytes] = (guint8) (rand() & 0xff);
 	}
 #endif
 
+	raw_data = g_newa(guint8, QQ_LOGIN_DATA_LENGTH);
+	memset(raw_data, 0, QQ_LOGIN_DATA_LENGTH);
+
+	encrypted_data = g_newa(guint8, QQ_LOGIN_DATA_LENGTH + 16);	/* 16 bytes more */
+	
 	bytes = 0;
 	/* now generate the encrypted data
 	 * 000-015 use password_twice_md5 as key to encrypt empty string */
-	qq_encrypt((guint8 *) "", 0, qd->password_twice_md5, raw_data + bytes, &encrypted_len);
-	bytes += 16;
+	encrypted_len = qq_encrypt(raw_data + bytes, (guint8 *) "", 0, qd->password_twice_md5);
+	g_return_if_fail(encrypted_len == 16);
+	bytes += encrypted_len;
+	
 	/* 016-016 */
 	bytes += qq_put8(raw_data + bytes, 0x00);
 	/* 017-020, used to be IP, now zero */
@@ -337,7 +340,7 @@ void qq_send_packet_login(PurpleConnection *gc)
 	bytes += qq_putdata(raw_data + bytes, login_100_bytes, 100);
 	/* all zero left */
 
-	qq_encrypt(raw_data, QQ_LOGIN_DATA_LENGTH, qd->inikey, encrypted_data, &encrypted_len);
+	encrypted_len = qq_encrypt(encrypted_data, raw_data, QQ_LOGIN_DATA_LENGTH, qd->inikey);
 
 	buf = g_newa(guint8, MAX_PACKET_SIZE);
 	memset(buf, 0, MAX_PACKET_SIZE);
@@ -405,36 +408,15 @@ void qq_send_packet_logout(PurpleConnection *gc)
 }
 
 /* process the login reply packet */
-guint8 qq_process_login_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
+guint8 qq_process_login_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
-	guint8 *data;
-	gint data_len;
 	gchar* error_msg;
 
-	g_return_val_if_fail(buf != NULL && buf_len != 0, QQ_LOGIN_REPLY_ERR_MISC);
+	g_return_val_if_fail(data != NULL && data_len != 0, QQ_LOGIN_REPLY_ERR_MISC);
 
 	qd = (qq_data *) gc->proto_data;
 
-	data_len = buf_len;
-	data = g_newa(guint8, data_len);
-
-	if (qq_decrypt(buf, buf_len, qd->inikey, data, &data_len)) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
-				"Decrypt login reply packet with inikey, %d bytes\n", data_len);
-	} else {
-		/* reset data_len since it may changed */
-		data_len = buf_len;
-		if (qq_decrypt(buf, buf_len, qd->password_twice_md5, data, &data_len)) {
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-				"Decrypt login reply packet with password_twice_md5, %d bytes\n", data_len);
-		} else {
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-					"No idea how to decrypt login reply\n");
-			return QQ_LOGIN_REPLY_ERR_MISC;
-		}
-	}
-	
 	switch (data[0]) {
 		case QQ_LOGIN_REPLY_OK:
 			purple_debug(PURPLE_DEBUG_INFO, "QQ", "Login reply is OK\n");
@@ -452,7 +434,7 @@ guint8 qq_process_login_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
 		break;
 	}
 
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Unknown reply code: %d\n", data[0]);
+	purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Unknown reply code: 0x%02X\n", data[0]);
 			qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ",
 			data, data_len,
 			">>> [default] decrypt and dump");
@@ -482,28 +464,19 @@ void qq_send_packet_keep_alive(PurpleConnection *gc)
 }
 
 /* parse the return of keep-alive packet, it includes some system information */
-gboolean qq_process_keep_alive(guint8 *buf, gint buf_len, PurpleConnection *gc) 
+gboolean qq_process_keep_alive(guint8 *data, gint data_len, PurpleConnection *gc) 
 {
 	qq_data *qd;
-	gint len;
 	gchar **segments;
-	guint8 *data;
 
-	g_return_val_if_fail(buf != NULL && buf_len != 0, FALSE);
+	g_return_val_if_fail(data != NULL && data_len != 0, FALSE);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if ( !qq_decrypt(buf, buf_len, qd->session_key, data, &len) ) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt keep alive reply\n");
-		return FALSE;
-	}
 
 	/* qq_show_packet("Keep alive reply packet", data, len); */
 
 	/* the last one is 60, don't know what it is */
-	if (NULL == (segments = split_data(data, len, "\x1f", 6)))
+	if (NULL == (segments = split_data(data, data_len, "\x1f", 6)))
 			return TRUE;
 			
 	/* segments[0] and segment[1] are all 0x30 ("0") */
diff --git a/libpurple/protocols/qq/qq_base.h b/libpurple/protocols/qq/qq_base.h
index 32d4188512..ce5c210bca 100644
--- a/libpurple/protocols/qq/qq_base.h
+++ b/libpurple/protocols/qq/qq_base.h
@@ -47,10 +47,10 @@ void qq_send_packet_token(PurpleConnection *gc);
 guint8 qq_process_token_reply(PurpleConnection *gc, gchar *error_msg, guint8 *buf, gint buf_len);
 
 void qq_send_packet_login(PurpleConnection *gc);
-guint8 qq_process_login_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
+guint8 qq_process_login_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 
 void qq_send_packet_logout(PurpleConnection *gc);
 
 void qq_send_packet_keep_alive(PurpleConnection *gc);
-gboolean qq_process_keep_alive(guint8 *buf, gint buf_len, PurpleConnection *gc);
+gboolean qq_process_keep_alive(guint8 *data, gint data_len, PurpleConnection *gc);
 #endif
diff --git a/libpurple/protocols/qq/qq_crypt.c b/libpurple/protocols/qq/qq_crypt.c
new file mode 100644
index 0000000000..8de97da9e0
--- /dev/null
+++ b/libpurple/protocols/qq/qq_crypt.c
@@ -0,0 +1,330 @@
+/**
+ * @file qq_crypt.c
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *
+ * QQ encryption algorithm
+ * Convert from ASM code provided by PerlOICQ
+ * 
+ * Puzzlebird, Nov-Dec 2002
+ */
+
+/* Notes: (QQ uses 16 rounds, and modified something...)
+
+IN : 64  bits of data in v[0] - v[1].
+OUT: 64  bits of data in w[0] - w[1].
+KEY: 128 bits of key  in k[0] - k[3].
+
+delta is chosen to be the real part of 
+the golden ratio: Sqrt(5/4) - 1/2 ~ 0.618034 multiplied by 2^32. 
+
+0x61C88647 is what we can track on the ASM codes.!!
+*/
+
+#include <string.h>
+
+#include "debug.h"
+#include "qq_crypt.h"
+
+#if 0
+void show_binary(char *psztitle, const guint8 *const buffer, gint bytes)
+{
+	printf("== %s %d ==\r\n", psztitle, bytes);
+	gint i, j, ch;
+	for (i = 0; i < bytes; i += 16) {
+		/* length label */
+		printf("%07x: ", i);
+		
+		/* dump hex value */
+		for (j = 0; j < 16; j++) {
+			if (j == 8) {
+				printf(" -");
+			}
+			if ((i + j) < bytes)
+				printf(" %02x", buffer[i + j]);
+			else
+				printf("   ");
+		}
+		
+		printf("  ");
+		
+		
+		/* dump ascii value */
+		for (j = 0; j < 16 && (i + j) < bytes; j++) {
+			ch = buffer[i + j] & 127;
+			if (ch < ' ' || ch == 127)
+				printf(".");
+			else
+				printf("%c", ch);
+		}
+		printf("\r\n");
+	}
+	printf("========\r\n");
+}
+#else
+
+#define show_binary(args... )		/* nothing */
+
+#endif
+
+/********************************************************************
+ * encryption 
+ *******************************************************************/
+
+/* Tiny Encryption Algorithm (TEA) */
+static inline void qq_encipher(guint32 *const v, const guint32 *const k, guint32 *const w)
+{
+	register guint32
+		y = g_ntohl(v[0]), 
+		 z = g_ntohl(v[1]), 
+		 a = g_ntohl(k[0]), 
+		 b = g_ntohl(k[1]), 
+		 c = g_ntohl(k[2]), 
+		 d = g_ntohl(k[3]), 
+		 n = 0x10, 
+		 sum = 0, 
+		 delta = 0x9E3779B9;	/*  0x9E3779B9 - 0x100000000 = -0x61C88647 */
+
+	while (n-- > 0) {
+		sum += delta;
+		y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
+		z += ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
+	}
+
+	w[0] = g_htonl(y);
+	w[1] = g_htonl(z);
+}
+
+/* it can be the real random seed function */
+/* override with number, convenient for debug */
+#ifdef DEBUG
+static gint crypt_rand(void) {	
+	return 0xdead; 
+}
+#else
+#include <stdlib.h>
+#define crypt_rand() rand()
+#endif
+
+/* 64-bit blocks and some kind of feedback mode of operation */
+static inline void encrypt_out(guint8 *crypted, const gint crypted_len, const guint8 *key) 
+{
+	/* ships in encipher */
+	guint32 plain32[2];
+	guint32 p32_prev[2];
+	guint32 key32[4];
+	guint32 crypted32[2];
+	guint32 c32_prev[2];
+	
+	guint8 *crypted_ptr;
+	gint count64;
+	
+	/* prepare at first */
+	crypted_ptr = crypted;
+	
+	memcpy(crypted32, crypted_ptr, sizeof(crypted32));
+	c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1];
+	
+	p32_prev[0] = 0; p32_prev[1] = 0;
+	plain32[0] = crypted32[0] ^ p32_prev[0]; plain32[1] = crypted32[1] ^ p32_prev[1];
+	
+	g_memmove(key32, key, 16);
+	count64 = crypted_len / 8;
+	while (count64-- > 0){
+		/* encrypt it */
+		qq_encipher(plain32, key32, crypted32);
+		
+		crypted32[0] ^= p32_prev[0]; crypted32[1] ^= p32_prev[1];
+		
+		/* store curr 64 bits crypted */
+		g_memmove(crypted_ptr, crypted32, sizeof(crypted32));
+		
+		/* set prev */
+		p32_prev[0] = plain32[0]; p32_prev[1] = plain32[1];
+		c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1];
+		
+		/* set next 64 bits want to crypt*/
+		crypted_ptr += 8;
+		memcpy(crypted32, crypted_ptr, sizeof(crypted32));
+		plain32[0] = crypted32[0] ^ c32_prev[0]; plain32[1] = crypted32[1] ^ c32_prev[1];
+	}
+}
+
+/* length of crypted buffer must be plain_len + 16*/
+gint qq_encrypt(guint8* crypted, const guint8* const plain, const gint plain_len, const guint8* const key)
+{
+	guint8 *crypted_ptr = crypted;		/* current position of dest */
+	gint pos, padding;
+	
+	padding = (plain_len + 10) % 8;
+	if (padding) {
+		padding = 8 - padding;
+	}
+
+	pos = 0;
+
+	/* set first byte as padding len */
+	crypted_ptr[pos] = (rand() & 0xf8) | padding;
+	pos++;
+
+	/* extra 2 bytes */
+	padding += 2;
+
+	/* faster a little
+	memset(crypted_ptr + pos, rand() & 0xff, padding);
+	pos += padding;
+	*/
+
+	/* more random */
+	while (padding--) {
+		crypted_ptr[pos++] = rand() & 0xff;
+	}
+
+	g_memmove(crypted_ptr + pos, plain, plain_len);
+	pos += plain_len;
+
+	/* header padding len + plain len must be multiple of 8
+	 * tail pading len is always 8 - (1st byte)
+	 */
+	memset(crypted_ptr + pos, 0x00, 7);
+	pos += 7;
+
+	show_binary("After padding", crypted, pos);
+
+	encrypt_out(crypted, pos, key);
+
+	show_binary("Encrypted", crypted, pos);
+	return pos;
+}
+
+/******************************************************************** 
+ * decryption 
+ ********************************************************************/
+
+static inline void qq_decipher(guint32 *const v, const guint32 *const k, guint32 *const w)
+{
+	register guint32
+		y = g_ntohl(v[0]), 
+		z = g_ntohl(v[1]), 
+		a = g_ntohl(k[0]), 
+		b = g_ntohl(k[1]), 
+		c = g_ntohl(k[2]), 
+		d = g_ntohl(k[3]), 
+		n = 0x10, 
+		sum = 0xE3779B90,	/* why this ? must be related with n value */
+		delta = 0x9E3779B9;
+
+	/* sum = delta<<5, in general sum = delta * n */
+	while (n-- > 0) {
+		z -= ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
+		y -= ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
+		sum -= delta;
+	}
+
+	w[0] = g_htonl(y);
+	w[1] = g_htonl(z);
+}
+
+static inline gint decrypt_out(guint8 *dest, gint crypted_len, const guint8* const key) 
+{
+	gint plain_len;
+	guint32 key32[4];
+	guint32 crypted32[2];
+	guint32 c32_prev[2];
+	guint32 plain32[2];
+	guint32 p32_prev[2];
+	gint count64;
+	gint padding;
+	guint8 *crypted_ptr = dest;
+
+	/* decrypt first 64 bit */
+	memcpy(key32, key, sizeof(key32));
+	memcpy(crypted32, crypted_ptr, sizeof(crypted32));
+	c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1];
+
+	qq_decipher(crypted32, key32, p32_prev);
+	memcpy(crypted_ptr, p32_prev, sizeof(p32_prev));
+
+	/* check padding len */
+	padding = 2 + (crypted_ptr[0] & 0x7);
+	if (padding < 2) {
+		padding += 8;
+	}
+	plain_len = crypted_len - 1 - padding - 7;
+	if( plain_len < 0 )	{
+		return -2;
+	}
+	
+	count64 = crypted_len / 8;
+	while (count64-- > 0){
+		c32_prev[0] = crypted32[0]; c32_prev[1] = crypted32[1];
+		crypted_ptr += 8;
+
+		memcpy(crypted32, crypted_ptr, sizeof(crypted32));
+		p32_prev[0] ^= crypted32[0]; p32_prev[1] ^= crypted32[1];
+
+		qq_decipher(p32_prev, key32, p32_prev);
+		
+		plain32[0] = p32_prev[0] ^ c32_prev[0]; plain32[1] = p32_prev[1] ^ c32_prev[1];
+		memcpy(crypted_ptr, plain32, sizeof(plain32));
+	}
+
+	return plain_len;
+}
+
+/* length of plain buffer must be equal to crypted_len */
+gint qq_decrypt(guint8 *plain, const guint8* const crypted, const gint crypted_len, const guint8* const key)
+{
+	gint plain_len = 0;
+	gint hdr_padding;
+	gint pos;
+
+	/* at least 16 bytes and %8 == 0 */
+	if ((crypted_len % 8) || (crypted_len < 16)) { 
+		return -1;
+	}
+
+	memcpy(plain, crypted, crypted_len);
+
+	plain_len = decrypt_out(plain, crypted_len, key);
+	if (plain_len < 0) {
+		return plain_len;	/* invalid first 64 bits */
+	}
+
+	show_binary("Decrypted with padding", plain, crypted_len);
+
+	/* check last 7 bytes is zero or not? */
+	for (pos = crypted_len - 1; pos > crypted_len - 8; pos--) {
+		if (plain[pos] != 0) {
+			return -3;
+		}
+	}
+	if (plain_len == 0) {
+		return plain_len;
+	}
+
+	hdr_padding = crypted_len - plain_len - 7;
+	g_memmove(plain, plain + hdr_padding, plain_len);
+
+	return plain_len;
+}
+
diff --git a/libpurple/protocols/qq/crypt.h b/libpurple/protocols/qq/qq_crypt.h
index 74c56a0b42..dbcda15761 100644
--- a/libpurple/protocols/qq/crypt.h
+++ b/libpurple/protocols/qq/qq_crypt.h
@@ -1,5 +1,5 @@
  /**
- * @file crypt.h
+ * @file qq_crypt.h
  *
  * purple
  *
@@ -27,14 +27,7 @@
 
 #include <glib.h>
 
-#define DECRYPT 0x00
-#define ENCRYPT 0x01
-
-void qq_encrypt(const guint8 *const instr, gint instrlen, 
-		const guint8 *const key, 
-		guint8 *outstr, gint *outstrlen_ptr);
+gint qq_encrypt(guint8* crypted, const guint8* const plain, const gint plain_len, const guint8* const key);
 		
-gint qq_decrypt(const guint8 *const instr, gint instrlen, 
-		const guint8 *const key,
-		guint8 *outstr, gint *outstrlen_ptr);
+gint qq_decrypt(guint8 *plain, const guint8* const crypted, const gint crypted_len, const guint8* const key);
 #endif
diff --git a/libpurple/protocols/qq/qq_network.c b/libpurple/protocols/qq/qq_network.c
index f18cb63fe4..a1354af01b 100644
--- a/libpurple/protocols/qq/qq_network.c
+++ b/libpurple/protocols/qq/qq_network.c
@@ -34,7 +34,7 @@
 #include "buddy_info.h"
 #include "group_info.h"
 #include "group_free.h"
-#include "crypt.h"
+#include "qq_crypt.h"
 #include "header_info.h"
 #include "qq_base.h"
 #include "buddy_list.h"
@@ -167,6 +167,9 @@ static void packet_process(PurpleConnection *gc, guint8 *buf, gint buf_len)
 	guint16 source_tag;
 	guint16 cmd;
 	guint16 seq;		/* May be ack_seq or send_seq, depends on cmd */
+	
+	guint8 room_cmd;
+	guint32 room_id;
 
 	qq_transaction *trans;
 
@@ -180,12 +183,11 @@ static void packet_process(PurpleConnection *gc, guint8 *buf, gint buf_len)
 	bytes = 0;
 	bytes += packet_get_header(&header_tag, &source_tag, &cmd, &seq, buf + bytes);
 
-	if (QQ_DEBUG) {
+#if 1
 		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-				"==> [%05d] 0x%04X %s, from (0x%04X %s)\n",
-				seq, cmd, qq_get_cmd_desc(cmd), source_tag, qq_get_ver_desc(source_tag));
-	}
-	
+				"==> [%05d] 0x%04X %s, from (0x%04X %s) len %d\n",
+				seq, cmd, qq_get_cmd_desc(cmd), source_tag, qq_get_ver_desc(source_tag), buf_len);
+#endif	
 	bytes_not_read = buf_len - bytes - 1;
 
 	/* ack packet, we need to update send tranactions */
@@ -214,8 +216,19 @@ static void packet_process(PurpleConnection *gc, guint8 *buf, gint buf_len)
 	}
 
 	/* this is the length of all the encrypted data (also remove tail tag */
-	qq_proc_cmd_reply(gc, cmd, seq, buf + bytes, bytes_not_read);
-
+	if (cmd == QQ_CMD_ROOM) {
+		room_cmd = qq_trans_get_room_cmd(trans);
+		room_id = qq_trans_get_room_id(trans);
+#if 1
+		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+				"%s (0x%02X ) for room %d, len %d\n",
+				qq_get_room_cmd_desc(room_cmd), room_cmd, room_id, buf_len);
+#endif	
+		qq_proc_room_cmd_reply(gc, seq, room_cmd, room_id, buf + bytes, bytes_not_read);
+	} else {
+		qq_proc_cmd_reply(gc, cmd, seq, buf + bytes, bytes_not_read);
+	}
+	
 	/* check is redirect or not, and do it now */
 	if (qd->is_redirect) {
 	 	/* free resource except real_hostname and port */
@@ -730,6 +743,9 @@ static void udp_host_resolved(GSList *hosts, gpointer data, const char *error_me
 	/* we use non-blocking mode to speed up connection */
 	flags = fcntl(fd, F_GETFL);
 	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
 
 	/* From Unix-socket-FAQ: http://www.faqs.org/faqs/unix-faq/socket/
 	 *
@@ -933,7 +949,6 @@ void qq_disconnect(PurpleConnection *gc)
 
 	qd->my_ip.s_addr = 0;
 
-	qq_group_packets_free(qd);
 	qq_group_free_all(qd);
 	qq_add_buddy_request_free(qd);
 	qq_info_query_free(qd);
@@ -945,16 +960,8 @@ static gint encap(qq_data *qd, guint8 *buf, gint maxlen, guint16 cmd, guint16 se
 {
 	gint bytes = 0;
 	g_return_val_if_fail(qd != NULL && buf != NULL && maxlen > 0, -1);
+	g_return_val_if_fail(data != NULL && data_len > 0, -1);
 	
-	if (data == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Fail encap packet, data is NULL\n");
-		return -1;
-	}
-	if (data_len <= 0) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Fail encap packet, data len <= 0\n");
-		return -1;
-	}
-
 	/* QQ TCP packet has two bytes in the begining defines packet length
 	 * so leave room here to store packet size */
 	if (qd->use_tcp) {
@@ -1007,12 +1014,12 @@ gint qq_send_data(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack,
 		qq_trans_add_client_cmd(qd, cmd, seq, data, data_len);
 	}
 	
-	if (QQ_DEBUG) {
+#if 1
 		/* qq_show_packet("QQ_SEND_DATA", buf, buf_len); */
 		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-				"<== [%05d], %s, total %d bytes is sent %d\n", 
-				seq, qq_get_cmd_desc(cmd), buf_len, bytes_sent);
-	}
+				"<== [%05d], 0x%04X %s, total %d bytes is sent %d\n", 
+				seq, cmd, qq_get_cmd_desc(cmd), buf_len, bytes_sent);
+#endif
 	return bytes_sent;
 }
 
@@ -1026,11 +1033,26 @@ gint qq_send_cmd_detail(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack
 	g_return_val_if_fail(qd != NULL, -1);
 	g_return_val_if_fail(data != NULL && data_len > 0, -1);
 
-	encrypted_len = data_len + 16;	/* at most 16 bytes more */
-	encrypted_data = g_newa(guint8, encrypted_len);
-
-	qq_encrypt(data, data_len, qd->session_key, encrypted_data, &encrypted_len);
+	/* at most 16 bytes more */
+	encrypted_data = g_newa(guint8, data_len + 16);
+#if 0
+	purple_debug(PURPLE_DEBUG_INFO, "QQ_ENCRYPT",
+			"Before %d: [%05d] 0x%04X %s\n",
+			data_len, seq, cmd, qq_get_cmd_desc(cmd));
+#endif
+	encrypted_len = qq_encrypt(encrypted_data, data, data_len, qd->session_key);
+	if (encrypted_len < 16) {
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ_ENCRYPT",
+				"Error len %d: [%05d] 0x%04X %s\n",
+				encrypted_len, seq, cmd, qq_get_cmd_desc(cmd));
+		return -1;
+	}
 
+#if 0
+	purple_debug(PURPLE_DEBUG_INFO, "QQ_ENCRYPT",
+			"After %d: [%05d] 0x%04X %s\n",
+			encrypted_len, seq, cmd, qq_get_cmd_desc(cmd));
+#endif
 	return qq_send_data(qd, cmd, seq, need_ack, encrypted_data, encrypted_len);
 }
 
@@ -1043,3 +1065,81 @@ gint qq_send_cmd(qq_data *qd, guint16 cmd, guint8 *data, gint data_len)
 	qd->send_seq++;
 	return qq_send_cmd_detail(qd, cmd, qd->send_seq, TRUE, data, data_len);
 }
+
+gint qq_send_room_cmd_noid(PurpleConnection *gc, guint8 room_cmd, 
+		guint8 *data, gint data_len)
+{
+	return qq_send_room_cmd(gc, room_cmd, 0, data, data_len);
+}
+
+gint qq_send_room_cmd_only(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
+{
+	g_return_val_if_fail(room_cmd > 0 && room_id > 0, -1);
+	return qq_send_room_cmd(gc, room_cmd, room_id, NULL, 0);
+}
+
+gint qq_send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len)
+{
+	qq_data *qd;
+
+	guint8 *buf;
+	gint buf_len;
+	guint8 *encrypted_data;
+	gint encrypted_len;
+	gint bytes_sent;
+	guint16 seq;
+	
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *) gc->proto_data;
+
+	buf = g_newa(guint8, MAX_PACKET_SIZE);
+	memset(buf, 0, MAX_PACKET_SIZE);
+
+	/* encap room_cmd and room id to buf*/
+	buf_len = 0;
+	buf_len += qq_put8(buf + buf_len, room_cmd);
+	if (room_id != 0) {
+		/* id 0 is for QQ Demo Group, now there are not existed*/
+		buf_len += qq_put32(buf + buf_len, room_id);
+	}
+	if (data != NULL && data_len > 0) {
+		buf_len += qq_putdata(buf + buf_len, data, data_len);
+	}
+	qd->send_seq++;
+	seq = qd->send_seq;
+
+	/* Encrypt to encrypted_data with session_key */
+	/* at most 16 bytes more */
+	encrypted_data = g_newa(guint8, buf_len + 16);
+	encrypted_len = qq_encrypt(encrypted_data, buf, buf_len, qd->session_key);
+	if (encrypted_len < 16) {
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ_ENCRYPT",
+				"Error len %d: [%05d] QQ_CMD_ROOM.(0x%02X %s)\n",
+				encrypted_len, seq, room_cmd, qq_get_room_cmd_desc(room_cmd));
+		return -1;
+	}
+
+	/* Encap header to buf */
+	buf_len = encap(qd, buf, MAX_PACKET_SIZE, QQ_CMD_ROOM, seq, encrypted_data, encrypted_len);
+	if (buf_len <= 0) {
+		return -1;
+	}
+
+	if (qd->use_tcp) {
+		bytes_sent = tcp_send_out(qd, buf, buf_len);
+	} else {
+		bytes_sent = udp_send_out(qd, buf, buf_len);
+	}
+
+	qq_trans_add_room_cmd(qd, seq, room_cmd, room_id, buf, buf_len);
+	
+#if 1
+		/* qq_show_packet("QQ_SEND_DATA", buf, buf_len); */
+		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+				"<== [%05d], QQ_CMD_ROOM.(0x%02X %s) to room %d, total %d bytes is sent %d\n", 
+				seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id,
+				buf_len, bytes_sent);
+#endif
+	return bytes_sent;
+}
diff --git a/libpurple/protocols/qq/qq_network.h b/libpurple/protocols/qq/qq_network.h
index 054f6fccd9..33d4b7def5 100644
--- a/libpurple/protocols/qq/qq_network.h
+++ b/libpurple/protocols/qq/qq_network.h
@@ -42,4 +42,9 @@ gint qq_send_data(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack,
 gint qq_send_cmd_detail(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack,
 	guint8 *data, gint data_len);
 
+gint qq_send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len);
+gint qq_send_room_cmd_only(PurpleConnection *gc, guint8 room_cmd, guint32 room_id);
+gint qq_send_room_cmd_noid(PurpleConnection *gc, guint8 room_cmd, 
+		guint8 *data, gint data_len);
 #endif
diff --git a/libpurple/protocols/qq/qq_process.c b/libpurple/protocols/qq/qq_process.c
index 2b8749d000..b1fafb1762 100644
--- a/libpurple/protocols/qq/qq_process.c
+++ b/libpurple/protocols/qq/qq_process.c
@@ -37,8 +37,17 @@
 #include "group_info.h"
 #include "group_free.h"
 #include "char_conv.h"
-#include "crypt.h"
-#include "group_network.h"
+#include "qq_crypt.h"
+
+#include "group_conv.h"
+#include "group_find.h"
+#include "group_internal.h"
+#include "group_im.h"
+#include "group_info.h"
+#include "group_join.h"
+#include "group_opt.h"
+#include "group_search.h"
+
 #include "header_info.h"
 #include "qq_base.h"
 #include "im.h"
@@ -49,28 +58,24 @@
 #include "sys_msg.h"
 #include "utils.h"
 
+enum {
+	QQ_ROOM_CMD_REPLY_OK = 0x00,
+	QQ_ROOM_CMD_REPLY_SEARCH_ERROR = 0x02,
+	QQ_ROOM_CMD_REPLY_NOT_MEMBER = 0x0a
+};
+
 /* default process, decrypt and dump */
-static void process_cmd_unknow(PurpleConnection *gc,gchar *title, guint8 *buf, gint buf_len, guint16 cmd, guint16 seq)
+static void process_cmd_unknow(PurpleConnection *gc,gchar *title, guint8 *data, gint data_len, guint16 cmd, guint16 seq)
 {
 	qq_data *qd;
-	guint8 *data;
-	gint data_len;
 	gchar *msg_utf8 = NULL;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
-	qq_show_packet(title, buf, buf_len);
+	qq_show_packet(title, data, data_len);
 
 	qd = (qq_data *) gc->proto_data;
 
-	data_len = buf_len;
-	data = g_newa(guint8, data_len);
-	memset(data, 0, data_len);
-	if ( !qq_decrypt(buf, buf_len, qd->session_key, data, &data_len )) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Fail decrypt packet with default process\n");
-		return;
-	}
-	
 	qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ",
 			data, data_len,
 			">>> [%d] %s -> [default] decrypt and dump",
@@ -78,13 +83,39 @@ static void process_cmd_unknow(PurpleConnection *gc,gchar *title, guint8 *buf, g
 
 	msg_utf8 = try_dump_as_gbk(data, data_len);
 	if (msg_utf8) {
+		purple_notify_info(gc, NULL, msg_utf8, NULL);
 		g_free(msg_utf8);
 	}
 }
 
 void qq_proc_cmd_server(PurpleConnection *gc,
-	guint16 cmd, guint16 seq, guint8 *data, gint data_len)
+	guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len)
 {
+	qq_data *qd;
+
+	guint8 *data;
+	gint data_len;
+
+	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	data = g_newa(guint8, rcved_len);
+	data_len = qq_decrypt(data, rcved, rcved_len, qd->session_key);
+	if (data_len < 0) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Can not decrypt server cmd by session key, [%05d], 0x%04X %s, len %d\n", 
+			seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
+		qq_show_packet("Can not decrypted", rcved, rcved_len);
+		return;
+	}
+
+	if (data_len <= 0) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Server cmd decrypted is empty, [%05d], 0x%04X %s, len %d\n", 
+			seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
+		return;
+	}
+	
 	/* now process the packet */
 	switch (cmd) {
 		case QQ_CMD_RECV_IM:
@@ -134,7 +165,7 @@ static void process_cmd_login(PurpleConnection *gc, guint8 *data, gint data_len)
 		qq_send_packet_get_buddies_list(gc, 0);
 
 		/* refresh groups */
-		qq_send_packet_get_all_list_with_group(gc, 0);
+		qq_send_packet_get_buddies_and_rooms(gc, 0);
 
 		return;
 	}
@@ -168,14 +199,222 @@ static void process_cmd_login(PurpleConnection *gc, guint8 *data, gint data_len)
 	}
 }
 
+static void process_room_cmd_notify(PurpleConnection *gc, 
+	guint8 room_cmd, guint8 room_id, guint8 reply_cmd, guint8 reply, guint8 *data, gint data_len)
+{
+	gchar *msg, *msg_utf8;
+	g_return_if_fail(data != NULL && data_len > 0);
+
+	msg = g_strndup((gchar *) data, data_len);	/* it will append 0x00 */
+	msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
+	g_free(msg);
+	
+	msg = g_strdup_printf(_(
+		"Reply %s(0x%02X )\n"
+		"Sent %s(0x%02X )\n"
+		"Room id %d, reply [0x%02X]: \n"
+		"%s"), 
+		qq_get_room_cmd_desc(reply_cmd), reply_cmd, 
+		qq_get_room_cmd_desc(room_cmd), room_cmd, 
+		room_id, reply, msg_utf8);
+		
+	purple_notify_error(gc, NULL, _("Failed room reply"), msg);
+	g_free(msg);
+	g_free(msg_utf8);
+}
+
+void qq_proc_room_cmd_reply(PurpleConnection *gc,
+	guint16 seq, guint8 room_cmd, guint32 room_id, guint8 *rcved, gint rcved_len)
+{
+	qq_data *qd;
+	guint8 *data;
+	gint data_len;
+	qq_group *group;
+	gint bytes;
+	guint8 reply_cmd, reply;
+
+	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	data = g_newa(guint8, rcved_len);
+	data_len = qq_decrypt(data, rcved, rcved_len, qd->session_key);
+	if (data_len < 0) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Can not decrypt room cmd by session key, [%05d], 0x%02X %s for %d, len %d\n", 
+			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
+		qq_show_packet("Can not decrypted", rcved, rcved_len);
+		return;
+	}
+
+	if (room_id <= 0) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Invaild room id, [%05d], 0x%02X %s for %d, len %d\n", 
+			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
+		return;
+	}
+
+	if (data_len <= 2) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Invaild len of room cmd decrypted, [%05d], 0x%02X %s for %d, len %d\n", 
+			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
+		return;
+	}
+	
+	group = qq_room_search_id(gc, room_id);
+	if (group == NULL) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Missing room id in [%05d], 0x%02X %s for %d, len %d\n", 
+			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
+	}
+	
+	bytes = 0;
+	bytes += qq_get8(&reply_cmd, data + bytes);
+	bytes += qq_get8(&reply, data + bytes);
+
+	if (reply_cmd != room_cmd) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Missing room cmd in reply 0x%02X %s, [%05d], 0x%02X %s for %d, len %d\n", 
+			reply_cmd, qq_get_room_cmd_desc(reply_cmd),
+			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
+	}
+	
+	/* now process the packet */
+	if (reply != QQ_ROOM_CMD_REPLY_OK) {
+		if (group != NULL) {
+			qq_set_pending_id(&qd->joining_groups, group->ext_id, FALSE);
+		}
+		
+		switch (reply) {	/* this should be all errors */
+		case QQ_ROOM_CMD_REPLY_NOT_MEMBER:
+			if (group != NULL) {
+				purple_debug(PURPLE_DEBUG_WARNING,
+					   "QQ",
+					   _("You are not a member of group \"%s\"\n"), group->group_name_utf8);
+				group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
+				qq_group_refresh(gc, group);
+			}
+			break;
+		case QQ_ROOM_CMD_REPLY_SEARCH_ERROR:
+			if (qd->roomlist != NULL) {
+				if (purple_roomlist_get_in_progress(qd->roomlist))
+					purple_roomlist_set_in_progress(qd->roomlist, FALSE);
+			}
+		default:
+			process_room_cmd_notify(gc, room_cmd, room_id, reply_cmd, reply, data + bytes, data_len - bytes);
+		}
+		return;
+	}
+
+	/* seems ok so far, so we process the reply according to sub_cmd */
+	switch (reply_cmd) {
+	case QQ_ROOM_CMD_GET_INFO:
+		qq_process_room_cmd_get_info(data + bytes, data_len - bytes, gc);
+		if (group != NULL) {
+			qq_send_cmd_group_get_members_info(gc, group);
+			qq_send_cmd_group_get_online_members(gc, group);
+		}
+		break;
+	case QQ_ROOM_CMD_CREATE:
+		qq_group_process_create_group_reply(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_CHANGE_INFO:
+		qq_group_process_modify_info_reply(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_MEMBER_OPT:
+		qq_group_process_modify_members_reply(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_ACTIVATE:
+		qq_group_process_activate_group_reply(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_SEARCH:
+		qq_process_group_cmd_search_group(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_JOIN:
+		qq_process_group_cmd_join_group(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_AUTH:
+		qq_process_group_cmd_join_group_auth(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_QUIT:
+		qq_process_group_cmd_exit_group(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_SEND_MSG:
+		qq_process_group_cmd_im(data + bytes, data_len - bytes, gc);
+		break;
+	case QQ_ROOM_CMD_GET_ONLINES:
+		qq_process_room_cmd_get_onlines(data + bytes, data_len - bytes, gc);
+		if (group != NULL)
+			qq_group_conv_refresh_online_member(gc, group);
+		break;
+	case QQ_ROOM_CMD_GET_MEMBER_INFO:
+		qq_process_room_cmd_get_members(data + bytes, data_len - bytes, gc);
+		if (group != NULL)
+			qq_group_conv_refresh_online_member(gc, group);
+		break;
+	default:
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			   "Unknow room cmd 0x%02X %s\n", 
+			   reply_cmd, qq_get_room_cmd_desc(reply_cmd));
+	}
+}
+
 void qq_proc_cmd_reply(PurpleConnection *gc,
-	guint16 cmd, guint16 seq, guint8 *data, gint data_len)
+	guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len)
 {
+	qq_data *qd;
+
+	guint8 *data;
+	gint data_len;
+
 	guint8 ret_8 = 0;
 	guint16 ret_16 = 0;
 	guint32 ret_32 = 0;
 	gchar *error_msg = NULL;
 
+	g_return_if_fail(rcved_len > 0);
+
+	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	data = g_newa(guint8, rcved_len);
+	if (cmd == QQ_CMD_TOKEN) {
+		g_memmove(data, rcved, rcved_len);
+		data_len = rcved_len;
+	} else if (cmd == QQ_CMD_LOGIN) {
+		/* May use password_twice_md5 in the past version like QQ2005*/
+		data_len = qq_decrypt(data, rcved, rcved_len, qd->inikey);
+		if (data_len >= 0) {
+			purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
+					"Decrypt login reply packet with inikey, %d bytes\n", data_len);
+		} else {
+			data_len = qq_decrypt(data, rcved, rcved_len, qd->password_twice_md5);
+			if (data_len >= 0) {
+				purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
+					"Decrypt login reply packet with password_twice_md5, %d bytes\n", data_len);
+			} else {
+				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, 
+					_("Can not decrypt login reply"));
+				return;
+			}
+		}
+	} else {
+		data_len = qq_decrypt(data, rcved, rcved_len, qd->session_key);
+		if (data_len < 0) {
+			purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+				"Can not reply by session key, [%05d], 0x%04X %s, len %d\n", 
+				seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
+			qq_show_packet("Can not decrypted", rcved, rcved_len);
+			return;
+		}
+	}
+	
+	if (data_len <= 0) {
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			"Reply decrypted is empty, [%05d], 0x%04X %s, len %d\n", 
+			seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
+		return;
+	}
+
 	switch (cmd) {
 		case QQ_CMD_TOKEN:
 			ret_8 = qq_process_token_reply(gc, error_msg, data, data_len);
@@ -246,14 +485,11 @@ void qq_proc_cmd_reply(PurpleConnection *gc,
 				qq_send_packet_get_buddies_online(gc, 0);
 			}
 			break;
-		case QQ_CMD_GROUP_CMD:
-			qq_process_group_cmd_reply(data, data_len, seq, gc);
-			break;
-		case QQ_CMD_GET_ALL_LIST_WITH_GROUP:
-			ret_32 = qq_process_get_all_list_with_group_reply(data, data_len, gc);
+		case QQ_CMD_GET_BUDDIES_AND_ROOMS:
+			ret_32 = qq_process_get_buddies_and_rooms(data, data_len, gc);
 			if (ret_32 > 0 && ret_32 < 0xffffffff) {
 				purple_debug(PURPLE_DEBUG_INFO, "QQ", "Requesting for more buddies and groups\n");
-				qq_send_packet_get_all_list_with_group(gc, ret_32);
+				qq_send_packet_get_buddies_and_rooms(gc, ret_32);
 			} else {
 				purple_debug(PURPLE_DEBUG_INFO, "QQ", "All buddies and groups received\n"); 
 			}
diff --git a/libpurple/protocols/qq/qq_process.h b/libpurple/protocols/qq/qq_process.h
index 7b5820ede1..10fcbdd13d 100644
--- a/libpurple/protocols/qq/qq_process.h
+++ b/libpurple/protocols/qq/qq_process.h
@@ -31,8 +31,11 @@
 #include "qq.h"
 
 void qq_proc_cmd_reply(PurpleConnection *gc,
-		guint16 cmd, guint16 seq, guint8 *data, gint data_len);
+		guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len);
+void qq_proc_room_cmd_reply(PurpleConnection *gc,
+	guint16 seq, guint8 room_cmd, guint32 room_id, guint8 *rcved, gint rcved_len);
+	
 void qq_proc_cmd_server(PurpleConnection *gc,
-	guint16 cmd, guint16 seq, guint8 *data, gint data_len);
+	guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len);
 #endif
 
diff --git a/libpurple/protocols/qq/qq_trans.c b/libpurple/protocols/qq/qq_trans.c
index 77ee7d7459..d376282952 100644
--- a/libpurple/protocols/qq/qq_trans.c
+++ b/libpurple/protocols/qq/qq_trans.c
@@ -90,6 +90,18 @@ gboolean qq_trans_is_dup(qq_transaction *trans)
 		return FALSE;
 }
 
+guint8 qq_trans_get_room_cmd(qq_transaction *trans)
+{
+	g_return_val_if_fail(trans != NULL, 0);
+	return trans->room_cmd;
+}
+
+guint32 qq_trans_get_room_id(qq_transaction *trans)
+{
+	g_return_val_if_fail(trans != NULL, 0);
+	return trans->room_id;
+}
+
 /* Remove a packet with seq from send trans */
 static void trans_remove(qq_data *qd, qq_transaction *trans) 
 {
@@ -120,21 +132,53 @@ void qq_trans_add_client_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data
 	trans->fd = qd->fd;
 	trans->cmd = cmd;
 	trans->seq = seq;
+	trans->room_cmd = 0;
+	trans->room_id = 0;
 	trans->send_retries = QQ_RESEND_MAX;
 	trans->rcved_times = 0;
 	trans->scan_times = 0;
+
 	trans->data = NULL;
 	trans->data_len = 0;
 	if (data != NULL && data_len > 0) {
 		trans->data = g_memdup(data, data_len);	/* don't use g_strdup, may have 0x00 */
 		trans->data_len = data_len;
 	}
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ_TRANS",
+	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS",
 			"Add client cmd, seq = %d, data = %p, len = %d\n",
 			trans->seq, trans->data, trans->data_len);
 	qd->transactions = g_list_append(qd->transactions, trans);
 }
 
+void qq_trans_add_room_cmd(qq_data *qd, guint16 seq, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len)
+{
+	qq_transaction *trans = g_new0(qq_transaction, 1);
+
+	g_return_if_fail(trans != NULL);
+
+	trans->flag = 0;
+	trans->fd = qd->fd;
+	trans->seq = seq;
+	trans->cmd = QQ_CMD_ROOM;
+	trans->room_cmd = room_cmd;
+	trans->room_id = room_id;
+	trans->send_retries = QQ_RESEND_MAX;
+	trans->rcved_times = 0;
+	trans->scan_times = 0;
+
+	trans->data = NULL;
+	trans->data_len = 0;
+	if (data != NULL && data_len > 0) {
+		trans->data = g_memdup(data, data_len);	/* don't use g_strdup, may have 0x00 */
+		trans->data_len = data_len;
+	}
+	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS",
+			"Add room cmd, seq = %d, data = %p, len = %d\n",
+			trans->seq, trans->data, trans->data_len);
+	qd->transactions = g_list_append(qd->transactions, trans);
+}
+
 void qq_trans_add_server_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data, gint data_len)
 {
 	qq_transaction *trans = g_new0(qq_transaction, 1);
@@ -148,6 +192,8 @@ void qq_trans_add_server_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data
 	trans->fd = qd->fd;
 	trans->cmd = cmd;
 	trans->seq = seq;
+	trans->room_cmd = 0;
+	trans->room_id = 0;
 	trans->send_retries = 0;
 	trans->rcved_times = 1;
 	trans->scan_times = 0;
@@ -157,7 +203,7 @@ void qq_trans_add_server_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data
 		trans->data = g_memdup(data, data_len);	/* don't use g_strdup, may have 0x00 */
 		trans->data_len = data_len;
 	}
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ_TRANS",
+	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS",
 			"Add server cmd, seq = %d, data = %p, len = %d\n",
 			trans->seq, trans->data, trans->data_len);
 	qd->transactions = g_list_append(qd->transactions, trans);
diff --git a/libpurple/protocols/qq/qq_trans.h b/libpurple/protocols/qq/qq_trans.h
index a0afae0821..1b8ae995ae 100644
--- a/libpurple/protocols/qq/qq_trans.h
+++ b/libpurple/protocols/qq/qq_trans.h
@@ -40,6 +40,10 @@ typedef struct _qq_transaction {
 	guint8 flag;
 	guint16 seq;
 	guint16 cmd;
+
+	guint8 room_cmd;
+	guint32 room_id;
+	
 	guint8 *data;
 	gint data_len;
 
@@ -52,8 +56,14 @@ typedef struct _qq_transaction {
 qq_transaction *qq_trans_find_rcved(qq_data *qd, guint16 cmd, guint16 seq);
 gboolean qq_trans_is_server(qq_transaction *trans) ;
 gboolean qq_trans_is_dup(qq_transaction *trans);
+guint8 qq_trans_get_room_cmd(qq_transaction *trans);
+guint32 qq_trans_get_room_id(qq_transaction *trans);
+
 void qq_trans_add_client_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data, gint data_len);
 void qq_trans_add_server_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data, gint data_len);
+void qq_trans_add_room_cmd(qq_data *qd, guint16 seq, guint8 room_cmd, guint32 room_id,
+	guint8 *data, gint data_len);
+
 void qq_trans_process_before_login(qq_data *qd);
 gboolean qq_trans_scan(qq_data *qd);
 void qq_trans_remove_all(qq_data *qd);
diff --git a/libpurple/protocols/qq/send_file.c b/libpurple/protocols/qq/send_file.c
index 0f130d4fad..eabf6515ea 100644
--- a/libpurple/protocols/qq/send_file.c
+++ b/libpurple/protocols/qq/send_file.c
@@ -30,7 +30,6 @@
 #include "notify.h"
 
 #include "buddy_list.h"
-#include "crypt.h"
 #include "file_trans.h"
 #include "header_info.h"
 #include "im.h"
diff --git a/libpurple/protocols/qq/sys_msg.c b/libpurple/protocols/qq/sys_msg.c
index 588610532b..ef7d12e084 100644
--- a/libpurple/protocols/qq/sys_msg.c
+++ b/libpurple/protocols/qq/sys_msg.c
@@ -31,7 +31,6 @@
 #include "buddy_list.h"
 #include "buddy_opt.h"
 #include "char_conv.h"
-#include "crypt.h"
 #include "header_info.h"
 #include "packet_parse.h"
 #include "qq.h"
@@ -292,64 +291,55 @@ static void _qq_process_msg_sys_notice(PurpleConnection *gc, gchar *from, gchar
 	g_free(content);
 }
 
-void qq_process_msg_sys(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc)
+void qq_process_msg_sys(guint8 *data, gint data_len, guint16 seq, PurpleConnection *gc)
 {
 	qq_data *qd;
-	gint len;
-	guint8 *data;
 	gchar **segments, *code, *from, *to, *msg, *msg_utf8;
 
-	g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	len = buf_len;
-	data = g_newa(guint8, len);
-
-	if (qq_decrypt(buf, buf_len, qd->session_key, data, &len)) {
-		if (NULL == (segments = split_data(data, len, "\x1f", 4)))
-			return;
-		code = segments[0];
-		from = segments[1];
-		to = segments[2];
-		msg = segments[3];
-
-		_qq_send_packet_ack_msg_sys(gc, code[0], strtol(from, NULL, 10), seq);
-
-		if (strtol(to, NULL, 10) != qd->uid) {	/* not to me */
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Recv sys msg to [%s], not me!, discard\n", to);
-			g_strfreev(segments);
-			return;
-		}
-
-		msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
-		switch (strtol(code, NULL, 10)) {
-		case QQ_MSG_SYS_BEING_ADDED:
-			_qq_process_msg_sys_being_added(gc, from, to, msg_utf8);
-			break;
-		case QQ_MSG_SYS_ADD_CONTACT_REQUEST:
-			_qq_process_msg_sys_add_contact_request(gc, from, to, msg_utf8);
-			break;
-		case QQ_MSG_SYS_ADD_CONTACT_APPROVED:
-			_qq_process_msg_sys_add_contact_approved(gc, from, to, msg_utf8);
-			break;
-		case QQ_MSG_SYS_ADD_CONTACT_REJECTED:
-			_qq_process_msg_sys_add_contact_rejected(gc, from, to, msg_utf8);
-			break;
-		case QQ_MSG_SYS_NOTICE:
-			_qq_process_msg_sys_notice(gc, from, to, msg_utf8);
-			break;
-		case QQ_MSG_SYS_NEW_VERSION:
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-				   "QQ server says there is newer version than %s\n", qq_get_ver_desc(QQ_CLIENT));
-			break;
-		default:
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Recv unknown sys msg code: %s\n", code);
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "the msg is : %s\n", msg_utf8);
-		}
-		g_free(msg_utf8);
+
+	if (NULL == (segments = split_data(data, data_len, "\x1f", 4)))
+		return;
+	code = segments[0];
+	from = segments[1];
+	to = segments[2];
+	msg = segments[3];
+
+	_qq_send_packet_ack_msg_sys(gc, code[0], strtol(from, NULL, 10), seq);
+
+	if (strtol(to, NULL, 10) != qd->uid) {	/* not to me */
+		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Recv sys msg to [%s], not me!, discard\n", to);
 		g_strfreev(segments);
+		return;
+	}
 
-	} else {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt recv msg sys\n");
+	msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
+	switch (strtol(code, NULL, 10)) {
+	case QQ_MSG_SYS_BEING_ADDED:
+		_qq_process_msg_sys_being_added(gc, from, to, msg_utf8);
+		break;
+	case QQ_MSG_SYS_ADD_CONTACT_REQUEST:
+		_qq_process_msg_sys_add_contact_request(gc, from, to, msg_utf8);
+		break;
+	case QQ_MSG_SYS_ADD_CONTACT_APPROVED:
+		_qq_process_msg_sys_add_contact_approved(gc, from, to, msg_utf8);
+		break;
+	case QQ_MSG_SYS_ADD_CONTACT_REJECTED:
+		_qq_process_msg_sys_add_contact_rejected(gc, from, to, msg_utf8);
+		break;
+	case QQ_MSG_SYS_NOTICE:
+		_qq_process_msg_sys_notice(gc, from, to, msg_utf8);
+		break;
+	case QQ_MSG_SYS_NEW_VERSION:
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+			   "QQ server says there is newer version than %s\n", qq_get_ver_desc(QQ_CLIENT));
+		break;
+	default:
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Recv unknown sys msg code: %s\n", code);
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "the msg is : %s\n", msg_utf8);
 	}
+	g_free(msg_utf8);
+	g_strfreev(segments);
 }
diff --git a/libpurple/protocols/qq/sys_msg.h b/libpurple/protocols/qq/sys_msg.h
index 31a6ef1ba4..9371c1501e 100644
--- a/libpurple/protocols/qq/sys_msg.h
+++ b/libpurple/protocols/qq/sys_msg.h
@@ -28,6 +28,6 @@
 #include <glib.h>
 #include "connection.h"
 
-void qq_process_msg_sys(guint8 *buf, gint buf_len, guint16 seq, PurpleConnection *gc);
+void qq_process_msg_sys(guint8 *data, gint data_len, guint16 seq, PurpleConnection *gc);
 
 #endif
diff --git a/libpurple/protocols/qq/utils.c b/libpurple/protocols/qq/utils.c
index c3ee33fe6d..d2b8121488 100644
--- a/libpurple/protocols/qq/utils.c
+++ b/libpurple/protocols/qq/utils.c
@@ -314,7 +314,7 @@ static gchar *hex_dump_to_str(const guint8 *const buffer, gint bytes)
 			if ((i + j) < bytes)
 				g_string_append_printf(str, " %02x", buffer[i + j]);
 			else
-				g_string_append(str, "   ");
+				g_string_append(str, " --");
 		g_string_append(str, "  ");
 
 		/* dump ascii value */
diff --git a/libpurple/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c
index 0d9bbb755c..057fd7ab7d 100644
--- a/libpurple/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
@@ -1703,8 +1703,15 @@ static void simple_newconn_cb(gpointer data, gint source, PurpleInputCondition c
 	PurpleConnection *gc = data;
 	struct simple_account_data *sip = gc->proto_data;
 	struct sip_connection *conn;
+	int newfd, flags;
 
-	int newfd = accept(source, NULL, NULL);
+	newfd = accept(source, NULL, NULL);
+
+	flags = fcntl(newfd, F_GETFL);
+	fcntl(newfd, F_SETFL, flags | O_NONBLOCK);
+#ifndef _WIN32
+	fcntl(newfd, F_SETFD, FD_CLOEXEC);
+#endif
 
 	conn = connection_create(sip, newfd);
 
diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c
index 4d594ef48c..0b8a34d520 100644
--- a/libpurple/protocols/yahoo/yahoo.c
+++ b/libpurple/protocols/yahoo/yahoo.c
@@ -871,7 +871,7 @@ static void yahoo_process_message(PurpleConnection *gc, struct yahoo_packet *pkt
 				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, im->from);
 
 			username = g_markup_escape_text(im->from, -1);
-			serv_got_attention(gc, username, YAHOO_BUZZ);
+			purple_prpl_got_attention(gc, username, YAHOO_BUZZ);
 			g_free(username);
 			g_free(m);
 			g_free(im);
@@ -4096,7 +4096,7 @@ yahoopurple_cmd_buzz(PurpleConversation *c, const gchar *cmd, gchar **args, gcha
 	if (*args && args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	serv_send_attention(account->gc, c->name, YAHOO_BUZZ);
+	purple_prpl_send_attention(account->gc, c->name, YAHOO_BUZZ);
 
 	return PURPLE_CMD_RET_OK;
 }
diff --git a/libpurple/sslconn.c b/libpurple/sslconn.c
index 45d7647898..a5576472c8 100644
--- a/libpurple/sslconn.c
+++ b/libpurple/sslconn.c
@@ -27,6 +27,7 @@
 
 #include "certificate.h"
 #include "debug.h"
+#include "request.h"
 #include "sslconn.h"
 
 static gboolean _ssl_initialized = FALSE;
@@ -227,6 +228,9 @@ purple_ssl_close(PurpleSslConnection *gsc)
 
 	g_return_if_fail(gsc != NULL);
 
+	purple_request_close_with_handle(gsc);
+	purple_notify_close_with_handle(gsc);
+
 	ops = purple_ssl_get_ops();
 	(ops->close)(gsc);
 
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 46867fcdc7..e5b2ec2066 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -4656,6 +4656,9 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 
 	/* Setup the label telling how many people are in the room. */
 	gtkchat->count = gtk_label_new(_("0 people in room"));
+#if GTK_CHECK_VERSION(2,6,0)
+	gtk_label_set_ellipsize(GTK_LABEL(gtkchat->count), PANGO_ELLIPSIZE_END);
+#endif
 	gtk_box_pack_start(GTK_BOX(lbox), gtkchat->count, FALSE, FALSE, 0);
 	gtk_widget_show(gtkchat->count);
 
@@ -6670,8 +6673,11 @@ pidgin_conv_update_fields(PurpleConversation *conv, PidginConvFields fields)
 			update_typing_icon(gtkconv);
 
 		gtk_label_set_text(GTK_LABEL(gtkconv->menu_label), title);
-		if (pidgin_conv_window_is_active_conversation(conv))
-			gtk_window_set_title(GTK_WINDOW(win->window), title);
+		if (pidgin_conv_window_is_active_conversation(conv)) {
+			const char* current_title = gtk_window_get_title(GTK_WINDOW(win->window));
+			if (current_title == NULL || strcmp(current_title, title) != 0)
+				gtk_window_set_title(GTK_WINDOW(win->window), title);
+		}
 
 		g_free(title);
 	}
@@ -7430,7 +7436,9 @@ update_buddy_status_changed(PurpleBuddy *buddy, PurpleStatus *old, PurpleStatus
 	if (gtkconv)
 	{
 		conv = gtkconv->active_conv;
-		pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON | PIDGIN_CONV_COLORIZE_TITLE);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON
+		                              | PIDGIN_CONV_COLORIZE_TITLE
+		                              | PIDGIN_CONV_BUDDY_ICON);
 		if ((purple_status_is_online(old) ^ purple_status_is_online(newstatus)) != 0)
 			pidgin_conv_update_fields(conv, PIDGIN_CONV_MENU);
 	}
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index 5a5c2fab87..46317f60bd 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -212,6 +212,7 @@ static const struct translator current_translators[] = {
 	{N_("Serbian"),             "sr", "Miloš Popović", "gpopac@gmail.com"},
 	{N_("Serbian"),             "sr@Latn", "Miloš Popović", "gpopac@gmail.com"},
 	{N_("Sinhala"),             "si", "Danishka Navin", "snavin@redhat.com"},
+	{N_("Sinhala"),             "si", "Yajith Ajantha Dayarathna", "yajith@gmail.com"},
 	{N_("Swedish"),             "sv", "Peter Hjalmarsson", "xake@telia.com"},
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
 	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
diff --git a/pidgin/gtkdocklet-x11.c b/pidgin/gtkdocklet-x11.c
index 8b77f18696..06b832b2aa 100644
--- a/pidgin/gtkdocklet-x11.c
+++ b/pidgin/gtkdocklet-x11.c
@@ -82,7 +82,7 @@ docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
 static gboolean
 docklet_x11_clicked_cb(GtkWidget *button, GdkEventButton *event, void *data)
 {
-	if (event->type != GDK_BUTTON_RELEASE)
+	if (event->type != GDK_BUTTON_PRESS)
 		return FALSE;
 
 	pidgin_docklet_clicked(event->button);
@@ -263,7 +263,7 @@ docklet_x11_create(gboolean recreate)
 	g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL);
 	g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_x11_destroyed_cb), NULL);
 	g_signal_connect(G_OBJECT(docklet), "size-allocate", G_CALLBACK(docklet_x11_resize_icon), NULL);
-	g_signal_connect(G_OBJECT(box), "button-release-event", G_CALLBACK(docklet_x11_clicked_cb), NULL);
+	g_signal_connect(G_OBJECT(box), "button-press-event", G_CALLBACK(docklet_x11_clicked_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(box), image);
 	gtk_container_add(GTK_CONTAINER(docklet), box);
 
diff --git a/pidgin/gtksmiley.c b/pidgin/gtksmiley.c
index a39065a88c..b98086b2f0 100644
--- a/pidgin/gtksmiley.c
+++ b/pidgin/gtksmiley.c
@@ -692,7 +692,7 @@ void pidgin_smiley_manager_show(void)
 			NULL,
 			GTK_DIALOG_DESTROY_WITH_PARENT,
 			GTK_STOCK_ADD, GTK_RESPONSE_YES,
-			GTK_STOCK_EDIT, PIDGIN_RESPONSE_EDIT,
+			PIDGIN_STOCK_EDIT, PIDGIN_RESPONSE_EDIT,
 			GTK_STOCK_DELETE, GTK_RESPONSE_NO,
 			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 			NULL);
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
index 28b9534fcd..7710e8db0c 100644
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -162,7 +162,7 @@ static struct SizedStockIcon {
 	{ PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "toolbar", "insert-image.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_INSERT_LINK, "toolbar", "insert-link.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "toolbar", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
-	{ PIDGIN_STOCK_TOOLBAR_PENDING, "toolbar", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_PENDING, "tray", "tray-new-im.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_PLUGINS, "toolbar", "plugins.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index fde2eb0dac..468b2dc8e5 100644
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -125,6 +125,7 @@ EMOTES_DEFAULT_24_SCALABLE = \
 		emotes/default/24/scalable/car.svg \
 		emotes/default/24/scalable/cat.svg \
 		emotes/default/24/scalable/chicken.svg \
+		emotes/default/24/scalable/cigarette.svg \
 		emotes/default/24/scalable/clap.svg \
 		emotes/default/24/scalable/clock.svg \
 		emotes/default/24/scalable/cloudy.svg \
@@ -146,7 +147,7 @@ EMOTES_DEFAULT_24_SCALABLE = \
 		emotes/default/24/scalable/dazed.svg \
 		emotes/default/24/scalable/desire.svg \
 		emotes/default/24/scalable/devil.svg \
-		emotes/default/24/scalable/disapointed.svg \
+		emotes/default/24/scalable/disappointed.svg \
 		emotes/default/24/scalable/disdain.svg \
 		emotes/default/24/scalable/doctor.svg \
 		emotes/default/24/scalable/dog.svg \
@@ -246,7 +247,6 @@ EMOTES_DEFAULT_24_SCALABLE = \
 		emotes/default/24/scalable/shut-mouth.svg \
 		emotes/default/24/scalable/sick.svg \
 		emotes/default/24/scalable/sidefrown.svg \
-		emotes/default/24/scalable/sigarette.svg \
 		emotes/default/24/scalable/silly.svg \
 		emotes/default/24/scalable/sinister.svg \
 		emotes/default/24/scalable/skeleton.svg \
@@ -328,9 +328,6 @@ ICONS_16_SCALABLE = \
 
 ICONS_16 = icons/hicolor/16x16/apps/pidgin.png
 
-ICONS_22_SCALABLE = \
-		icons/hicolor/22x22/apps/scalable/pidgin.svg
-
 ICONS_22 = icons/hicolor/22x22/apps/pidgin.png
 
 ICONS_24_SCALABLE = \
diff --git a/pidgin/pixmaps/emotes/default/24/Makefile.am b/pidgin/pixmaps/emotes/default/24/Makefile.am
index 78f6147962..855b3715d7 100644
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am
@@ -25,6 +25,7 @@ SMILEYS = 	act-up.png \
     car.png \
     cat.png \
     chicken.png \
+    cigarette.png \
     clap.png \
     clock.png \
     cloudy.png \
@@ -46,7 +47,7 @@ SMILEYS = 	act-up.png \
     dazed.png \
     desire.png \
     devil.png \
-    disapointed.png \
+    disappointed.png \
     disdain.png \
     doctor.png \
     dog.png \
@@ -147,7 +148,6 @@ SMILEYS = 	act-up.png \
     shut-mouth.png \
     sick.png \
     sidefrown.png \
-    sigarette.png \
     silly.png \
     sinister.png \
     skeleton.png \
diff --git a/pidgin/pixmaps/emotes/default/24/act-up.png b/pidgin/pixmaps/emotes/default/24/act-up.png
index 573801323e..57ad0f813a 100644
--- a/pidgin/pixmaps/emotes/default/24/act-up.png
+++ b/pidgin/pixmaps/emotes/default/24/act-up.png
diff --git a/pidgin/pixmaps/emotes/default/24/alien.png b/pidgin/pixmaps/emotes/default/24/alien.png
index 6f0f9cfa31..316c8a1b48 100644
--- a/pidgin/pixmaps/emotes/default/24/alien.png
+++ b/pidgin/pixmaps/emotes/default/24/alien.png
diff --git a/pidgin/pixmaps/emotes/default/24/angel.png b/pidgin/pixmaps/emotes/default/24/angel.png
index 21424512a8..afab375938 100644
--- a/pidgin/pixmaps/emotes/default/24/angel.png
+++ b/pidgin/pixmaps/emotes/default/24/angel.png
diff --git a/pidgin/pixmaps/emotes/default/24/angry.png b/pidgin/pixmaps/emotes/default/24/angry.png
index d4cbd1503e..1370057c12 100644
--- a/pidgin/pixmaps/emotes/default/24/angry.png
+++ b/pidgin/pixmaps/emotes/default/24/angry.png
diff --git a/pidgin/pixmaps/emotes/default/24/arrogant.png b/pidgin/pixmaps/emotes/default/24/arrogant.png
index 71cefda886..c4febeed3e 100644
--- a/pidgin/pixmaps/emotes/default/24/arrogant.png
+++ b/pidgin/pixmaps/emotes/default/24/arrogant.png
diff --git a/pidgin/pixmaps/emotes/default/24/at-wits-end.png b/pidgin/pixmaps/emotes/default/24/at-wits-end.png
index e013d97af9..a653675abf 100644
--- a/pidgin/pixmaps/emotes/default/24/at-wits-end.png
+++ b/pidgin/pixmaps/emotes/default/24/at-wits-end.png
diff --git a/pidgin/pixmaps/emotes/default/24/bashful.png b/pidgin/pixmaps/emotes/default/24/bashful.png
index 91cbedc8bf..78c9eacc7c 100644
--- a/pidgin/pixmaps/emotes/default/24/bashful.png
+++ b/pidgin/pixmaps/emotes/default/24/bashful.png
diff --git a/pidgin/pixmaps/emotes/default/24/beat-up.png b/pidgin/pixmaps/emotes/default/24/beat-up.png
index 42fae7c3ae..b8b9b56b84 100644
--- a/pidgin/pixmaps/emotes/default/24/beat-up.png
+++ b/pidgin/pixmaps/emotes/default/24/beat-up.png
diff --git a/pidgin/pixmaps/emotes/default/24/beauty.png b/pidgin/pixmaps/emotes/default/24/beauty.png
index 3dab983592..c95201ed74 100644
--- a/pidgin/pixmaps/emotes/default/24/beauty.png
+++ b/pidgin/pixmaps/emotes/default/24/beauty.png
diff --git a/pidgin/pixmaps/emotes/default/24/blowkiss.png b/pidgin/pixmaps/emotes/default/24/blowkiss.png
index f31cec3afc..fd660e4ecb 100644
--- a/pidgin/pixmaps/emotes/default/24/blowkiss.png
+++ b/pidgin/pixmaps/emotes/default/24/blowkiss.png
diff --git a/pidgin/pixmaps/emotes/default/24/bulgy-eyes.png b/pidgin/pixmaps/emotes/default/24/bulgy-eyes.png
index 9ea3230e74..cee6e370dc 100644
--- a/pidgin/pixmaps/emotes/default/24/bulgy-eyes.png
+++ b/pidgin/pixmaps/emotes/default/24/bulgy-eyes.png
diff --git a/pidgin/pixmaps/emotes/default/24/bye.png b/pidgin/pixmaps/emotes/default/24/bye.png
index 9b9e4e893c..9f1ac88ddc 100644
--- a/pidgin/pixmaps/emotes/default/24/bye.png
+++ b/pidgin/pixmaps/emotes/default/24/bye.png
diff --git a/pidgin/pixmaps/emotes/default/24/call-me.png b/pidgin/pixmaps/emotes/default/24/call-me.png
index 83fe47b641..0c56064fbd 100644
--- a/pidgin/pixmaps/emotes/default/24/call-me.png
+++ b/pidgin/pixmaps/emotes/default/24/call-me.png
diff --git a/pidgin/pixmaps/emotes/default/24/cigarette.png b/pidgin/pixmaps/emotes/default/24/cigarette.png
new file mode 100644
index 0000000000..68cffedf09
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/cigarette.png
diff --git a/pidgin/pixmaps/emotes/default/24/clap.png b/pidgin/pixmaps/emotes/default/24/clap.png
index 1463d1ae50..13f297e6f6 100644
--- a/pidgin/pixmaps/emotes/default/24/clap.png
+++ b/pidgin/pixmaps/emotes/default/24/clap.png
diff --git a/pidgin/pixmaps/emotes/default/24/computer.png b/pidgin/pixmaps/emotes/default/24/computer.png
index c0a3f90a1f..1b11a09322 100644
--- a/pidgin/pixmaps/emotes/default/24/computer.png
+++ b/pidgin/pixmaps/emotes/default/24/computer.png
diff --git a/pidgin/pixmaps/emotes/default/24/confused.png b/pidgin/pixmaps/emotes/default/24/confused.png
index fb3f806b8f..798bfd19e4 100644
--- a/pidgin/pixmaps/emotes/default/24/confused.png
+++ b/pidgin/pixmaps/emotes/default/24/confused.png
diff --git a/pidgin/pixmaps/emotes/default/24/cowboy.png b/pidgin/pixmaps/emotes/default/24/cowboy.png
index 7eed2fdc02..7d1619653f 100644
--- a/pidgin/pixmaps/emotes/default/24/cowboy.png
+++ b/pidgin/pixmaps/emotes/default/24/cowboy.png
diff --git a/pidgin/pixmaps/emotes/default/24/crying.png b/pidgin/pixmaps/emotes/default/24/crying.png
index 7301ecddc7..e1eaaad7fb 100644
--- a/pidgin/pixmaps/emotes/default/24/crying.png
+++ b/pidgin/pixmaps/emotes/default/24/crying.png
diff --git a/pidgin/pixmaps/emotes/default/24/curl-lip.png b/pidgin/pixmaps/emotes/default/24/curl-lip.png
index c7c8af2a60..984f236682 100644
--- a/pidgin/pixmaps/emotes/default/24/curl-lip.png
+++ b/pidgin/pixmaps/emotes/default/24/curl-lip.png
diff --git a/pidgin/pixmaps/emotes/default/24/curse.png b/pidgin/pixmaps/emotes/default/24/curse.png
index bb1ee6c50c..380bce2c39 100644
--- a/pidgin/pixmaps/emotes/default/24/curse.png
+++ b/pidgin/pixmaps/emotes/default/24/curse.png
diff --git a/pidgin/pixmaps/emotes/default/24/cute.png b/pidgin/pixmaps/emotes/default/24/cute.png
index 0a69897ee8..32d808d38c 100644
--- a/pidgin/pixmaps/emotes/default/24/cute.png
+++ b/pidgin/pixmaps/emotes/default/24/cute.png
diff --git a/pidgin/pixmaps/emotes/default/24/cyclops.png b/pidgin/pixmaps/emotes/default/24/cyclops.png
index 91049325a2..16a940e175 100644
--- a/pidgin/pixmaps/emotes/default/24/cyclops.png
+++ b/pidgin/pixmaps/emotes/default/24/cyclops.png
diff --git a/pidgin/pixmaps/emotes/default/24/dance.png b/pidgin/pixmaps/emotes/default/24/dance.png
index 4608f0abcf..fdda7fba85 100644
--- a/pidgin/pixmaps/emotes/default/24/dance.png
+++ b/pidgin/pixmaps/emotes/default/24/dance.png
diff --git a/pidgin/pixmaps/emotes/default/24/default.theme.in b/pidgin/pixmaps/emotes/default/24/default.theme.in
index c9b4a52247..066df8fa6b 100644
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -3,6 +3,7 @@ _Description=Pidgin smileys
 Icon=wink.png
 Author=Hylke Bons
 
+
 # Default smileys
 [default]
 smile.png           :)      :-)
@@ -25,6 +26,7 @@ shout.png           >:o     >:O
 ! monkey.png        :-(|)  :(|)     8-|)
 ! cyclops.png       O-) o-)
 
+
 # Following AIM 6.1
 [AIM]
 smile.png           :-)     :)
@@ -129,7 +131,7 @@ bunny.png           ('.')
 ! monkey.png        :-(|)  :(|)
 
 # Hidden MSN emotes
-sigarette.png      	(ci)    (CI)
+cigarette.png      	(ci)    (CI)
 handcuffs.png       (%)
 console.png			(xx)    (XX)
 fingers-crossed.png	(yn)    (YN)
@@ -251,6 +253,8 @@ kissed.png          *KISSED*
 stop.png            *STOP*
 kiss.png            :-{} :-*
 kissing.png         *KISSING* 
+victory.png         *YAHOO*
+silly.png           %)
 embarrassed.png     :-[
 devil.png           ]:->
 angel.png           O:-)
@@ -363,28 +367,28 @@ yin-yang.png        (%)
 
 # Following MySpaceIM Beta 1.0.697.0
 [MySpaceIM]
-smile-big.png		    :D      :-D
-devil.png		        }:)
-confused.png		    :Z
-glasses-nerdy.png	  B)
-bulgy-eyes.png		  %)
-freaked-out.png		  :E
-smile.png		        :)      :-)
-in-love.png		      :X
-laugh.png		        :))
-mohawk.png		      -:
-mad-tongue.png		  X(
-messed.png		      X)
-glasses-nerdy.png	  Q)
-doh.png			        :G
-pirate.png		      P)
-shock.png		        :O
-sidefrown.png		    :{
-sinister.png		    :B
-smirk.png		        :,
-neutral.png		      :|
-tongue.png		      :P      :p
-pissed-off.png		  B|
-wink.png		        ;-)     ;)
-sad.png			        :[
+smile-big.png	    :D      :-D
+devil.png	    }:)
+confused.png	    :Z
+glasses-nerdy.png   B)
+bulgy-eyes.png	    %)
+freaked-out.png	    :E
+smile.png	    :)      :-)
+in-love.png	    :X
+laugh.png	    :))
+mohawk.png	    -:
+mad-tongue.png	    X(
+messed.png	    X)
+glasses-nerdy.png   Q)
+doh.png		    :G
+pirate.png	    P)
+shock.png	    :O
+sidefrown.png	    :{
+sinister.png	    :B
+smirk.png	    :,
+neutral.png	    :|
+tongue.png	    :P      :p
+pissed-off.png	    B|
+wink.png	    ;-)     ;)
+sad.png		    :[
 kiss.png            :x
diff --git a/pidgin/pixmaps/emotes/default/24/desire.png b/pidgin/pixmaps/emotes/default/24/desire.png
index 0c480b109d..af616ef290 100644
--- a/pidgin/pixmaps/emotes/default/24/desire.png
+++ b/pidgin/pixmaps/emotes/default/24/desire.png
diff --git a/pidgin/pixmaps/emotes/default/24/devil.png b/pidgin/pixmaps/emotes/default/24/devil.png
index 0263ad2dc3..e6582cd108 100644
--- a/pidgin/pixmaps/emotes/default/24/devil.png
+++ b/pidgin/pixmaps/emotes/default/24/devil.png
diff --git a/pidgin/pixmaps/emotes/default/24/disapointed.png b/pidgin/pixmaps/emotes/default/24/disapointed.png
deleted file mode 100644
index 6ce530fe8b..0000000000
--- a/pidgin/pixmaps/emotes/default/24/disapointed.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/default/24/disappointed.png b/pidgin/pixmaps/emotes/default/24/disappointed.png
new file mode 100644
index 0000000000..3a7ac4964d
--- /dev/null
+++ b/pidgin/pixmaps/emotes/default/24/disappointed.png
diff --git a/pidgin/pixmaps/emotes/default/24/disdain.png b/pidgin/pixmaps/emotes/default/24/disdain.png
index 1e5a1f110e..6b568819d1 100644
--- a/pidgin/pixmaps/emotes/default/24/disdain.png
+++ b/pidgin/pixmaps/emotes/default/24/disdain.png
diff --git a/pidgin/pixmaps/emotes/default/24/doctor.png b/pidgin/pixmaps/emotes/default/24/doctor.png
index 587d5388b5..19fd2ead3b 100644
--- a/pidgin/pixmaps/emotes/default/24/doctor.png
+++ b/pidgin/pixmaps/emotes/default/24/doctor.png
diff --git a/pidgin/pixmaps/emotes/default/24/doh.png b/pidgin/pixmaps/emotes/default/24/doh.png
index ddd90d0a67..c908108c0b 100644
--- a/pidgin/pixmaps/emotes/default/24/doh.png
+++ b/pidgin/pixmaps/emotes/default/24/doh.png
diff --git a/pidgin/pixmaps/emotes/default/24/dont-know.png b/pidgin/pixmaps/emotes/default/24/dont-know.png
index de2e7c08cb..2a83153660 100644
--- a/pidgin/pixmaps/emotes/default/24/dont-know.png
+++ b/pidgin/pixmaps/emotes/default/24/dont-know.png
diff --git a/pidgin/pixmaps/emotes/default/24/drool.png b/pidgin/pixmaps/emotes/default/24/drool.png
index 232744bd1d..1228689f7c 100644
--- a/pidgin/pixmaps/emotes/default/24/drool.png
+++ b/pidgin/pixmaps/emotes/default/24/drool.png
diff --git a/pidgin/pixmaps/emotes/default/24/eat.png b/pidgin/pixmaps/emotes/default/24/eat.png
index b4a8f8f616..ef25572518 100644
--- a/pidgin/pixmaps/emotes/default/24/eat.png
+++ b/pidgin/pixmaps/emotes/default/24/eat.png
diff --git a/pidgin/pixmaps/emotes/default/24/embarrassed.png b/pidgin/pixmaps/emotes/default/24/embarrassed.png
index 79b9da8263..b4fd22d30f 100644
--- a/pidgin/pixmaps/emotes/default/24/embarrassed.png
+++ b/pidgin/pixmaps/emotes/default/24/embarrassed.png
diff --git a/pidgin/pixmaps/emotes/default/24/excruciating.png b/pidgin/pixmaps/emotes/default/24/excruciating.png
index 63202ad679..704ce16948 100644
--- a/pidgin/pixmaps/emotes/default/24/excruciating.png
+++ b/pidgin/pixmaps/emotes/default/24/excruciating.png
diff --git a/pidgin/pixmaps/emotes/default/24/eyeroll.png b/pidgin/pixmaps/emotes/default/24/eyeroll.png
index 0a7965c667..0c2567160d 100644
--- a/pidgin/pixmaps/emotes/default/24/eyeroll.png
+++ b/pidgin/pixmaps/emotes/default/24/eyeroll.png
diff --git a/pidgin/pixmaps/emotes/default/24/female-fighter.png b/pidgin/pixmaps/emotes/default/24/female-fighter.png
index f34d643cc4..ebe2f75462 100644
--- a/pidgin/pixmaps/emotes/default/24/female-fighter.png
+++ b/pidgin/pixmaps/emotes/default/24/female-fighter.png
diff --git a/pidgin/pixmaps/emotes/default/24/fingers-crossed.png b/pidgin/pixmaps/emotes/default/24/fingers-crossed.png
index 88d4379638..449f17466e 100644
--- a/pidgin/pixmaps/emotes/default/24/fingers-crossed.png
+++ b/pidgin/pixmaps/emotes/default/24/fingers-crossed.png
diff --git a/pidgin/pixmaps/emotes/default/24/foot-in-mouth.png b/pidgin/pixmaps/emotes/default/24/foot-in-mouth.png
index 8ea6a114b0..4ae4f8355a 100644
--- a/pidgin/pixmaps/emotes/default/24/foot-in-mouth.png
+++ b/pidgin/pixmaps/emotes/default/24/foot-in-mouth.png
diff --git a/pidgin/pixmaps/emotes/default/24/freaked-out.png b/pidgin/pixmaps/emotes/default/24/freaked-out.png
index 231c05bb95..0015e20c87 100644
--- a/pidgin/pixmaps/emotes/default/24/freaked-out.png
+++ b/pidgin/pixmaps/emotes/default/24/freaked-out.png
diff --git a/pidgin/pixmaps/emotes/default/24/giggle.png b/pidgin/pixmaps/emotes/default/24/giggle.png
index 9527fd5f30..70040e8476 100644
--- a/pidgin/pixmaps/emotes/default/24/giggle.png
+++ b/pidgin/pixmaps/emotes/default/24/giggle.png
diff --git a/pidgin/pixmaps/emotes/default/24/glasses-cool.png b/pidgin/pixmaps/emotes/default/24/glasses-cool.png
index 0313d6f886..9d8c51261e 100644
--- a/pidgin/pixmaps/emotes/default/24/glasses-cool.png
+++ b/pidgin/pixmaps/emotes/default/24/glasses-cool.png
diff --git a/pidgin/pixmaps/emotes/default/24/glasses-nerdy.png b/pidgin/pixmaps/emotes/default/24/glasses-nerdy.png
index 63ddfb290d..edeee62d0b 100644
--- a/pidgin/pixmaps/emotes/default/24/glasses-nerdy.png
+++ b/pidgin/pixmaps/emotes/default/24/glasses-nerdy.png
diff --git a/pidgin/pixmaps/emotes/default/24/go-away.png b/pidgin/pixmaps/emotes/default/24/go-away.png
index 28279bd152..ef2f39905b 100644
--- a/pidgin/pixmaps/emotes/default/24/go-away.png
+++ b/pidgin/pixmaps/emotes/default/24/go-away.png
diff --git a/pidgin/pixmaps/emotes/default/24/handshake.png b/pidgin/pixmaps/emotes/default/24/handshake.png
index 32c2b91839..e041700ab9 100644
--- a/pidgin/pixmaps/emotes/default/24/handshake.png
+++ b/pidgin/pixmaps/emotes/default/24/handshake.png
diff --git a/pidgin/pixmaps/emotes/default/24/highfive.png b/pidgin/pixmaps/emotes/default/24/highfive.png
index a20524442e..30c2737605 100644
--- a/pidgin/pixmaps/emotes/default/24/highfive.png
+++ b/pidgin/pixmaps/emotes/default/24/highfive.png
diff --git a/pidgin/pixmaps/emotes/default/24/hug-left.png b/pidgin/pixmaps/emotes/default/24/hug-left.png
index c1ac173061..23bfb33820 100644
--- a/pidgin/pixmaps/emotes/default/24/hug-left.png
+++ b/pidgin/pixmaps/emotes/default/24/hug-left.png
diff --git a/pidgin/pixmaps/emotes/default/24/hug-right.png b/pidgin/pixmaps/emotes/default/24/hug-right.png
index 55179d87ba..4807f8c597 100644
--- a/pidgin/pixmaps/emotes/default/24/hug-right.png
+++ b/pidgin/pixmaps/emotes/default/24/hug-right.png
diff --git a/pidgin/pixmaps/emotes/default/24/hypnotized.png b/pidgin/pixmaps/emotes/default/24/hypnotized.png
index d962b90d23..0f73dfc73d 100644
--- a/pidgin/pixmaps/emotes/default/24/hypnotized.png
+++ b/pidgin/pixmaps/emotes/default/24/hypnotized.png
diff --git a/pidgin/pixmaps/emotes/default/24/in-love.png b/pidgin/pixmaps/emotes/default/24/in-love.png
index d565f94a5e..e3bf7059cf 100644
--- a/pidgin/pixmaps/emotes/default/24/in-love.png
+++ b/pidgin/pixmaps/emotes/default/24/in-love.png
diff --git a/pidgin/pixmaps/emotes/default/24/island.png b/pidgin/pixmaps/emotes/default/24/island.png
index a335e3f3c8..5e63e1dc35 100644
--- a/pidgin/pixmaps/emotes/default/24/island.png
+++ b/pidgin/pixmaps/emotes/default/24/island.png
diff --git a/pidgin/pixmaps/emotes/default/24/jump.png b/pidgin/pixmaps/emotes/default/24/jump.png
index 492ad84cf4..cb085a65f3 100644
--- a/pidgin/pixmaps/emotes/default/24/jump.png
+++ b/pidgin/pixmaps/emotes/default/24/jump.png
diff --git a/pidgin/pixmaps/emotes/default/24/kiss.png b/pidgin/pixmaps/emotes/default/24/kiss.png
index c8de944c4e..b1b199e9dd 100644
--- a/pidgin/pixmaps/emotes/default/24/kiss.png
+++ b/pidgin/pixmaps/emotes/default/24/kiss.png
diff --git a/pidgin/pixmaps/emotes/default/24/kissed.png b/pidgin/pixmaps/emotes/default/24/kissed.png
index 33baba9543..37db82700e 100644
--- a/pidgin/pixmaps/emotes/default/24/kissed.png
+++ b/pidgin/pixmaps/emotes/default/24/kissed.png
diff --git a/pidgin/pixmaps/emotes/default/24/kissing.png b/pidgin/pixmaps/emotes/default/24/kissing.png
index 1b0c6ad2f4..6e08bed22c 100644
--- a/pidgin/pixmaps/emotes/default/24/kissing.png
+++ b/pidgin/pixmaps/emotes/default/24/kissing.png
diff --git a/pidgin/pixmaps/emotes/default/24/lashes.png b/pidgin/pixmaps/emotes/default/24/lashes.png
index f303d7f56b..d31994b294 100644
--- a/pidgin/pixmaps/emotes/default/24/lashes.png
+++ b/pidgin/pixmaps/emotes/default/24/lashes.png
diff --git a/pidgin/pixmaps/emotes/default/24/laugh.png b/pidgin/pixmaps/emotes/default/24/laugh.png
index b9d1e940b1..d13b0d1766 100644
--- a/pidgin/pixmaps/emotes/default/24/laugh.png
+++ b/pidgin/pixmaps/emotes/default/24/laugh.png
diff --git a/pidgin/pixmaps/emotes/default/24/lying.png b/pidgin/pixmaps/emotes/default/24/lying.png
index 1705582358..44c41d8559 100644
--- a/pidgin/pixmaps/emotes/default/24/lying.png
+++ b/pidgin/pixmaps/emotes/default/24/lying.png
diff --git a/pidgin/pixmaps/emotes/default/24/mad-tongue.png b/pidgin/pixmaps/emotes/default/24/mad-tongue.png
index c260a71c1c..5a8972f048 100644
--- a/pidgin/pixmaps/emotes/default/24/mad-tongue.png
+++ b/pidgin/pixmaps/emotes/default/24/mad-tongue.png
diff --git a/pidgin/pixmaps/emotes/default/24/male-fighter2.png b/pidgin/pixmaps/emotes/default/24/male-fighter2.png
index 6da6cc3c6a..c78fd50e87 100644
--- a/pidgin/pixmaps/emotes/default/24/male-fighter2.png
+++ b/pidgin/pixmaps/emotes/default/24/male-fighter2.png
diff --git a/pidgin/pixmaps/emotes/default/24/mean.png b/pidgin/pixmaps/emotes/default/24/mean.png
index 4fc6c862d1..9b0391647e 100644
--- a/pidgin/pixmaps/emotes/default/24/mean.png
+++ b/pidgin/pixmaps/emotes/default/24/mean.png
diff --git a/pidgin/pixmaps/emotes/default/24/meeting.png b/pidgin/pixmaps/emotes/default/24/meeting.png
index d569dfe98a..6c77f5357e 100644
--- a/pidgin/pixmaps/emotes/default/24/meeting.png
+++ b/pidgin/pixmaps/emotes/default/24/meeting.png
diff --git a/pidgin/pixmaps/emotes/default/24/messed.png b/pidgin/pixmaps/emotes/default/24/messed.png
index 189aa53b52..b214a9a55e 100644
--- a/pidgin/pixmaps/emotes/default/24/messed.png
+++ b/pidgin/pixmaps/emotes/default/24/messed.png
diff --git a/pidgin/pixmaps/emotes/default/24/mohawk.png b/pidgin/pixmaps/emotes/default/24/mohawk.png
index 907fb3c80f..0dbfd81f7a 100644
--- a/pidgin/pixmaps/emotes/default/24/mohawk.png
+++ b/pidgin/pixmaps/emotes/default/24/mohawk.png
diff --git a/pidgin/pixmaps/emotes/default/24/moneymouth.png b/pidgin/pixmaps/emotes/default/24/moneymouth.png
index eb4a88777c..1b7a33284e 100644
--- a/pidgin/pixmaps/emotes/default/24/moneymouth.png
+++ b/pidgin/pixmaps/emotes/default/24/moneymouth.png
diff --git a/pidgin/pixmaps/emotes/default/24/music.png b/pidgin/pixmaps/emotes/default/24/music.png
index 98e1c13a8f..7e6bdc7da7 100644
--- a/pidgin/pixmaps/emotes/default/24/music.png
+++ b/pidgin/pixmaps/emotes/default/24/music.png
diff --git a/pidgin/pixmaps/emotes/default/24/nailbiting.png b/pidgin/pixmaps/emotes/default/24/nailbiting.png
index 5e7515a9d0..a386ffdacd 100644
--- a/pidgin/pixmaps/emotes/default/24/nailbiting.png
+++ b/pidgin/pixmaps/emotes/default/24/nailbiting.png
diff --git a/pidgin/pixmaps/emotes/default/24/neutral.png b/pidgin/pixmaps/emotes/default/24/neutral.png
index 54c1a520a7..328f10ab35 100644
--- a/pidgin/pixmaps/emotes/default/24/neutral.png
+++ b/pidgin/pixmaps/emotes/default/24/neutral.png
diff --git a/pidgin/pixmaps/emotes/default/24/on-the-phone.png b/pidgin/pixmaps/emotes/default/24/on-the-phone.png
index b30459bbac..acead1f73a 100644
--- a/pidgin/pixmaps/emotes/default/24/on-the-phone.png
+++ b/pidgin/pixmaps/emotes/default/24/on-the-phone.png
diff --git a/pidgin/pixmaps/emotes/default/24/party.png b/pidgin/pixmaps/emotes/default/24/party.png
index 573f23e5e0..b05079128a 100644
--- a/pidgin/pixmaps/emotes/default/24/party.png
+++ b/pidgin/pixmaps/emotes/default/24/party.png
diff --git a/pidgin/pixmaps/emotes/default/24/pirate.png b/pidgin/pixmaps/emotes/default/24/pirate.png
index bb40142e77..55b173b153 100644
--- a/pidgin/pixmaps/emotes/default/24/pirate.png
+++ b/pidgin/pixmaps/emotes/default/24/pirate.png
diff --git a/pidgin/pixmaps/emotes/default/24/pissed-off.png b/pidgin/pixmaps/emotes/default/24/pissed-off.png
index 163ca3f193..fb11948fba 100644
--- a/pidgin/pixmaps/emotes/default/24/pissed-off.png
+++ b/pidgin/pixmaps/emotes/default/24/pissed-off.png
diff --git a/pidgin/pixmaps/emotes/default/24/pray.png b/pidgin/pixmaps/emotes/default/24/pray.png
index 6cbc9bb52f..b1392179f6 100644
--- a/pidgin/pixmaps/emotes/default/24/pray.png
+++ b/pidgin/pixmaps/emotes/default/24/pray.png
diff --git a/pidgin/pixmaps/emotes/default/24/question.png b/pidgin/pixmaps/emotes/default/24/question.png
index a936b1220b..95ead89f04 100644
--- a/pidgin/pixmaps/emotes/default/24/question.png
+++ b/pidgin/pixmaps/emotes/default/24/question.png
diff --git a/pidgin/pixmaps/emotes/default/24/quiet.png b/pidgin/pixmaps/emotes/default/24/quiet.png
index 737b9164f1..f754bcb0fe 100644
--- a/pidgin/pixmaps/emotes/default/24/quiet.png
+++ b/pidgin/pixmaps/emotes/default/24/quiet.png
diff --git a/pidgin/pixmaps/emotes/default/24/rotfl.png b/pidgin/pixmaps/emotes/default/24/rotfl.png
index 7c15bc49ea..0e3e228959 100644
--- a/pidgin/pixmaps/emotes/default/24/rotfl.png
+++ b/pidgin/pixmaps/emotes/default/24/rotfl.png
diff --git a/pidgin/pixmaps/emotes/default/24/sad.png b/pidgin/pixmaps/emotes/default/24/sad.png
index 90624b96cf..e026d293d3 100644
--- a/pidgin/pixmaps/emotes/default/24/sad.png
+++ b/pidgin/pixmaps/emotes/default/24/sad.png
diff --git a/pidgin/pixmaps/emotes/default/24/sarcastic.png b/pidgin/pixmaps/emotes/default/24/sarcastic.png
index 4ad09202c3..f4f35e5469 100644
--- a/pidgin/pixmaps/emotes/default/24/sarcastic.png
+++ b/pidgin/pixmaps/emotes/default/24/sarcastic.png
diff --git a/pidgin/pixmaps/emotes/default/24/scalable/sigarette.svg b/pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
index f853366128..9e90526cbb 100644
--- a/pidgin/pixmaps/emotes/default/24/scalable/sigarette.svg
+++ b/pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
@@ -16,8 +16,8 @@
    inkscape:version="0.43"
    version="1.0"
    sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/emotes/scalable"
-   sodipodi:docname="sigarette.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emotes/sigarette.png"
+   sodipodi:docname="cigarette.svg"
+   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emotes/cigarette.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
diff --git a/pidgin/pixmaps/emotes/default/24/scalable/disapointed.svg b/pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
index f153ddb5bd..8246285ae2 100644
--- a/pidgin/pixmaps/emotes/default/24/scalable/disapointed.svg
+++ b/pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
@@ -16,8 +16,8 @@
    inkscape:version="0.45.1"
    version="1.0"
    sodipodi:docbase="/home/hbons/Desktop/untitled folder 1"
-   sodipodi:docname="new-style-dissapointed.svg"
-   inkscape:export-filename="/home/hbons/Desktop/newstyle.png"
+   sodipodi:docname="disappointed.svg"
+   inkscape:export-filename="/home/hbons/Desktop/disappointed.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
diff --git a/pidgin/pixmaps/emotes/default/24/secret.png b/pidgin/pixmaps/emotes/default/24/secret.png
index bf0b120e46..d3dc43da51 100644
--- a/pidgin/pixmaps/emotes/default/24/secret.png
+++ b/pidgin/pixmaps/emotes/default/24/secret.png
diff --git a/pidgin/pixmaps/emotes/default/24/shame.png b/pidgin/pixmaps/emotes/default/24/shame.png
index 2692b56fcb..65ff46f558 100644
--- a/pidgin/pixmaps/emotes/default/24/shame.png
+++ b/pidgin/pixmaps/emotes/default/24/shame.png
diff --git a/pidgin/pixmaps/emotes/default/24/shock.png b/pidgin/pixmaps/emotes/default/24/shock.png
index 332ce37d95..6c0fc3a7d3 100644
--- a/pidgin/pixmaps/emotes/default/24/shock.png
+++ b/pidgin/pixmaps/emotes/default/24/shock.png
diff --git a/pidgin/pixmaps/emotes/default/24/shut-mouth.png b/pidgin/pixmaps/emotes/default/24/shut-mouth.png
index 4222c44a9a..1f205163df 100644
--- a/pidgin/pixmaps/emotes/default/24/shut-mouth.png
+++ b/pidgin/pixmaps/emotes/default/24/shut-mouth.png
diff --git a/pidgin/pixmaps/emotes/default/24/sick.png b/pidgin/pixmaps/emotes/default/24/sick.png
index 14111f9dae..d1f528ee05 100644
--- a/pidgin/pixmaps/emotes/default/24/sick.png
+++ b/pidgin/pixmaps/emotes/default/24/sick.png
diff --git a/pidgin/pixmaps/emotes/default/24/sidefrown.png b/pidgin/pixmaps/emotes/default/24/sidefrown.png
index f8c3f4cec4..06fa0c3b29 100644
--- a/pidgin/pixmaps/emotes/default/24/sidefrown.png
+++ b/pidgin/pixmaps/emotes/default/24/sidefrown.png
diff --git a/pidgin/pixmaps/emotes/default/24/sigarette.png b/pidgin/pixmaps/emotes/default/24/sigarette.png
deleted file mode 100644
index 1e0b15c845..0000000000
--- a/pidgin/pixmaps/emotes/default/24/sigarette.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/default/24/silly.png b/pidgin/pixmaps/emotes/default/24/silly.png
index 851631ce66..fc83bb5e8a 100644
--- a/pidgin/pixmaps/emotes/default/24/silly.png
+++ b/pidgin/pixmaps/emotes/default/24/silly.png
diff --git a/pidgin/pixmaps/emotes/default/24/sinister.png b/pidgin/pixmaps/emotes/default/24/sinister.png
index e9f72f243c..75e403ef0a 100644
--- a/pidgin/pixmaps/emotes/default/24/sinister.png
+++ b/pidgin/pixmaps/emotes/default/24/sinister.png
diff --git a/pidgin/pixmaps/emotes/default/24/skywalker.png b/pidgin/pixmaps/emotes/default/24/skywalker.png
index 15020c3015..ea9806701c 100644
--- a/pidgin/pixmaps/emotes/default/24/skywalker.png
+++ b/pidgin/pixmaps/emotes/default/24/skywalker.png
diff --git a/pidgin/pixmaps/emotes/default/24/sleepy.png b/pidgin/pixmaps/emotes/default/24/sleepy.png
index fb001206b8..b20aa8770f 100644
--- a/pidgin/pixmaps/emotes/default/24/sleepy.png
+++ b/pidgin/pixmaps/emotes/default/24/sleepy.png
diff --git a/pidgin/pixmaps/emotes/default/24/smile-big.png b/pidgin/pixmaps/emotes/default/24/smile-big.png
index 109612f318..a7b1810a21 100644
--- a/pidgin/pixmaps/emotes/default/24/smile-big.png
+++ b/pidgin/pixmaps/emotes/default/24/smile-big.png
diff --git a/pidgin/pixmaps/emotes/default/24/smile.png b/pidgin/pixmaps/emotes/default/24/smile.png
index ea7c975b35..ccd1434d9f 100644
--- a/pidgin/pixmaps/emotes/default/24/smile.png
+++ b/pidgin/pixmaps/emotes/default/24/smile.png
diff --git a/pidgin/pixmaps/emotes/default/24/smirk.png b/pidgin/pixmaps/emotes/default/24/smirk.png
index eef583f85d..853b7d575d 100644
--- a/pidgin/pixmaps/emotes/default/24/smirk.png
+++ b/pidgin/pixmaps/emotes/default/24/smirk.png
diff --git a/pidgin/pixmaps/emotes/default/24/snail.png b/pidgin/pixmaps/emotes/default/24/snail.png
index c2e97c8e71..2e8ac91bab 100644
--- a/pidgin/pixmaps/emotes/default/24/snail.png
+++ b/pidgin/pixmaps/emotes/default/24/snail.png
diff --git a/pidgin/pixmaps/emotes/default/24/soldier.png b/pidgin/pixmaps/emotes/default/24/soldier.png
index 0a88444db3..e2fba58697 100644
--- a/pidgin/pixmaps/emotes/default/24/soldier.png
+++ b/pidgin/pixmaps/emotes/default/24/soldier.png
diff --git a/pidgin/pixmaps/emotes/default/24/starving.png b/pidgin/pixmaps/emotes/default/24/starving.png
index ec233efdf7..afc2c1b2ee 100644
--- a/pidgin/pixmaps/emotes/default/24/starving.png
+++ b/pidgin/pixmaps/emotes/default/24/starving.png
diff --git a/pidgin/pixmaps/emotes/default/24/stop.png b/pidgin/pixmaps/emotes/default/24/stop.png
index b25ad04de1..526e26c597 100644
--- a/pidgin/pixmaps/emotes/default/24/stop.png
+++ b/pidgin/pixmaps/emotes/default/24/stop.png
diff --git a/pidgin/pixmaps/emotes/default/24/struggle.png b/pidgin/pixmaps/emotes/default/24/struggle.png
index 2a26aa295a..fe077aeac9 100644
--- a/pidgin/pixmaps/emotes/default/24/struggle.png
+++ b/pidgin/pixmaps/emotes/default/24/struggle.png
diff --git a/pidgin/pixmaps/emotes/default/24/sweat.png b/pidgin/pixmaps/emotes/default/24/sweat.png
index 1d4f55c3f0..0625808c4b 100644
--- a/pidgin/pixmaps/emotes/default/24/sweat.png
+++ b/pidgin/pixmaps/emotes/default/24/sweat.png
diff --git a/pidgin/pixmaps/emotes/default/24/talktohand.png b/pidgin/pixmaps/emotes/default/24/talktohand.png
index 0d0455fefd..48c1b7755e 100644
--- a/pidgin/pixmaps/emotes/default/24/talktohand.png
+++ b/pidgin/pixmaps/emotes/default/24/talktohand.png
diff --git a/pidgin/pixmaps/emotes/default/24/terror.png b/pidgin/pixmaps/emotes/default/24/terror.png
index 351dacc0ae..24b4cc690e 100644
--- a/pidgin/pixmaps/emotes/default/24/terror.png
+++ b/pidgin/pixmaps/emotes/default/24/terror.png
diff --git a/pidgin/pixmaps/emotes/default/24/thinking.png b/pidgin/pixmaps/emotes/default/24/thinking.png
index deca319d4d..908f3b8379 100644
--- a/pidgin/pixmaps/emotes/default/24/thinking.png
+++ b/pidgin/pixmaps/emotes/default/24/thinking.png
diff --git a/pidgin/pixmaps/emotes/default/24/time-out.png b/pidgin/pixmaps/emotes/default/24/time-out.png
index 1090b3077f..7d7d7aeeda 100644
--- a/pidgin/pixmaps/emotes/default/24/time-out.png
+++ b/pidgin/pixmaps/emotes/default/24/time-out.png
diff --git a/pidgin/pixmaps/emotes/default/24/tongue.png b/pidgin/pixmaps/emotes/default/24/tongue.png
index 5d67a4c771..4819e783a1 100644
--- a/pidgin/pixmaps/emotes/default/24/tongue.png
+++ b/pidgin/pixmaps/emotes/default/24/tongue.png
diff --git a/pidgin/pixmaps/emotes/default/24/tremble.png b/pidgin/pixmaps/emotes/default/24/tremble.png
index e3ad5ffbc9..4cd7829cf1 100644
--- a/pidgin/pixmaps/emotes/default/24/tremble.png
+++ b/pidgin/pixmaps/emotes/default/24/tremble.png
diff --git a/pidgin/pixmaps/emotes/default/24/vampire.png b/pidgin/pixmaps/emotes/default/24/vampire.png
index cab3a0b73b..848f527ae3 100644
--- a/pidgin/pixmaps/emotes/default/24/vampire.png
+++ b/pidgin/pixmaps/emotes/default/24/vampire.png
diff --git a/pidgin/pixmaps/emotes/default/24/victory.png b/pidgin/pixmaps/emotes/default/24/victory.png
index 8205c6f673..85d09cf876 100644
--- a/pidgin/pixmaps/emotes/default/24/victory.png
+++ b/pidgin/pixmaps/emotes/default/24/victory.png
diff --git a/pidgin/pixmaps/emotes/default/24/waiting.png b/pidgin/pixmaps/emotes/default/24/waiting.png
index bc1fe57cd1..e33daeef1e 100644
--- a/pidgin/pixmaps/emotes/default/24/waiting.png
+++ b/pidgin/pixmaps/emotes/default/24/waiting.png
diff --git a/pidgin/pixmaps/emotes/default/24/waving.png b/pidgin/pixmaps/emotes/default/24/waving.png
index 66befc047b..9175cf6f76 100644
--- a/pidgin/pixmaps/emotes/default/24/waving.png
+++ b/pidgin/pixmaps/emotes/default/24/waving.png
diff --git a/pidgin/pixmaps/emotes/default/24/weep.png b/pidgin/pixmaps/emotes/default/24/weep.png
index 4000f110d3..4c91fafa7b 100644
--- a/pidgin/pixmaps/emotes/default/24/weep.png
+++ b/pidgin/pixmaps/emotes/default/24/weep.png
diff --git a/pidgin/pixmaps/emotes/default/24/wilt.png b/pidgin/pixmaps/emotes/default/24/wilt.png
index 9e87688b82..3f5146bf74 100644
--- a/pidgin/pixmaps/emotes/default/24/wilt.png
+++ b/pidgin/pixmaps/emotes/default/24/wilt.png
diff --git a/pidgin/pixmaps/emotes/default/24/wink.png b/pidgin/pixmaps/emotes/default/24/wink.png
index 2eba489391..227145d8c3 100644
--- a/pidgin/pixmaps/emotes/default/24/wink.png
+++ b/pidgin/pixmaps/emotes/default/24/wink.png
diff --git a/pidgin/pixmaps/emotes/default/24/worship.png b/pidgin/pixmaps/emotes/default/24/worship.png
index 1dc4f1e841..1193ed74d8 100644
--- a/pidgin/pixmaps/emotes/default/24/worship.png
+++ b/pidgin/pixmaps/emotes/default/24/worship.png
diff --git a/pidgin/pixmaps/emotes/default/24/yawn.png b/pidgin/pixmaps/emotes/default/24/yawn.png
index 3c63d12de5..cd669618a9 100644
--- a/pidgin/pixmaps/emotes/default/24/yawn.png
+++ b/pidgin/pixmaps/emotes/default/24/yawn.png
diff --git a/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
index 742f3c2c3a..1ea5fca89e 100644
--- a/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
index 1043821fec..0a40627167 100644
--- a/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -13,62 +13,118 @@
    height="16"
    id="svg4345"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/icons/16/scalable"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/hbons/Desktop/Pidgin/2.1.0/icons/24/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Desktop/pidgin16.png"
+   inkscape:export-filename="/home/hbons/Bureaublad/pidgin16-4.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   version="1.0">
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4347">
     <linearGradient
+       id="linearGradient8739"
+       inkscape:collect="always">
+      <stop
+         id="stop8741"
+         offset="0"
+         style="stop-color:#602869;stop-opacity:1" />
+      <stop
+         id="stop8743"
+         offset="1"
+         style="stop-color:#3b1941;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       id="linearGradient3157">
+       id="linearGradient8780">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#3b1941;stop-opacity:1;"
          offset="0"
-         id="stop3159" />
+         id="stop8782" />
       <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
+         style="stop-color:#3b1941;stop-opacity:0;"
          offset="1"
-         id="stop3161" />
+         id="stop8784" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3149">
+       id="linearGradient8760">
       <stop
          style="stop-color:#3b1941;stop-opacity:1;"
          offset="0"
-         id="stop3151" />
+         id="stop8762" />
       <stop
          style="stop-color:#3b1941;stop-opacity:0;"
          offset="1"
-         id="stop3153" />
+         id="stop8764" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8989"
+       inkscape:collect="always">
+      <stop
+         id="stop8991"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop8993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3141">
+       id="linearGradient8776">
       <stop
-         style="stop-color:#82508e;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.82412058"
          offset="0"
-         id="stop3143" />
+         id="stop8778" />
       <stop
-         style="stop-color:#82508e;stop-opacity:0;"
+         style="stop-color:#ffffff;stop-opacity:0"
          offset="1"
-         id="stop3145" />
+         id="stop8780" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3128">
+       id="linearGradient8720">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#fdc26a;stop-opacity:1"
          offset="0"
-         id="stop3130" />
+         id="stop8722" />
       <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
+         style="stop-color:#f57900;stop-opacity:1"
+         offset="1"
+         id="stop8724" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       id="perspective97" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3124">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop3126" />
+      <stop
+         style="stop-color:#3b1941;stop-opacity:0;"
+         offset="1"
+         id="stop3128" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3116">
+      <stop
+         style="stop-color:#894599;stop-opacity:1"
+         offset="0"
+         id="stop3118" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0"
          offset="1"
-         id="stop3132" />
+         id="stop3120" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -119,18 +175,6 @@
          id="stop6510" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5280">
-      <stop
-         style="stop-color:#82508e;stop-opacity:1;"
-         offset="0"
-         id="stop5282" />
-      <stop
-         style="stop-color:#82508e;stop-opacity:0;"
-         offset="1"
-         id="stop5284" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient2804">
       <stop
          style="stop-color:black;stop-opacity:0;"
@@ -201,26 +245,16 @@
          offset="1.0000000"
          id="stop3804" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5280"
-       id="radialGradient5286"
-       cx="15.004828"
-       cy="39.80859"
-       fx="15.004828"
-       fy="39.80859"
-       r="9.7225161"
-       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6537"
-       id="linearGradient6543"
-       x1="30.5"
-       y1="0.033532728"
-       x2="30.5"
-       y2="23.559282"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient8989"
+       id="linearGradient6512"
+       x1="15.242517"
+       y1="38.066795"
+       x2="15.242517"
+       y2="42.163002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.474981,0,0,0.4591462,0.5705609,-3.9567446)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6817"
@@ -229,8 +263,7 @@
        y1="38.950283"
        x2="5.7089725"
        y2="42.982571"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.63556,0,0,0.371995,11.16667,-5.489292)" />
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5438"
@@ -241,186 +274,40 @@
        y2="23.011967"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#3b1941;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#3b1941;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3968">
-      <stop
-         style="stop-color:#82508e;stop-opacity:1;"
-         offset="0"
-         id="stop3970" />
-      <stop
-         style="stop-color:#82508e;stop-opacity:0;"
-         offset="1"
-         id="stop3972" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3958">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3960" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop3962" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2850">
-      <stop
-         style="stop-color:#ce5c00;stop-opacity:1;"
-         offset="0"
-         id="stop2852" />
-      <stop
-         style="stop-color:#ce5c00;stop-opacity:0;"
-         offset="1"
-         id="stop2854" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6563">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop6565" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop6567" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2110">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop2112" />
-      <stop
-         id="stop2114"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop2067" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient25546"
-       id="radialGradient2069"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
-       cx="7.8836637"
-       cy="1.5104795"
-       fx="7.8836637"
-       fy="1.5104795"
-       r="8.4883642" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient25546"
-       id="radialGradient2071"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
-       cx="7.8836741"
-       cy="0.14505707"
-       fx="7.8836741"
-       fy="0.14505707"
-       r="8.4883642" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient25546"
-       id="radialGradient2079"
-       cx="7.8836637"
-       cy="2.6242435"
-       fx="7.8836637"
-       fy="2.6242435"
-       r="8.4883642"
-       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2081">
-      <stop
-         style="stop-color:#f4d9b1;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2104" />
-      <stop
-         style="stop-color:#df9725;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2085" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6506"
-       id="linearGradient2101"
-       x1="15.645709"
-       y1="39.743458"
-       x2="14.943421"
-       y2="50.079575"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6537"
-       id="linearGradient2089"
-       x1="30.5"
-       y1="0.033532728"
-       x2="30.5"
-       y2="23.559282"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6563"
-       id="linearGradient6569"
-       x1="-1.6841649"
-       y1="39.902092"
-       x2="5.5366187"
        y2="44.272076"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="23.011967"
-       x2="30.152058"
-       y1="-0.86487341"
-       x1="30.152058"
-       id="linearGradient2097"
-       xlink:href="#linearGradient5438"
+       x2="5.5366187"
+       y1="39.902092"
+       x1="-1.6841649"
+       id="linearGradient6569"
+       xlink:href="#linearGradient6563"
        inkscape:collect="always" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       y2="42.982571"
-       x2="5.7089725"
-       y1="38.950283"
-       x1="0.23931108"
-       id="linearGradient2095"
-       xlink:href="#linearGradient6817"
+       y2="23.559282"
+       x2="30.5"
+       y1="0.033532728"
+       x1="30.5"
+       id="linearGradient2089"
+       xlink:href="#linearGradient6537"
        inkscape:collect="always" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       y2="50.726673"
-       x2="15.645709"
-       y1="40.434063"
+       y2="50.079575"
+       x2="14.943421"
+       y1="39.743458"
        x1="15.645709"
-       id="linearGradient2093"
+       id="linearGradient2087"
        xlink:href="#linearGradient6506"
        inkscape:collect="always" />
     <linearGradient
-       id="linearGradient2087">
+       id="linearGradient2081">
       <stop
-         id="stop2089"
+         id="stop2083"
          offset="0.0000000"
          style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
       <stop
-         id="stop2091"
+         id="stop2085"
          offset="1.0000000"
          style="stop-color:#df9725;stop-opacity:1.0000000;" />
     </linearGradient>
@@ -432,7 +319,7 @@
        fx="7.8836637"
        cy="2.6242435"
        cx="7.8836637"
-       id="radialGradient2085"
+       id="radialGradient2079"
        xlink:href="#linearGradient25546"
        inkscape:collect="always" />
     <radialGradient
@@ -443,7 +330,7 @@
        cx="7.8836741"
        gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient2077"
+       id="radialGradient2071"
        xlink:href="#linearGradient25546"
        inkscape:collect="always" />
     <radialGradient
@@ -454,76 +341,90 @@
        cx="7.8836637"
        gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient2075"
+       id="radialGradient2069"
        xlink:href="#linearGradient25546"
        inkscape:collect="always" />
     <linearGradient
-       id="linearGradient2067">
+       id="linearGradient2061">
       <stop
-         id="stop2069"
+         id="stop2063"
          offset="0"
          style="stop-color:black;stop-opacity:0;" />
       <stop
          style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         id="stop2071" />
+         id="stop2065" />
       <stop
-         id="stop2073"
+         id="stop2067"
          offset="1"
          style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3108"
+       id="linearGradient6563"
+       inkscape:collect="always">
+      <stop
+         id="stop6565"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2850"
+       inkscape:collect="always">
+      <stop
+         id="stop2852"
+         offset="0"
+         style="stop-color:#ce5c00;stop-opacity:1;" />
+      <stop
+         id="stop2854"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3958"
        inkscape:collect="always">
       <stop
-         id="stop3110"
+         id="stop3960"
          offset="0"
          style="stop-color:#eeeeec;stop-opacity:1;" />
       <stop
-         id="stop3112"
+         id="stop3962"
          offset="1"
          style="stop-color:#eeeeec;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3116"
+       id="linearGradient3968"
        inkscape:collect="always">
       <stop
-         id="stop3118"
+         id="stop3970"
          offset="0"
          style="stop-color:#82508e;stop-opacity:1;" />
       <stop
-         id="stop3120"
+         id="stop3972"
          offset="1"
          style="stop-color:#82508e;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3124"
+       id="linearGradient3976"
        inkscape:collect="always">
       <stop
-         id="stop3126"
+         id="stop3978"
          offset="0"
          style="stop-color:#3b1941;stop-opacity:1;" />
       <stop
-         id="stop3128"
+         id="stop3980"
          offset="1"
          style="stop-color:#3b1941;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2850"
-       id="linearGradient2187"
+       id="linearGradient2149"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.769231,0,0,0.714287,47.76924,-9.285729)"
-       x1="21.785719"
-       y1="28.142857"
-       x2="17.785713"
-       y2="30.07143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2850"
-       id="linearGradient2195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.769231,0,0,0.714287,13.76923,-8.28573)"
+       gradientTransform="matrix(0.769231,0,0,0.714287,-34.23081,-12.28573)"
        x1="21.785719"
        y1="28.142857"
        x2="17.785713"
@@ -531,9 +432,9 @@
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3958"
-       id="radialGradient2209"
+       id="radialGradient2191"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.116159,0,0,1.076653,14.60502,-22.28695)"
+       gradientTransform="matrix(1.116159,0,0,1.076653,-36.39499,-20.28695)"
        cx="9.0640488"
        cy="21.511742"
        fx="9.0640488"
@@ -542,119 +443,205 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6506"
-       id="linearGradient2211"
+       id="linearGradient2193"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.660903,0,0,0.627207,18.73149,-12.3201)"
        x1="15.645709"
        y1="39.743458"
        x2="15.645709"
-       y2="53.502155" />
+       y2="53.502155"
+       gradientTransform="matrix(0.660903,0,0,0.627207,-32.26852,-10.3201)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3968"
-       id="linearGradient2214"
+       id="linearGradient2196"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.67692,0,0,0.646801,18.46433,-12.90841)"
        x1="16.13257"
        y1="40.781811"
        x2="16.13257"
-       y2="48.068741" />
+       y2="48.068741"
+       gradientTransform="matrix(0.67692,0,0,0.646801,-32.53568,-10.90841)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3976"
-       id="linearGradient2216"
+       id="linearGradient2198"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.67692,0,0,0.646801,18.46433,-12.90841)"
        x1="12.095973"
        y1="40.907658"
        x2="12.095973"
-       y2="46.463146" />
+       y2="46.463146"
+       gradientTransform="matrix(0.67692,0,0,0.646801,-32.53568,-10.90841)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6537"
-       id="linearGradient2219"
+       id="linearGradient2201"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.668893,0,0,0.668627,18.08624,-12.19246)"
        x1="30.5"
        y1="0.033532728"
        x2="30.5"
-       y2="23.559282" />
+       y2="23.559282"
+       gradientTransform="matrix(0.668893,0,0,0.668627,-32.91377,-10.19246)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3108"
-       id="linearGradient2229"
+       xlink:href="#linearGradient3124"
+       id="linearGradient3130"
+       x1="12.561858"
+       y1="39.998802"
+       x2="12.561858"
+       y2="42.352577"
        gradientUnits="userSpaceOnUse"
-       x1="10.18327"
-       y1="16.618088"
-       x2="27.598003"
-       y2="36.64465"
-       gradientTransform="matrix(0.660903,0,0,0.627207,49.74106,-7.361383)" />
+       gradientTransform="matrix(0.5069392,0,0,0.4907885,-2.0817467e-2,-4.88025)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6506"
-       id="linearGradient2231"
+       xlink:href="#linearGradient5438"
+       id="linearGradient2848"
        gradientUnits="userSpaceOnUse"
-       x1="15.645709"
-       y1="39.743458"
-       x2="15.645709"
-       y2="53.502155"
-       gradientTransform="matrix(0.660903,0,0,0.627207,49.74106,-7.361383)" />
+       x1="30.152058"
+       y1="-0.86487341"
+       x2="30.152058"
+       y2="23.011967" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3116"
-       id="linearGradient2234"
+       xlink:href="#linearGradient8720"
+       id="linearGradient8726"
+       x1="12.806054"
+       y1="16.65247"
+       x2="13.166923"
+       y2="16.608501"
        gradientUnits="userSpaceOnUse"
-       x1="15.722902"
-       y1="39.585075"
-       x2="15.722902"
-       y2="45.76453"
-       gradientTransform="matrix(0.67692,0,0,0.646801,49.4739,-7.949693)" />
+       gradientTransform="matrix(0.8035512,0,0,0.6654138,-0.6991237,0.3717176)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3124"
-       id="linearGradient2236"
+       xlink:href="#linearGradient3116"
+       id="linearGradient8774"
+       x1="10.624538"
+       y1="19.264456"
+       x2="10.624538"
+       y2="23.165424"
        gradientUnits="userSpaceOnUse"
-       x1="13.150809"
-       y1="39.39394"
-       x2="13.150809"
-       y2="45.551888"
-       gradientTransform="matrix(0.67692,0,0,0.646801,49.4739,-7.949693)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3128"
-       id="linearGradient3134"
-       x1="8.0725698"
-       y1="17.765934"
-       x2="24.284664"
-       y2="37.578945"
+       gradientTransform="matrix(0.7506322,0,0,0.7602819,0.3614067,-1.1609868)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8776"
+       id="radialGradient8782"
+       cx="11.539145"
+       cy="11.774944"
+       fx="11.539145"
+       fy="11.774944"
+       r="9.5"
+       gradientTransform="matrix(1.1492907,-3.5818508e-2,2.1662967e-2,0.7172256,-4.3193915,-6.011096e-2)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter9040"
+       x="-0.095484518"
+       width="1.190969"
+       y="-0.32181817"
+       height="1.6436363">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.22627841"
+         id="feGaussianBlur9042" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter8756"
+       x="-0.067594799"
+       width="1.1351896"
+       y="-0.12311285"
+       height="1.2462257">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.25007298"
+         id="feGaussianBlur8758" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8760"
+       id="linearGradient8766"
+       x1="10.025534"
+       y1="24.3125"
+       x2="12.26086"
+       y2="24.3125"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3141"
-       id="linearGradient3147"
-       x1="12.353984"
-       y1="38.611191"
-       x2="12.353984"
-       y2="45.595356"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient8780"
+       id="linearGradient8793"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7398844,0,0,2.4505335,-1.2572255,-0.5721084)"
+       x1="7.8234863"
+       y1="2.0748255"
+       x2="2.3125"
+       y2="-0.76288843" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3149"
-       id="linearGradient3155"
-       x1="10.166225"
-       y1="38.766953"
-       x2="10.166225"
-       y2="45.595673"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient8780"
+       id="linearGradient8797"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7398844,0,0,2.4505335,-1.2572255,-0.5721084)"
+       x1="7.8234863"
+       y1="2.0748255"
+       x2="2.3125"
+       y2="-0.76288843" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3157"
-       id="linearGradient3163"
-       x1="11.982447"
-       y1="39.088425"
-       x2="11.982447"
-       y2="45.778931"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient8780"
+       id="linearGradient8800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7398844,0,0,2.4505335,-1.2572255,-0.5721084)"
+       x1="7.8234863"
+       y1="2.0748255"
+       x2="2.3125"
+       y2="-0.76288843" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8780"
+       id="linearGradient8803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7398844,0,0,2.4505335,-1.2572255,-0.5721084)"
+       x1="7.8234863"
+       y1="2.0748255"
+       x2="2.3125"
+       y2="-0.76288843" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8780"
+       id="linearGradient8806"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7398844,0,0,2.4505335,-1.2572255,-0.5721084)"
+       x1="7.8234863"
+       y1="2.0748255"
+       x2="2.3125"
+       y2="-0.76288843" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8780"
+       id="linearGradient8809"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7398844,0,0,2.4505335,-1.2572255,-0.5721084)"
+       x1="7.8234863"
+       y1="2.0748255"
+       x2="2.3125"
+       y2="-0.76288843" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8739"
+       id="linearGradient8816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2058295,0,0,3.3872105,-0.5868595,-0.5305442)"
+       x1="6.6287227"
+       y1="0.48644698"
+       x2="0.44665223"
+       y2="1.4697748" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8760"
+       id="linearGradient8735"
+       gradientUnits="userSpaceOnUse"
+       x1="9.778717"
+       y1="24.3125"
+       x2="12.178589"
+       y2="24.3125" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -663,23 +650,33 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="30.009658"
-     inkscape:cx="15.476031"
-     inkscape:cy="9.174961"
+     inkscape:zoom="32"
+     inkscape:cx="17.336548"
+     inkscape:cy="7.0248271"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1434"
-     inkscape:window-height="840"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
      inkscape:window-x="0"
      inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:grid-points="false"
-     width="16px"
-     height="16px"
-     inkscape:object-bbox="true" />
+     width="24px"
+     height="24px"
+     inkscape:object-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7936"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4350">
     <rdf:RDF>
@@ -696,89 +693,75 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:1;fill:#75507b;fill-opacity:1"
-       d="M 36.0625,8 C 33.978257,8 33.334928,10.523086 34.78125,12.9375 C 35.250389,13.720651 36.674297,15.15311 36.86722,15.15311 L 36.878267,14.508325 C 36.288194,13.580567 35.517363,12.502064 35.686987,12.281543 C 37.835781,12.281543 38,11.491782 38,10.027674 C 38,8.7542399 37.228501,8 36.0625,8 z "
-       id="path6521"
-       transform="matrix(1.148904,0,0,0.920169,-34.28919,-3.241212)"
-       sodipodi:nodetypes="csccccc" />
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:url(#linearGradient8816);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 7.9293116,5.0795231 C 8.4000613,4.9623562 8.4835059,4.5003986 8.6165851,4.1601444 C 8.8703534,3.4900386 8.9850242,3.2527412 8.8138379,2.5709314 C 8.2219508,0.45209022 2.1611419,-0.88447008 1.4517269,2.9807965"
+       id="path8814"
+       sodipodi:nodetypes="cscc" />
     <path
-       style="opacity:1;fill:url(#linearGradient3147);fill-opacity:1.0;stroke:url(#linearGradient3155);stroke-width:2.30209565;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 3,31.153143 2.9750563,38.402618 2.9750563,45.572826 C 4.1625449,45.572826 27.946366,45.600605 30.637365,45.600605 C 32.751492,45.600605 32.586331,43.541005 32.586331,43.541005 C 32.586331,40.875594 27.597902,38.639057 25.813453,36.682531 C 23.985035,34.68151 26,30.884078 26,30.884078 C 26.641306,29.354278 28.01889,26.891006 28.01889,25.115922 C 28.01889,18.215923 21.624002,13 15,13 z "
+       style="opacity:1;fill:url(#linearGradient8774);fill-opacity:1;stroke:url(#linearGradient3130);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.5832705,1.5 C 4.2253041,1.5 1.5,4.2484155 1.5,7.6348558 C 1.5,10.409353 1.5368298,15.204777 2.3493298,16.119387 C 2.9513142,16.119387 14.14629,17.5 15.510463,17.5 C 16.582197,17.5 15.529722,16.489173 15.529722,16.489173 C 15.529722,15.082448 14.037305,14.095385 13.065033,13.123113 C 12.31715,12.330145 13.159601,10.088797 13.159601,10.088797 C 13.484704,9.3379883 13.534521,8.6063333 13.534521,7.735143 C 13.534521,4.348703 10.941237,1.5 7.5832705,1.5 z"
        id="path5176"
-       sodipodi:nodetypes="ccccszcsc"
-       transform="matrix(0.43939,0,0,0.42944,-0.819445,-4.082726)" />
-    <rect
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6331"
-       width="2.6154532"
-       height="1.1545694"
-       x="5.513658"
-       y="6.4806929"
-       rx="0.48532724"
-       ry="0.32910046"
-       transform="matrix(1.147027,0,0,0.866113,-0.324314,2.386999)" />
+       sodipodi:nodetypes="cccccccsc" />
     <path
-       transform="matrix(0.399589,0,0,0.393554,-5.973603e-2,-3.038964)"
-       style="opacity:0.5;fill:url(#linearGradient3134);fill-opacity:1.0;stroke:url(#linearGradient3163);stroke-width:2.5216887;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15,14.0625 C 8.9877035,14.0625 4.0789961,19.13808 4.0625,25.46875 C 4.0624722,25.479427 4.0617033,25.489349 4.0625,25.5 C 4.0625,32.787473 3.9033639,38.26012 3.9033639,44.499878 C 5.8399452,44.499878 24.86993,44.470084 30.695903,44.470084 C 29.746978,42.549359 26.273076,40.711023 23.972608,38.78763 C 23.362603,37.973536 23.023697,35.459892 22.969233,34.418473 C 23.611113,31.359155 25.129532,28.401757 26.527172,25.440129 C 26.527172,19.094533 21.022436,14.0625 15,14.0625 z "
+       style="opacity:0.54299998999999999;fill:url(#radialGradient8782);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 7.6952762,2.4999998 C 4.8395496,2.4999998 2.5080065,4.8304336 2.5001711,7.7371358 C 2.5001581,7.7420387 2.4997927,7.7465938 2.5001711,7.7514849 C 2.5001711,11.097502 3.0181313,16.475208 3.0181313,16.475208 C 3.9379713,16.475208 10.734965,16.461527 13.502192,16.461527 C 14.056593,16.461527 15,16.692971 15,16.020522 C 15,15.91871 14.623872,16.133525 14.362514,15.895884 C 14.101157,15.658243 13.835251,15.059314 13.403964,14.806022 C 12.543199,14.263752 11.86054,13.312811 11.81661,11.873858 C 11.874694,10.425059 12.718766,9.4318208 12.620458,7.8321281 C 12.620458,4.918572 10.555818,2.4999998 7.6952762,2.4999998 z"
        id="path5241"
-       sodipodi:nodetypes="csccccccc" />
-    <path
-       style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6,7.2175674 C 6,8.8735678 4.5070272,10 3.4999996,10 C 2.1199999,10 1,8.6559998 1,6.9999995 C 1,5.5609093 1.7677476,4 3.1477475,4 C 4.5277481,4 6,5.9092686 6,7.2175674 z "
-       id="path3137"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:nodetypes="cscccsscccc" />
     <path
-       transform="matrix(0.626764,0,0,0.689441,-3.309086,-9.833164)"
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 7.9998599,7.6813275 C 7.9998599,9.061316 6.8055234,10 5.9999296,10 C 4.8959685,10 4,8.880011 4,7.5000225 C 4,6.3007912 4.6142095,4.9911617 5.7181378,5.0000449 C 8.059493,5.018459 7.9998599,6.5910879 7.9998599,7.6813275 z"
        id="path5157"
        sodipodi:nodetypes="csssc" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient8766);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path5162"
        sodipodi:cx="10.169642"
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805757,0,0,1.158623,-4.194263,-20.66902)" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.8057553,0,0,0.7927385,-2.1942434,-11.247142)" />
     <path
-       style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.387086,4.6790601 C 10.509745,3.6558267 9.0824486,3.9284339 8.5222543,4.5817815 C 7.7545814,5.4771092 7.8435868,7.0342022 8.7209273,8.0574357 C 9.4833498,8.9466415 10.737398,9.413013 11.505071,8.5176851 C 12.272744,7.6223568 12.080215,5.4874505 11.387086,4.6790601 z "
-       id="path3139"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.63276428"
+       inkscape:original="M 10.5 14 C 10.223 14 10 14.223 10 14.5 C 10 14.777 10.223 15 10.5 15 L 11.5 15 C 11.777 15 12 14.777 12 14.5 C 12 14.223 11.777 14 11.5 14 L 10.5 14 z M 13.5 14 C 13.223 14 13 14.223 13 14.5 C 13 14.777 13.223 15 13.5 15 L 14.5 15 C 14.777 15 15 14.777 15 14.5 C 15 14.223 14.777 14 14.5 14 L 13.5 14 z "
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter9040)"
+       id="path8998"
+       d="M 10.5,13.375 C 9.8833937,13.375 9.375,13.883394 9.375,14.5 C 9.375,15.116606 9.8833937,15.625 10.5,15.625 L 11.5,15.625 C 11.997417,15.625 12.351557,15.26606 12.5,14.8125 C 12.648443,15.26606 13.002583,15.625 13.5,15.625 L 14.5,15.625 C 15.116606,15.625 15.625,15.116606 15.625,14.5 C 15.625,13.883394 15.116606,13.375 14.5,13.375 L 13.5,13.375 C 13.002583,13.375 12.648443,13.73394 12.5,14.1875 C 12.351557,13.73394 11.997417,13.375 11.5,13.375 L 10.5,13.375 z"
+       transform="matrix(0.7360213,0,0,0.7376927,0.4333759,-1.1147722)" />
     <path
-       transform="matrix(0.29055,-0.412361,-0.273947,-0.388798,13.58792,20.45445)"
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5169"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.58151811"
+       inkscape:original="M 8.5 9 C 7.5744947 9 8.0888797 12.372263 4 10.3125 C 5.6494162 12.565197 8.197109 13 8.96875 13 C 9.7318012 13 11.759773 11.940619 12.03125 9.96875 C 9.8826905 12.168839 9.3373684 9 8.5 9 z "
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter8756)"
+       id="path7960"
+       d="M 8.5,8.40625 C 8.2077387,8.40625 7.9340555,8.5866498 7.78125,8.75 C 7.6284445,8.9133502 7.5498385,9.0608344 7.46875,9.21875 C 7.3065731,9.5345811 7.172643,9.8595724 7,10.0625 C 6.827357,10.265428 6.671609,10.387141 6.28125,10.40625 C 5.890891,10.425359 5.2196564,10.269712 4.25,9.78125 C 4.0077291,9.6621096 3.7153231,9.7253647 3.5439557,9.9339859 C 3.3725882,10.142607 3.3673262,10.44173 3.53125,10.65625 C 4.4297328,11.883357 5.5774976,12.609102 6.59375,13.03125 C 7.6100024,13.453398 8.4737052,13.59375 8.96875,13.59375 C 9.6193922,13.59375 10.340813,13.267437 11.0625,12.6875 C 11.784187,12.107563 12.433247,11.228313 12.59375,10.0625 C 12.622923,9.8212663 12.499043,9.5873227 12.283116,9.4758765 C 12.067189,9.3644302 11.804734,9.3989754 11.625,9.5625 C 11.145204,10.053803 10.811541,10.151032 10.65625,10.15625 C 10.500959,10.161468 10.384244,10.105939 10.1875,9.90625 C 9.9907556,9.7065608 9.7866869,9.3846583 9.5625,9.09375 C 9.4504065,8.9482959 9.3464815,8.8194169 9.1875,8.6875 C 9.0285185,8.5555831 8.7880568,8.40625 8.5,8.40625 z"
+       transform="translate(0.9337088,2.2097087e-2)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.665364,5.6592388 C 12.000973,4.6508398 10.81971,4.941345 10.39549,5.5852216 C 9.8141493,6.4675705 9.881553,8.00209 10.545944,9.0104902 C 11.123309,9.8868033 12.156638,10.433807 12.737979,9.551461 C 13.319319,8.6691115 13.190256,6.4559104 12.665364,5.6592388 z"
+       id="path3134"
        sodipodi:nodetypes="csssc" />
     <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8,9 C 8,9 8,10 8,10 L 8.8944098,10 C 9.0595775,10 9.1925465,9.7769994 9.1925465,9.4999995 C 9.1925465,9.2229999 9.0595775,9 8.8944098,9 L 8,9 z M 10.086956,9 C 9.9217887,9 9.7888198,9.2229999 9.7888198,9.4999995 C 9.7888198,9.7769994 9.9217887,10 10.086956,10 L 11,10 C 11,10 11,9.1680139 11,9 L 10.086956,9 z"
+       id="rect3140"
+       sodipodi:nodetypes="cccscccscccc" />
+    <path
+       style="fill:url(#linearGradient8726);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 4.9337087,10.066933 C 8.8819634,12.626696 8.4961475,9.022097 9.4216528,9.022097 C 10.259021,9.022097 10.807246,12.196312 12.955806,9.9962228 C 12.684329,11.968092 10.658384,13.022097 9.8953332,13.022097 C 9.1236918,13.022097 6.5674999,12.88213 4.9337087,10.066933 z"
+       id="path3142"
+       sodipodi:nodetypes="czczc" />
+    <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5171"
+       style="opacity:1;fill:url(#linearGradient8735);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8733"
        sodipodi:cx="10.169642"
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.805754,0,0,1.158626,0.805772,-20.66909)" />
-    <path
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -3.174544e-16,1.7837407 C 0.49897694,0.43045085 3.4176637,1.3941391 4.4321866,1.7478251 L 2.7448964,2 L -3.174544e-16,1.7837407 z "
-       id="path5192"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 4,8.9694498 C 6.5363255,9.6796143 7.1434322,8 7.6676187,8 C 8.1845929,8 8.1150542,9.7216455 10.752536,9.1373864 C 10.257681,9.8617678 8.7366795,11 8.0954601,11 C 7.4470215,11 4.8041406,10.039472 4,8.9694498 z "
-       id="path3987"
-       sodipodi:nodetypes="czczc" />
-    <path
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 2.5678134,0.78213791 C 3.0667903,-0.57115198 7,-0.11652293 7,1.7459005 L 5.3127098,0.99839721 L 2.5678134,0.78213791 z "
-       id="path1991"
-       sodipodi:nodetypes="cccc" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.8057555,0,0,0.7724141,2.8057548,-10.779318)" />
   </g>
 </svg>
diff --git a/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png
index c91d8413d1..e6ce681e35 100644
--- a/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg
deleted file mode 100644
index 9169426a04..0000000000
--- a/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg
+++ /dev/null
@@ -1,591 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg4345"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/home/hbons/Desktop/Pidgin/2.1.0/icons/24/scalable"
-   sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Desktop/pidgin24.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   version="1.0">
-  <defs
-     id="defs4347">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3124">
-      <stop
-         style="stop-color:#3b1941;stop-opacity:1;"
-         offset="0"
-         id="stop3126" />
-      <stop
-         style="stop-color:#3b1941;stop-opacity:0;"
-         offset="1"
-         id="stop3128" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3116">
-      <stop
-         style="stop-color:#82508e;stop-opacity:1;"
-         offset="0"
-         id="stop3118" />
-      <stop
-         style="stop-color:#82508e;stop-opacity:0;"
-         offset="1"
-         id="stop3120" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3108">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3110" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop3112" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5438">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop5440" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop5442" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6817">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop6819" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop6821" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6537">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop6539" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop6541" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6506">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop6508" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop6510" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2804">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop2806" />
-      <stop
-         id="stop2812"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop2808" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient25546"
-       id="radialGradient25572"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
-       cx="7.8836637"
-       cy="1.5104795"
-       fx="7.8836637"
-       fy="1.5104795"
-       r="8.4883642" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient25546"
-       id="radialGradient25568"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
-       cx="7.8836741"
-       cy="0.14505707"
-       fx="7.8836741"
-       fy="0.14505707"
-       r="8.4883642" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient25546">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop25548" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop25550" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient25546"
-       id="radialGradient25554"
-       cx="7.8836637"
-       cy="2.6242435"
-       fx="7.8836637"
-       fy="2.6242435"
-       r="8.4883642"
-       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3800">
-      <stop
-         style="stop-color:#f4d9b1;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop3802" />
-      <stop
-         style="stop-color:#df9725;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop3804" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6506"
-       id="linearGradient6512"
-       x1="15.645709"
-       y1="39.029884"
-       x2="15.645709"
-       y2="43.206608"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6817"
-       id="linearGradient6823"
-       x1="0.23931108"
-       y1="38.950283"
-       x2="5.7089725"
-       y2="42.982571"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5438"
-       id="linearGradient5444"
-       x1="30.152058"
-       y1="-0.86487341"
-       x2="30.152058"
-       y2="23.011967"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="44.272076"
-       x2="5.5366187"
-       y1="39.902092"
-       x1="-1.6841649"
-       id="linearGradient6569"
-       xlink:href="#linearGradient6563"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="23.559282"
-       x2="30.5"
-       y1="0.033532728"
-       x1="30.5"
-       id="linearGradient2089"
-       xlink:href="#linearGradient6537"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="50.079575"
-       x2="14.943421"
-       y1="39.743458"
-       x1="15.645709"
-       id="linearGradient2087"
-       xlink:href="#linearGradient6506"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2081">
-      <stop
-         id="stop2083"
-         offset="0.0000000"
-         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2085"
-         offset="1.0000000"
-         style="stop-color:#df9725;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
-       r="8.4883642"
-       fy="2.6242435"
-       fx="7.8836637"
-       cy="2.6242435"
-       cx="7.8836637"
-       id="radialGradient2079"
-       xlink:href="#linearGradient25546"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.4883642"
-       fy="0.14505707"
-       fx="7.8836741"
-       cy="0.14505707"
-       cx="7.8836741"
-       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2071"
-       xlink:href="#linearGradient25546"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.4883642"
-       fy="1.5104795"
-       fx="7.8836637"
-       cy="1.5104795"
-       cx="7.8836637"
-       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2069"
-       xlink:href="#linearGradient25546"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient2061">
-      <stop
-         id="stop2063"
-         offset="0"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0.5"
-         id="stop2065" />
-      <stop
-         id="stop2067"
-         offset="1"
-         style="stop-color:black;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6563"
-       inkscape:collect="always">
-      <stop
-         id="stop6565"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop6567"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2850"
-       inkscape:collect="always">
-      <stop
-         id="stop2852"
-         offset="0"
-         style="stop-color:#ce5c00;stop-opacity:1;" />
-      <stop
-         id="stop2854"
-         offset="1"
-         style="stop-color:#ce5c00;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3958"
-       inkscape:collect="always">
-      <stop
-         id="stop3960"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-      <stop
-         id="stop3962"
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3968"
-       inkscape:collect="always">
-      <stop
-         id="stop3970"
-         offset="0"
-         style="stop-color:#82508e;stop-opacity:1;" />
-      <stop
-         id="stop3972"
-         offset="1"
-         style="stop-color:#82508e;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3976"
-       inkscape:collect="always">
-      <stop
-         id="stop3978"
-         offset="0"
-         style="stop-color:#3b1941;stop-opacity:1;" />
-      <stop
-         id="stop3980"
-         offset="1"
-         style="stop-color:#3b1941;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2850"
-       id="linearGradient2149"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.769231,0,0,0.714287,-34.23081,-12.28573)"
-       x1="21.785719"
-       y1="28.142857"
-       x2="17.785713"
-       y2="30.07143" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3958"
-       id="radialGradient2191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.116159,0,0,1.076653,-36.39499,-20.28695)"
-       cx="9.0640488"
-       cy="21.511742"
-       fx="9.0640488"
-       fy="21.511742"
-       r="16.663956" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6506"
-       id="linearGradient2193"
-       gradientUnits="userSpaceOnUse"
-       x1="15.645709"
-       y1="39.743458"
-       x2="15.645709"
-       y2="53.502155"
-       gradientTransform="matrix(0.660903,0,0,0.627207,-32.26852,-10.3201)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3968"
-       id="linearGradient2196"
-       gradientUnits="userSpaceOnUse"
-       x1="16.13257"
-       y1="40.781811"
-       x2="16.13257"
-       y2="48.068741"
-       gradientTransform="matrix(0.67692,0,0,0.646801,-32.53568,-10.90841)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3976"
-       id="linearGradient2198"
-       gradientUnits="userSpaceOnUse"
-       x1="12.095973"
-       y1="40.907658"
-       x2="12.095973"
-       y2="46.463146"
-       gradientTransform="matrix(0.67692,0,0,0.646801,-32.53568,-10.90841)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6537"
-       id="linearGradient2201"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5"
-       y1="0.033532728"
-       x2="30.5"
-       y2="23.559282"
-       gradientTransform="matrix(0.668893,0,0,0.668627,-32.91377,-10.19246)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3108"
-       id="linearGradient3114"
-       x1="10.18327"
-       y1="16.618088"
-       x2="27.598003"
-       y2="36.64465"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3116"
-       id="linearGradient3122"
-       x1="15.722902"
-       y1="38.768803"
-       x2="15.722902"
-       y2="43.249905"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3124"
-       id="linearGradient3130"
-       x1="13.150809"
-       y1="38.849556"
-       x2="13.150809"
-       y2="43.105652"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2850"
-       id="linearGradient3146"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.769231,0,0,0.714287,-3.230767,-7.285729)"
-       x1="21.785719"
-       y1="28.142857"
-       x2="17.785713"
-       y2="30.07143" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5438"
-       id="linearGradient2848"
-       gradientUnits="userSpaceOnUse"
-       x1="30.152058"
-       y1="-0.86487341"
-       x2="30.152058"
-       y2="23.011967" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.743067"
-     inkscape:cx="23.715241"
-     inkscape:cy="10.08258"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1434"
-     inkscape:window-height="840"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:grid-points="false"
-     width="22px"
-     height="22px"
-     inkscape:object-bbox="true" />
-  <metadata
-     id="metadata4350">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:1;fill:#75507b;fill-opacity:1"
-       d="M 36.0625,8 C 33.978257,8 33.334928,10.523086 34.78125,12.9375 C 35.250389,13.720651 36.674297,15.15311 36.86722,15.15311 L 36.878267,14.508325 C 36.288194,13.580567 35.517363,12.502064 35.686987,12.281543 C 37.835781,12.281543 38,11.491782 38,10.027674 C 38,8.7542399 37.228501,8 36.0625,8 z "
-       id="path6521"
-       transform="matrix(1.747787,0,0,1.397993,-52.41719,-5.183942)"
-       sodipodi:nodetypes="csccccc" />
-    <path
-       style="opacity:1;fill:url(#linearGradient3122);fill-opacity:1;stroke:url(#linearGradient3130);stroke-width:1.51128328;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 3,31.153143 2.9750563,38.402618 2.9750563,45.572826 C 4.1625449,45.572826 27.946366,45.600605 30.637365,45.600605 C 32.751492,45.600605 32.586331,43.541005 32.586331,43.541005 C 32.586331,40.875594 27.597902,38.639057 25.813453,36.682531 C 23.985035,34.68151 26,30.5 26,30.5 C 26.641306,28.9702 27,27.275084 27,25.5 C 27,18.600001 21.624002,13 15,13 z "
-       id="path5176"
-       sodipodi:nodetypes="ccccszcsc"
-       transform="matrix(0.67692,0,0,0.646801,-1.52611,-5.949693)" />
-    <path
-       transform="matrix(0.660903,0,0,0.627207,-1.258953,-5.361383)"
-       style="opacity:0.5;fill:url(#linearGradient3114);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:1.55319393;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15,14.0625 C 8.9877035,14.0625 4.0789961,19.13808 4.0625,25.46875 C 4.0624722,25.479427 4.0617033,25.489349 4.0625,25.5 C 4.0625,32.787473 3.9033639,38.26012 3.9033639,44.499878 C 5.8399452,44.499878 22.452275,44.470084 28.278248,44.470084 C 29.445455,44.470084 31.431654,44.974157 31.431654,43.509594 C 31.431654,43.287851 31.231903,42.870917 30.681654,42.353344 C 30.131405,41.835771 29.308414,41.280003 28.400404,40.728344 C 26.665321,39.858723 25.411769,39.090553 24.621247,37.290844 C 24.011242,36.47675 23.731303,35.519763 23.676839,34.478344 C 23.622375,33.436925 24.107721,32.319635 24.224561,31.259594 C 24.458241,29.139511 24.96875,30.28125 24.96875,30.28125 C 24.98374,30.216952 25.004663,30.154183 25.03125,30.09375 C 25.618731,28.692346 25.9375,27.131297 25.9375,25.5 C 25.9375,19.154404 21.022436,14.0625 15,14.0625 z "
-       id="path5241"
-       sodipodi:nodetypes="cscccssccsscssc" />
-    <path
-       style="fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 3.072604,7.0864988 C 4.607952,5.4493238 7.105721,5.8854918 8.086061,6.9308478 C 9.4294869,8.3633698 9.273726,10.85472 7.738379,12.491894 C 6.404137,13.914624 4.209552,14.660821 2.866124,13.228299 C 1.522696,11.795776 1.859625,8.3799248 3.072604,7.0864988 z "
-       id="path3138"
-       sodipodi:nodetypes="csssc" />
-    <path
-       transform="matrix(1.010846,0,0,1.029732,-5.552971,-15.17001)"
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5157"
-       sodipodi:nodetypes="csssc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5162"
-       sodipodi:cx="10.169642"
-       sodipodi:cy="24.3125"
-       sodipodi:rx="1.2410715"
-       sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208633,0,0,1.158621,-6.791366,-17.66897)" />
-    <path
-       transform="matrix(0.670792,0,0,0.486348,-3.805943,-3.90166)"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.651119,11.193815 C 13.577759,8.2509126 16.249277,11.481501 17.614226,12.804399 L 14.761306,13.747613 L 11.651119,11.193815 z "
-       id="path5192"
-       sodipodi:nodetypes="cccc" />
-    <path
-       transform="matrix(0.851014,0,0,0.554879,-3.938174,-5.194599)"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.689238,9.8218679 C 13.591296,8.0161941 17.174576,11.994261 17.519594,13.650486 L 14.543472,12.891665 L 11.689238,9.8218679 z "
-       id="rect5189"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 16.371022,7.8148748 C 15.47069,6.586993 14.005993,6.9141191 13.43112,7.6981356 C 12.643332,8.7725276 12.734671,10.64104 13.635002,11.868921 C 14.417404,12.93597 15.704314,13.495617 16.492103,12.421225 C 17.279892,11.346833 17.082315,8.7849447 16.371022,7.8148748 z "
-       id="path3132"
-       sodipodi:nodetypes="csssc" />
-    <path
-       style="fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 16.502957,8.5432477 C 15.827476,7.7246593 14.728576,7.9427464 14.297274,8.4654263 C 13.706229,9.1816906 13.774757,10.427368 14.450238,11.245957 C 15.037241,11.957323 16.002754,12.33042 16.593798,11.614156 C 17.184843,10.897891 17.03661,9.1899614 16.502957,8.5432477 z "
-       id="path3134"
-       sodipodi:nodetypes="csssc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3136"
-       sodipodi:cx="10.169642"
-       sodipodi:cy="24.3125"
-       sodipodi:rx="1.2410715"
-       sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.153827,0,0,1.158621,3.593156,-17.66895)" />
-    <rect
-       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3140"
-       width="4.4400907"
-       height="1"
-       x="8.5358553"
-       y="13"
-       rx="0.69182354"
-       ry="0.5" />
-    <path
-       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6,13.893438 C 11.088512,17.243015 10.655188,12 11.431469,12 C 12.197069,12 11.699301,17.201991 16,13.895644 C 15.267157,15.102946 13.014668,17 12.06507,17 C 11.104781,17 7.190872,15.676807 6,13.893438 z "
-       id="path3142"
-       sodipodi:nodetypes="czczc" />
-    <path
-       style="fill:url(#linearGradient3146);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6,13.893439 C 10.740404,18.171305 10.655188,12 11.431469,12 C 12.197069,12 11.641283,17.027939 16,13.895646 C 15.267157,15.102947 13.014668,17 12.06507,17 C 11.104781,17 7.190873,15.676809 6,13.893439 z "
-       id="path3144"
-       sodipodi:nodetypes="czczc" />
-  </g>
-</svg>
diff --git a/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png
index 6011b87dd8..7189160a8b 100644
--- a/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
index 2eb95bcb5e..c7383e6a55 100644
--- a/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -13,50 +13,106 @@
    height="24"
    id="svg4345"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.46"
    sodipodi:docbase="/home/hbons/Desktop/Pidgin/2.1.0/icons/24/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Desktop/pidgin24.png"
+   inkscape:export-filename="/home/hbons/Bureaublad/pidgin.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   version="1.0">
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4347">
     <linearGradient
+       id="linearGradient8989"
+       inkscape:collect="always">
+      <stop
+         id="stop8991"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.81407034" />
+      <stop
+         id="stop8993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       id="linearGradient3124">
+       id="linearGradient8838">
       <stop
          style="stop-color:#3b1941;stop-opacity:1;"
          offset="0"
-         id="stop3126" />
+         id="stop8840" />
       <stop
          style="stop-color:#3b1941;stop-opacity:0;"
          offset="1"
-         id="stop3128" />
+         id="stop8842" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3116">
+       id="linearGradient8830">
       <stop
-         style="stop-color:#82508e;stop-opacity:1;"
+         style="stop-color:#3b1941;stop-opacity:1;"
          offset="0"
-         id="stop3118" />
+         id="stop8832" />
       <stop
-         style="stop-color:#82508e;stop-opacity:0;"
+         style="stop-color:#3b1941;stop-opacity:0;"
          offset="1"
-         id="stop3120" />
+         id="stop8834" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3108">
+       id="linearGradient8776">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.82412058"
          offset="0"
-         id="stop3110" />
+         id="stop8778" />
       <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
+         style="stop-color:#ffffff;stop-opacity:0"
          offset="1"
-         id="stop3112" />
+         id="stop8780" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8720">
+      <stop
+         style="stop-color:#fdc26a;stop-opacity:1"
+         offset="0"
+         id="stop8722" />
+      <stop
+         style="stop-color:#f57900;stop-opacity:1"
+         offset="1"
+         id="stop8724" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       id="perspective97" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3124">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop3126" />
+      <stop
+         style="stop-color:#3b1941;stop-opacity:0;"
+         offset="1"
+         id="stop3128" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3116">
+      <stop
+         style="stop-color:#82508e;stop-opacity:1;"
+         offset="0"
+         id="stop3118" />
+      <stop
+         style="stop-color:#82508e;stop-opacity:0"
+         offset="1"
+         id="stop3120" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -179,14 +235,14 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6506"
+       xlink:href="#linearGradient8989"
        id="linearGradient6512"
-       x1="15.645709"
-       y1="39.029884"
-       x2="15.645709"
-       y2="43.206608"
+       x1="15.712908"
+       y1="41.672424"
+       x2="15.712908"
+       y2="43.283482"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.660903,0,0,0.627207,-0.293224,-4.361383)" />
+       gradientTransform="matrix(0.657666,0,0,0.625853,0.8007403,-4.3010586)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6817"
@@ -414,53 +470,98 @@
        gradientTransform="matrix(0.668893,0,0,0.668627,-32.91377,-10.19246)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3108"
-       id="linearGradient3114"
-       x1="10.18327"
-       y1="16.618088"
-       x2="27.598003"
-       y2="36.64465"
+       xlink:href="#linearGradient3124"
+       id="linearGradient3130"
+       x1="12.561858"
+       y1="39.538197"
+       x2="12.561858"
+       y2="43.858727"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.660903,0,0,0.627207,-0.293224,-4.361383)" />
+       gradientTransform="matrix(0.6753496,0,0,0.6455349,0.4630688,-4.891953)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3116"
-       id="linearGradient3122"
-       x1="15.722902"
-       y1="38.768803"
-       x2="15.722902"
-       y2="43.249905"
+       xlink:href="#linearGradient5438"
+       id="linearGradient2848"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.67692,0,0,0.646801,-0.560381,-4.949693)" />
+       x1="30.152058"
+       y1="-0.86487341"
+       x2="30.152058"
+       y2="23.011967" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3124"
-       id="linearGradient3130"
-       x1="13.150809"
-       y1="38.849556"
-       x2="13.150809"
-       y2="43.105652"
+       xlink:href="#linearGradient8720"
+       id="linearGradient8726"
+       x1="12.806054"
+       y1="16.65247"
+       x2="13.166923"
+       y2="16.608501"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.67692,0,0,0.646801,-0.560381,-4.949693)" />
+       gradientTransform="translate(0.9722718,0)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2850"
-       id="linearGradient3146"
+       xlink:href="#linearGradient3116"
+       id="linearGradient8774"
+       x1="10.624538"
+       y1="19.763729"
+       x2="10.624538"
+       y2="23.347383"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.769231,0,0,0.714287,-2.265038,-6.285729)"
-       x1="21.785719"
-       y1="28.142857"
-       x2="17.785713"
-       y2="30.07143" />
+       gradientTransform="translate(0.9722718,0)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8776"
+       id="radialGradient8782"
+       cx="11.763939"
+       cy="12.831866"
+       fx="11.763939"
+       fy="12.831866"
+       r="9.5000002"
+       gradientTransform="matrix(1.5913256,-4.8823489e-2,2.9994878e-2,0.9776358,-5.9699631,1.0103644)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter8810"
+       x="-0.066766478"
+       width="1.133533"
+       y="-0.10563155"
+       height="1.2112631">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.30534121"
+         id="feGaussianBlur8812" />
+    </filter>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5438"
-       id="linearGradient2848"
+       xlink:href="#linearGradient8830"
+       id="linearGradient8836"
+       x1="6.3341951"
+       y1="3.1008458"
+       x2="0.83419508"
+       y2="3.1008458"
        gradientUnits="userSpaceOnUse"
-       x1="30.152058"
-       y1="-0.86487341"
-       x2="30.152058"
-       y2="23.011967" />
+       gradientTransform="translate(0.9722718,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8838"
+       id="linearGradient8844"
+       x1="9.5704832"
+       y1="3.0778286"
+       x2="3.0625"
+       y2="-0.047171354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.9722718,0)" />
+    <filter
+       inkscape:collect="always"
+       id="filter9040"
+       x="-0.095484515"
+       width="1.190969"
+       y="-0.32181818"
+       height="1.6436364">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.22627841"
+         id="feGaussianBlur9042" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -469,15 +570,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32.163554"
-     inkscape:cx="16.820721"
-     inkscape:cy="19.317678"
+     inkscape:zoom="16"
+     inkscape:cx="30.73018"
+     inkscape:cy="9.2233038"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      inkscape:window-width="1440"
-     inkscape:window-height="846"
+     inkscape:window-height="847"
      inkscape:window-x="0"
      inkscape:window-y="0"
      showguides="true"
@@ -485,7 +586,17 @@
      inkscape:grid-points="false"
      width="24px"
      height="24px"
-     inkscape:object-bbox="true" />
+     inkscape:object-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7936"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4350">
     <rdf:RDF>
@@ -502,28 +613,38 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:1;fill:#75507b;fill-opacity:1"
-       d="M 11.578108,7.0000021 C 7.9352949,7.0000021 6.8108928,10.527259 9.3387556,13.902593 C 10.158711,14.997432 12.647399,17 12.984587,17 L 13.003895,16.098595 C 11.972573,14.801596 10.625325,13.293856 10.921791,12.985569 C 14.677426,12.985569 14.964445,11.881489 14.964445,9.8346762 C 14.964445,8.0544242 13.616029,7.0000021 11.578108,7.0000021 z "
-       id="path6521"
-       sodipodi:nodetypes="csccccc" />
+       style="fill:url(#linearGradient8844);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6.9177548,1.9731142 C 8.1897168,-0.34713734 10.972272,1.9093507 10.972272,4.2806574 L 9.9267968,4.1947658 C 9.9267968,2.9993751 8.9228106,1.7171212 6.9177548,1.9731142 z"
+       id="rect5189"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:url(#linearGradient8836);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 4.3071856,3.782206 C 4.2486113,1.1368282 7.7866188,1.6997265 8.9722718,3.7533385 L 8.0239178,4.2016918 C 7.4262233,3.1664528 5.9156185,2.5579816 4.3071856,3.782206 z"
+       id="path8784"
+       sodipodi:nodetypes="cccc"
+       inkscape:transform-center-x="1.7235728"
+       inkscape:transform-center-y="-0.24306796" />
     <path
-       style="opacity:1;fill:url(#linearGradient3122);fill-opacity:1;stroke:url(#linearGradient3130);stroke-width:0.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.593419,3.4587201 C 5.1094995,3.4587201 1.470379,7.0808064 1.470379,11.543733 C 1.470379,15.200191 1.4534941,19.889159 1.4534941,24.526857 C 2.2573289,24.526857 18.357073,24.544824 20.178665,24.544824 C 21.609759,24.544824 21.497959,23.212673 21.497959,23.212673 C 21.497959,21.488682 18.121191,20.042088 16.913262,18.776605 C 15.675569,17.482342 17.039539,14.777738 17.039539,14.777738 C 17.473652,13.788261 17.716459,12.691859 17.716459,11.543733 C 17.716459,7.0808064 14.077339,3.4587201 9.593419,3.4587201 z "
+       style="opacity:1;fill:url(#linearGradient8774);fill-opacity:1;stroke:url(#linearGradient3130);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.593313,3.5 C 6.1197955,3.5 2.4891175,7.1149956 2.4891175,11.569186 C 2.4891175,15.218486 6.0077449,22.941522 0.16383722,23.427658 C 0.96580722,23.427658 18.806305,24.544826 20.623671,24.544826 C 22.051445,24.544826 21.939905,23.215283 21.939905,23.215283 C 21.939905,22.576692 21.741015,22.10882 20.830589,21.409004 C 19.67644,20.521846 19.025096,20.449608 18.028757,19.406617 C 17.032418,18.363626 18.022158,14.796859 18.022158,14.796859 C 18.455264,13.809319 18.521629,12.846972 18.521629,11.701094 C 18.521629,7.2469039 15.066831,3.5 10.593313,3.5 z"
        id="path5176"
-       sodipodi:nodetypes="ccccszcsc" />
+       sodipodi:nodetypes="ccccsszcsc" />
     <path
-       style="opacity:0.5;fill:url(#linearGradient3114);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.620321,4.4587156 C 5.6467762,4.4587156 2.4025968,7.6421549 2.3916944,11.612795 C 2.3916761,11.619492 2.3911679,11.625715 2.3916944,11.632396 C 2.3916944,16.20315 2.2865209,19.635632 2.2865209,23.549252 C 3.5664133,23.549252 14.545552,23.530565 18.395955,23.530565 C 19.167366,23.530565 20.480051,23.846723 20.480051,22.928139 C 20.480051,22.78906 20.348035,22.527556 19.984374,22.202931 C 19.620712,21.878306 19.076795,21.529724 18.476689,21.18372 C 17.329967,20.638287 16.501491,20.156486 15.979032,19.027696 C 15.575878,18.51709 15.390866,17.916861 15.35487,17.263676 C 15.318875,16.610491 15.639642,15.909718 15.716861,15.244853 C 15.871301,13.915122 16.208698,14.631229 16.208698,14.631229 C 16.218605,14.590901 16.232433,14.551532 16.250005,14.513628 C 16.638273,13.634657 16.848948,12.655557 16.848948,11.632396 C 16.848948,7.6523934 13.600567,4.4587156 9.620321,4.4587156 z "
+       style="opacity:0.5;fill:url(#radialGradient8782);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.665731,4.5 C 6.7116478,4.5 3.4833573,7.6765676 3.4725083,11.638635 C 3.4724903,11.645318 3.4719843,11.651527 3.4725083,11.658194 C 3.8260617,15.600363 6.4567121,22.390463 2.1317786,23.549325 C 3.4054031,23.549325 14.992315,23.530678 18.82386,23.530678 C 19.591493,23.530678 20.897748,23.846154 20.897748,22.929553 C 20.897748,22.790774 20.766378,22.529834 20.404498,22.20591 C 20.042618,21.881986 19.501364,21.534156 18.904198,21.188899 C 17.106601,20.449743 16.43302,19.238726 16.372193,17.277317 C 16.452619,15.30249 17.621333,13.948626 17.485214,11.768117 C 17.485214,7.7967072 14.626482,4.5 10.665731,4.5 z"
        id="path5241"
-       sodipodi:nodetypes="cscccssccsscssc" />
+       sodipodi:nodetypes="cscccsscccc" />
     <path
-       style="fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 4.038333,8.0864989 C 5.573681,6.4493239 8.07145,6.8854919 9.05179,7.9308479 C 10.395216,9.3633699 10.239455,11.85472 8.704108,13.491894 C 7.369866,14.914624 5.175281,15.660821 3.831853,14.228299 C 2.488425,12.795776 2.825354,9.3799249 4.038333,8.0864989 z "
-       id="path3138"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.97252291"
+       inkscape:original="M 7.15625 8 C 5.7694225 8 4.9999998 9.5395554 5 10.96875 C 5 12.613363 6.1444228 13.96875 7.53125 13.96875 C 8.5432599 13.96875 10.03125 12.832113 10.03125 11.1875 C 10.03125 9.8881973 8.5430781 8 7.15625 8 z "
+       style="opacity:1;fill:#9757a4;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       id="path8816"
+       d="M 7.15625,7.03125 C 6.1029614,7.03125 5.2431984,7.6462575 4.75,8.40625 C 4.2568016,9.1662425 4.0312499,10.07963 4.03125,10.96875 C 4.03125,13.064524 5.5107726,14.9375 7.53125,14.9375 C 8.4013507,14.9375 9.1895212,14.517728 9.84375,13.875 C 10.497979,13.232272 11,12.303108 11,11.1875 C 11,10.166552 10.509035,9.2426793 9.84375,8.46875 C 9.1784648,7.6948207 8.2910346,7.03125 7.15625,7.03125 z"
+       transform="matrix(1.0039789,0,0,1,-4.3768242e-2,6.25e-2)" />
     <path
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8.8136637,11.188225 C 8.8136637,12.837133 7.3689434,13.95874 6.3944626,13.95874 C 5.0590642,13.95874 3.9752623,12.620497 3.9752623,10.971589 C 3.9752623,9.5386622 4.7181965,7.9844383 6.0535952,7.9844383 C 7.3889945,7.9844383 8.8136637,9.8855295 8.8136637,11.188225 z "
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 9.9722718,11.217568 C 9.9722718,12.873569 8.4886302,14 7.4878967,14 C 6.1165222,14 5.0035223,12.656001 5.0035223,11 C 5.0035223,9.5609094 5.7664715,8 7.1378462,8 C 8.5092214,8 9.9722718,9.9092687 9.9722718,11.217568 z"
        id="path5157"
        sodipodi:nodetypes="csssc" />
     <path
@@ -534,26 +655,19 @@
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208633,0,0,1.158621,-5.825637,-16.66897)" />
-    <path
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 4.9752634,2.5424297 C 6.2676381,1.111155 8.059671,2.6823452 8.9752679,3.325734 L 7.061552,3.7844642 L 4.9752634,2.5424297 z "
-       id="path5192"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6.9752602,1.2553494 C 8.5939382,0.25341885 11.64336,2.4607647 11.936975,3.3797691 L 9.4042533,2.9587153 L 6.9752602,1.2553494 z "
-       id="rect5189"
-       sodipodi:nodetypes="cccc" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(1.1960429,0,0,1.158621,-4.7066825,-16.575223)" />
     <path
-       style="fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 17.336751,8.8148749 C 16.436419,7.5869931 14.971722,7.9141192 14.396849,8.6981357 C 13.609061,9.7725277 13.7004,11.64104 14.600731,12.868921 C 15.383133,13.93597 16.670043,14.495617 17.457832,13.421225 C 18.245621,12.346833 18.048044,9.7849448 17.336751,8.8148749 z "
-       id="path3132"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.0018603"
+       inkscape:original="M 15.375 8 C 14.972613 8.0219165 14.616322 8.2670758 14.40625 8.59375 C 13.830495 9.4890789 13.873243 11.039266 14.53125 12.0625 C 15.103067 12.951704 16.049246 13.426577 16.625 12.53125 C 17.200756 11.635921 17.051098 9.4958908 16.53125 8.6875 C 16.202247 8.1758836 15.777387 7.9780835 15.375 8 z "
+       style="fill:#9757a4;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       id="path8820"
+       d="M 15.3125,7 C 14.537055,7.0422356 13.927975,7.4941649 13.5625,8.0625 C 12.689986,9.4193046 12.791183,11.199932 13.6875,12.59375 C 14.065497,13.181554 14.559478,13.713455 15.28125,13.9375 C 16.003022,14.161545 17.002245,13.787939 17.46875,13.0625 C 17.974403,12.276184 18.035404,11.401604 18,10.53125 C 17.964596,9.6608958 17.828805,8.8619408 17.375,8.15625 C 16.897304,7.4134085 16.079992,6.9581976 15.3125,7 z"
+       transform="translate(0.9722718,0)" />
     <path
-       style="fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 17.468686,9.5432478 C 16.793205,8.7246594 15.694305,8.9427465 15.263003,9.4654264 C 14.671958,10.181691 14.740486,11.427368 15.415967,12.245957 C 16.00297,12.957323 16.968483,13.33042 17.559527,12.614156 C 18.150572,11.897891 18.002339,10.189962 17.468686,9.5432478 z "
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 17.512585,8.6790592 C 16.854579,7.6558262 15.784106,7.9284344 15.363962,8.5817827 C 14.788207,9.4771112 14.854963,11.034204 15.51297,12.057438 C 16.084787,12.946642 17.025322,13.413012 17.601076,12.517685 C 18.176831,11.622356 18.032433,9.48745 17.512585,8.6790592 z"
        id="path3134"
        sodipodi:nodetypes="csssc" />
     <path
@@ -564,26 +678,30 @@
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.153827,0,0,1.158621,4.558885,-16.66895)" />
-    <rect
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.8057553,0,0,1.158621,7.7780286,-16.668973)" />
+    <path
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter8810)"
+       d="M 13.566022,12.4375 C 13.194663,12.4375 12.924994,12.697732 12.784772,12.90625 C 12.64455,13.114768 12.563861,13.333559 12.472272,13.5625 C 12.289094,14.020382 12.105216,14.51781 11.847272,14.875 C 11.589328,15.23219 11.326777,15.452654 10.816022,15.46875 C 10.305267,15.484846 9.472703,15.240041 8.2535218,14.4375 C 8.0308701,14.276718 7.7244458,14.30128 7.530249,14.495477 C 7.3360522,14.689674 7.3114894,14.996098 7.4722718,15.21875 C 8.177906,16.27546 9.2361909,17.5841 10.612897,18.40625 C 11.30125,18.817325 12.405251,19.087337 12.987897,19.34375 C 13.570543,19.600163 13.914091,19.5625 14.378522,19.5625 C 14.899377,19.5625 15.235127,19.263825 15.597272,18.9375 C 15.959417,18.611175 16.339029,18.201439 16.691022,17.75 C 17.395008,16.847123 18.035855,15.803499 18.409772,15.1875 C 18.520635,14.941092 18.439589,14.65066 18.217158,14.49726 C 17.994726,14.343859 17.694451,14.37131 17.503522,14.5625 C 16.887662,15.324047 16.510081,15.447586 16.316022,15.4375 C 16.121963,15.427414 15.873341,15.263025 15.597272,14.875 C 15.321203,14.486975 15.048543,13.963561 14.784772,13.5 C 14.652887,13.26822 14.51805,13.036007 14.347272,12.84375 C 14.176494,12.651493 13.932762,12.4375 13.566022,12.4375 z"
+       id="path8770"
+       sodipodi:nodetypes="csssscscssssscscssssc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.63276428"
+       inkscape:original="M 10.5 14 C 10.223 14 10 14.223 10 14.5 C 10 14.777 10.223 15 10.5 15 L 11.5 15 C 11.777 15 12 14.777 12 14.5 C 12 14.223 11.777 14 11.5 14 L 10.5 14 z M 13.5 14 C 13.223 14 13 14.223 13 14.5 C 13 14.777 13.223 15 13.5 15 L 14.5 15 C 14.777 15 15 14.777 15 14.5 C 15 14.223 14.777 14 14.5 14 L 13.5 14 z "
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter9040)"
+       id="path8998"
+       d="M 10.5,13.375 C 9.8833937,13.375 9.375,13.883394 9.375,14.5 C 9.375,15.116606 9.8833937,15.625 10.5,15.625 L 11.5,15.625 C 11.997417,15.625 12.351557,15.26606 12.5,14.8125 C 12.648443,15.26606 13.002583,15.625 13.5,15.625 L 14.5,15.625 C 15.116606,15.625 15.625,15.116606 15.625,14.5 C 15.625,13.883394 15.116606,13.375 14.5,13.375 L 13.5,13.375 C 13.002583,13.375 12.648443,13.73394 12.5,14.1875 C 12.351557,13.73394 11.997417,13.375 11.5,13.375 L 10.5,13.375 z"
+       transform="translate(0.9722718,0)" />
+    <path
        style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11,14 C 11,14 11,15 11,15 L 12.491733,15 C 12.767207,15 12.988978,14.777 12.988978,14.5 C 12.988978,14.223 12.767207,14 12.491733,14 L 11,14 z M 14.480711,14 C 14.205238,14 13.983467,14.223 13.983467,14.5 C 13.983467,14.777 14.205238,15 14.480711,15 L 16.003522,15 C 16.003522,15 16.003522,14.168014 16.003522,14 L 14.480711,14 z"
        id="rect3140"
-       width="4.4400907"
-       height="1"
-       x="9.501585"
-       y="14"
-       rx="0.69182354"
-       ry="0.5" />
+       sodipodi:nodetypes="cccscccscccc" />
     <path
-       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6.965729,14.893438 C 12.054241,18.243015 11.620917,13 12.397198,13 C 13.162798,13 12.66503,18.201991 16.965729,14.895644 C 16.232886,16.102946 13.980397,18 13.030799,18 C 12.07051,18 8.156601,16.676807 6.965729,14.893438 z "
+       style="fill:url(#linearGradient8726);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 7.982195,14.992875 C 13.070707,18.088335 12.577918,13 13.567333,13 C 14.578647,13 15.264171,18.201991 17.938001,14.895644 C 17.517658,16.431071 15.326409,19.011297 14.376811,19.011297 C 13.416522,19.011297 10.034853,18.378283 7.982195,14.992875 z"
        id="path3142"
        sodipodi:nodetypes="czczc" />
-    <path
-       style="fill:url(#linearGradient3146);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 6.965729,14.893439 C 11.706133,19.171305 11.620917,13 12.397198,13 C 13.162798,13 12.607012,18.027939 16.965729,14.895646 C 16.232886,16.102947 13.980397,18 13.030799,18 C 12.07051,18 8.156602,16.676809 6.965729,14.893439 z "
-       id="path3144"
-       sodipodi:nodetypes="czczc" />
   </g>
 </svg>
diff --git a/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png
index b9ea80b4f3..cd19389562 100644
--- a/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
index f83c5a4808..7e384705aa 100644
--- a/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -13,51 +13,23 @@
    height="32"
    id="svg4345"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.46"
    sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/icons/32/scalable"
    sodipodi:docname="pidgin.svg"
-   inkscape:export-filename="/home/hbons/Desktop/pidgin32.png"
+   inkscape:export-filename="/home/hbons/Bureaublad/pidgin-32.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   version="1.0">
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4347">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3976">
-      <stop
-         style="stop-color:#3b1941;stop-opacity:1;"
-         offset="0"
-         id="stop3978" />
-      <stop
-         style="stop-color:#3b1941;stop-opacity:0;"
-         offset="1"
-         id="stop3980" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3968">
-      <stop
-         style="stop-color:#82508e;stop-opacity:1;"
-         offset="0"
-         id="stop3970" />
-      <stop
-         style="stop-color:#82508e;stop-opacity:0;"
-         offset="1"
-         id="stop3972" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3958">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
-         offset="0"
-         id="stop3960" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop3962" />
-    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective79" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient2850">
@@ -92,17 +64,6 @@
          offset="1"
          id="stop2820" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2816"
-       id="radialGradient2824"
-       cx="9.4288578"
-       cy="19.283415"
-       fx="9.4288578"
-       fy="19.283415"
-       r="16.390338"
-       gradientTransform="matrix(1.556432,0,0,1.618148,-52.04294,-30.39321)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient2826">
@@ -117,16 +78,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2826"
-       id="linearGradient2832"
-       x1="13.191773"
-       y1="41.606163"
-       x2="13.191773"
-       y2="47.843258"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.988192,-46.55265,-16.48621)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient2834">
       <stop
          style="stop-color:#82508e;stop-opacity:1;"
@@ -139,16 +90,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2834"
-       id="linearGradient2840"
-       x1="11.373499"
-       y1="41.566242"
-       x2="11.373499"
-       y2="47.746658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.988192,-46.55265,-16.48621)" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6563">
       <stop
          style="stop-color:white;stop-opacity:1;"
@@ -256,24 +197,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient6506"
-       id="linearGradient6512"
-       x1="15.645709"
-       y1="39.743458"
-       x2="14.943421"
-       y2="50.079575"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6537"
-       id="linearGradient6543"
-       x1="30.5"
-       y1="0.033532728"
-       x2="30.5"
-       y2="23.559282"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6563"
        id="linearGradient6569"
        x1="-1.6841649"
@@ -300,45 +223,534 @@
        x2="15.645709"
        y2="53.502155"
        gradientTransform="translate(-47,-15)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.364647"
+       x2="18.497854"
+       y1="60.525894"
+       x1="14.193055"
+       id="linearGradient8758"
+       xlink:href="#linearGradient8752"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="44.348099"
+       x2="17.997768"
+       y1="36.416954"
+       x1="17.997768"
+       id="linearGradient8834"
+       xlink:href="#linearGradient8828"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="30.188351"
+       x2="18.143806"
+       y1="29.72571"
+       x1="18.097515"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8818"
+       xlink:href="#linearGradient8808"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="30.431053"
+       x2="18.031723"
+       y1="29.72571"
+       x1="18.097515"
+       id="linearGradient8814"
+       xlink:href="#linearGradient8820"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1,0,0,0.988192,1.4473537,-2.486208)"
+       gradientUnits="userSpaceOnUse"
+       y2="47.757988"
+       x2="11.373499"
+       y1="43.444576"
+       x1="11.373499"
+       id="linearGradient8173"
+       xlink:href="#linearGradient2834"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1,0,0,0.988192,1.4473537,-2.486208)"
+       gradientUnits="userSpaceOnUse"
+       y2="49.067719"
+       x2="13.191773"
+       y1="41.606163"
+       x1="13.191773"
+       id="linearGradient8171"
+       xlink:href="#linearGradient2826"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3364897,0,0,1.3894845,-0.759152,-10.711989)"
+       r="16.390338"
+       fy="25.801632"
+       fx="14.930223"
+       cy="25.801632"
+       cx="14.930223"
+       id="radialGradient8169"
+       xlink:href="#linearGradient2816"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="44.272076"
+       x2="5.5366187"
+       y1="38.950283"
+       x1="12.01321"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6573"
+       xlink:href="#linearGradient6563"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="22.781603"
+       x2="30.5"
+       y1="1.0232024"
+       x1="30.5"
+       id="linearGradient8166"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1,0,0,0.988192,1.5624997,-2.39645)"
+       gradientUnits="userSpaceOnUse"
+       y2="47.022106"
+       x2="15.645709"
+       y1="40.668503"
+       x1="15.645709"
+       id="linearGradient8164"
+       xlink:href="#linearGradient6506"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="43.5"
+       x2="5.6917014"
+       y1="43.5"
+       x1="3.3105288"
+       id="linearGradient6499"
+       xlink:href="#linearGradient6493"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
+       r="9.7225161"
+       fy="39.80859"
+       fx="15.004828"
+       cy="39.80859"
+       cx="15.004828"
+       id="radialGradient5286"
+       xlink:href="#linearGradient5280"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8156">
+      <stop
+         id="stop8158"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
+      <stop
+         id="stop8160"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient8154"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8146"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
     <radialGradient
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8144"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8136">
+      <stop
+         id="stop8138"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop8140" />
+      <stop
+         id="stop8142"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5280"
+       inkscape:collect="always">
+      <stop
+         id="stop5282"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop5284"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6493"
+       inkscape:collect="always">
+      <stop
+         id="stop6495"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6497"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective75"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient8686"
+       inkscape:collect="always">
+      <stop
+         id="stop8688"
+         offset="0"
+         style="stop-color:#fdb751;stop-opacity:1" />
+      <stop
+         id="stop8690"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8808"
+       inkscape:collect="always">
+      <stop
+         id="stop8810"
+         offset="0"
+         style="stop-color:#6e3100;stop-opacity:1;" />
+      <stop
+         id="stop8812"
+         offset="1"
+         style="stop-color:#6e3100;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3958"
-       id="radialGradient3966"
-       cx="9.0640488"
-       cy="21.511742"
-       fx="9.0640488"
-       fy="21.511742"
-       r="16.663956"
-       gradientTransform="matrix(1.68884,0,0,1.716583,-6.243689,-15.89085)"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient8820">
+      <stop
+         style="stop-color:#522400;stop-opacity:1"
+         offset="0"
+         id="stop8822" />
+      <stop
+         style="stop-color:#6e3100;stop-opacity:0;"
+         offset="1"
+         id="stop8824" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8828"
+       inkscape:collect="always">
+      <stop
+         id="stop8830"
+         offset="0"
+         style="stop-color:#dc50cd;stop-opacity:1;" />
+      <stop
+         id="stop8832"
+         offset="1"
+         style="stop-color:#dc50cd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8848"
+       inkscape:collect="always">
+      <stop
+         id="stop8850"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop8852"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8860"
+       inkscape:collect="always">
+      <stop
+         id="stop8862"
+         offset="0"
+         style="stop-color:#3b1941;stop-opacity:1;" />
+      <stop
+         id="stop8864"
+         offset="1"
+         style="stop-color:#a949b9;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8868"
+       inkscape:collect="always">
+      <stop
+         id="stop8870"
+         offset="0"
+         style="stop-color:#3b1941;stop-opacity:1;" />
+      <stop
+         id="stop8872"
+         offset="1"
+         style="stop-color:#a646b7;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8876"
+       inkscape:collect="always">
+      <stop
+         id="stop8878"
+         offset="0"
+         style="stop-color:#9a5ba8;stop-opacity:1;" />
+      <stop
+         id="stop8880"
+         offset="1"
+         style="stop-color:#744380;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8884"
+       inkscape:collect="always">
+      <stop
+         id="stop8886"
+         offset="0"
+         style="stop-color:#9a5ba8;stop-opacity:1;" />
+      <stop
+         id="stop8888"
+         offset="1"
+         style="stop-color:#6b3e75;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8904"
+       inkscape:collect="always">
+      <stop
+         id="stop8906"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1;" />
+      <stop
+         id="stop8908"
+         offset="1"
+         style="stop-color:#25486d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8732"
+       inkscape:collect="always">
+      <stop
+         id="stop8734"
+         offset="0"
+         style="stop-color:#6b3678;stop-opacity:1;" />
+      <stop
+         id="stop8736"
+         offset="1"
+         style="stop-color:#6b3678;stop-opacity:0;" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3968"
-       id="linearGradient3974"
-       x1="16.13257"
-       y1="40.781811"
-       x2="16.13257"
-       y2="48.068741"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient8744">
+      <stop
+         style="stop-color:#7a1d90;stop-opacity:1"
+         offset="0"
+         id="stop8746" />
+      <stop
+         style="stop-color:#6b3678;stop-opacity:0;"
+         offset="1"
+         id="stop8748" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8752"
+       inkscape:collect="always">
+      <stop
+         id="stop8754"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop8756"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3976"
-       id="linearGradient3982"
-       x1="12.095973"
-       y1="40.907658"
-       x2="12.095973"
-       y2="46.463146"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient8732"
+       id="linearGradient8239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6883673,0,0,0.6819755,24.954518,-0.5239125)"
+       x1="4.0852318"
+       y1="40.416641"
+       x2="4.0852318"
+       y2="43.352409" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2850"
-       id="linearGradient3991"
+       xlink:href="#linearGradient8744"
+       id="linearGradient8242"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.769231,0,0,0.714287,-1.230773,-2.285726)"
-       x1="21.785719"
-       y1="28.142857"
-       x2="17.785713"
-       y2="30.07143" />
+       x1="4.0852318"
+       y1="39.097038"
+       x2="4.0852318"
+       y2="44.321774"
+       gradientTransform="matrix(0.6883673,0,0,0.6819755,-0.5307196,-0.5239125)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8686"
+       id="linearGradient8248"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7692307,0,0,0.8858131,-1.2307696,-7.0311428)"
+       x1="18.5"
+       y1="29.911009"
+       x2="19.985121"
+       y2="29.853554" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2816"
+       id="radialGradient8261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7193306,0,0,0.7337558,-19.889272,-7.8067639)"
+       cx="46.861629"
+       cy="38.01083"
+       fx="46.861629"
+       fy="38.01083"
+       r="16.390338" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6506"
+       id="linearGradient8263"
+       gradientUnits="userSpaceOnUse"
+       x1="15.645709"
+       y1="40.956318"
+       x2="15.645709"
+       y2="44.694569"
+       gradientTransform="matrix(0.6894969,0,0,0.6764991,-0.2876444,-0.2797398)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2834"
+       id="linearGradient8266"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7068603,0,0,0.6774341,-33.464679,-11.987365)"
+       x1="58.611423"
+       y1="56.489136"
+       x2="58.611423"
+       y2="61.328545" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2826"
+       id="linearGradient8268"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7068603,0,0,0.6774341,-33.464679,-11.987365)"
+       x1="60.8349"
+       y1="56.601696"
+       x2="60.8349"
+       y2="61.321751" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8868"
+       id="linearGradient8271"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9347751,0,0,0.4640431,-5.8911763,1.552034)"
+       x1="12.409452"
+       y1="10.602999"
+       x2="16.140554"
+       y2="13.895189" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8860"
+       id="linearGradient8274"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0342512,0,0,0.6819755,-6.0896085,-1.7917997)"
+       x1="13.061977"
+       y1="10.027351"
+       x2="16.545418"
+       y2="12.891665" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6537"
+       id="linearGradient8277"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5"
+       y1="1.7319652"
+       x2="30.5"
+       y2="22.781603"
+       gradientTransform="matrix(0.6666666,0,0,0.6587574,0.1666662,-0.1468935)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8904"
+       id="linearGradient8280"
+       gradientUnits="userSpaceOnUse"
+       x1="29.466667"
+       y1="6.8962817"
+       x2="42.829762"
+       y2="37.801281"
+       gradientTransform="matrix(0.6875001,0,0,0.6767003,-0.4687499,-0.5159997)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8876"
+       id="linearGradient8284"
+       gradientUnits="userSpaceOnUse"
+       x1="10.46875"
+       y1="25.3125"
+       x2="9.53125"
+       y2="19.6875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8848"
+       id="linearGradient8286"
+       gradientUnits="userSpaceOnUse"
+       x1="10.48653"
+       y1="25.21174"
+       x2="9.7512932"
+       y2="23.675837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8884"
+       id="linearGradient8288"
+       gradientUnits="userSpaceOnUse"
+       x1="23.881994"
+       y1="24.343237"
+       x2="24.973602"
+       y2="19.216713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8848"
+       id="linearGradient8290"
+       gradientUnits="userSpaceOnUse"
+       x1="10.498732"
+       y1="24.936121"
+       x2="9.6415968"
+       y2="23.675837" />
+    <filter
+       inkscape:collect="always"
+       id="filter9078">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.29164334"
+         id="feGaussianBlur9080" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter9122"
+       x="-0.06288049"
+       width="1.125761"
+       y="-0.22385455"
+       height="1.4477091">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.14573864"
+         id="feGaussianBlur9124" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -348,13 +760,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="17.236022"
-     inkscape:cx="21.944662"
-     inkscape:cy="16.287609"
+     inkscape:cx="25.766946"
+     inkscape:cy="17.060038"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1434"
+     inkscape:window-width="1432"
      inkscape:window-height="840"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -363,7 +775,17 @@
      inkscape:grid-points="false"
      width="32px"
      height="32px"
-     inkscape:object-bbox="true" />
+     inkscape:object-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid8236"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4350">
     <rdf:RDF>
@@ -380,110 +802,167 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0057179"
-       inkscape:original="M 20.53125 1.5 C 17.192693 1.5 14.5 4.611235 14.5 8.46875 L 14.5 20.53125 C 14.5 24.388765 17.192693 27.5 20.53125 27.5 L 34.53125 27.5 L 34.53125 31.09375 L 39.34375 27.5 L 41.5 27.5 C 45.512737 27.5 46.5 24.38319 46.5 20.53125 L 46.5 8.46875 C 46.5 4.6112353 43.807307 1.5 40.46875 1.5 L 20.53125 1.5 z "
-       style="fill:none;fill-opacity:1;stroke:white;stroke-width:1.47727883;stroke-miterlimit:4;stroke-opacity:1"
-       id="path6504"
-       d="M 20.53125,2.5 C 17.817519,2.5 15.5,5.0792547 15.5,8.46875 L 15.5,20.53125 C 15.5,23.920745 17.817519,26.5 20.53125,26.5 L 34.53125,26.5 C 35.082213,26.503178 35.528072,26.949037 35.53125,27.5 L 35.53125,29.09375 L 38.75,26.6875 C 38.923102,26.563771 39.130983,26.498125 39.34375,26.5 L 41.5,26.5 C 43.245978,26.5 44.034662,25.931926 44.625,24.9375 C 45.215338,23.943074 45.5,22.371297 45.5,20.53125 L 45.5,8.46875 C 45.5,5.079255 43.182481,2.5 40.46875,2.5 L 20.53125,2.5 z "
-       transform="matrix(0.67692,0,0,0.67692,0.161535,-0.515354)" />
+       style="fill:#efefef;fill-opacity:1;stroke:url(#linearGradient8280);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 13.646486,0.49905075 C 11.351227,0.49905075 9.5000004,2.6044244 9.5000004,5.2148058 L 9.5000004,13.377503 C 9.5000004,15.987885 11.351227,18.470375 13.646486,18.470375 L 23.588406,18.470375 C 23.588406,18.470375 23.18568,20.245193 22.16985,21.5 C 25.739035,21.5 26.597376,19.058605 26.597376,18.460569 L 28.062501,18.470375 C 30.821257,18.470375 31.500001,15.984112 31.500001,13.377503 L 31.500001,5.2148058 C 31.500001,2.6044246 29.648775,0.49905075 27.353517,0.49905075 L 13.646486,0.49905075 z"
+       id="path8201"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:url(#linearGradient8277);fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 13.854166,1.5 C 12.0438,1.5 10.5,3.1982064 10.5,5.4319585 L 10.5,13.37822 C 10.5,15.611972 12.0438,17.310178 13.854166,17.310178 L 23.854707,17.310178 C 24.222455,17.311225 24.520314,17.605549 24.521373,17.968936 C 24.521373,17.968936 24.644478,19.146784 24.232611,19.890811 C 25.286204,19.513694 25.854166,17.433696 25.854166,17.433696 C 25.969506,17.352067 26.108135,17.30881 26.249999,17.310178 L 27.833332,17.310178 C 28.997823,17.310178 29.543634,16.936466 29.9375,16.280871 C 30.331365,15.625274 30.5,14.590529 30.5,13.37822 L 30.5,5.4319585 C 30.5,3.1982066 28.956198,1.5 27.145833,1.5 L 13.854166,1.5 z"
+       id="path8203"
+       sodipodi:nodetypes="ccccccccccscccc" />
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8734"
+       width="4.8185711"
+       height="1.2686747"
+       x="10.237393"
+       y="17.486546"
+       rx="0.5602473"
+       ry="0.63433737" />
     <path
-       style="fill:#efefef;fill-opacity:1;stroke:#787878;stroke-width:1.46586692;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 20.53125,1.5 C 17.192693,1.5 14.5,4.611235 14.5,8.46875 L 14.5,20.53125 C 14.5,24.388765 17.428915,28.139948 20.767472,28.139948 L 33.409288,28.041495 L 33.415412,31.845969 L 38.723454,28.076231 L 42.130099,28.139948 C 46.142836,28.139948 46.5,24.580097 46.5,20.728157 L 46.5,8.46875 C 46.5,4.6112353 43.807307,1.5 40.46875,1.5 L 20.53125,1.5 z "
-       id="rect5498"
-       sodipodi:nodetypes="cccccccccccc"
-       transform="matrix(0.687501,0,0,0.67692,-0.468758,-0.515381)" />
+       style="fill:url(#linearGradient8274);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 6,4.9064736 C 7.9672058,3.6750483 11.311019,5.8704952 11.667854,7 L 8.951995,7 C 8.9089721,5.4016199 6,4.9064736 6,4.9064736 z"
+       id="path8205"
+       sodipodi:nodetypes="cccc" />
     <path
-       transform="matrix(0.668893,0,0,0.668627,8.626692e-2,-0.192463)"
-       style="fill:url(#linearGradient6543);fill-opacity:1;stroke:white;stroke-width:1.49530375;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 20.53125,2.53125 C 17.841732,2.53125 15.53125,5.0973912 15.53125,8.46875 L 15.53125,20.53125 C 15.53125,23.902609 17.841732,26.46875 20.53125,26.46875 L 33.967629,26.46875 C 34.534122,26.476048 34.991581,26.933507 34.998879,27.5 L 34.998879,29 L 38.71875,26.65625 C 38.901723,26.528628 39.120742,26.462922 39.34375,26.46875 L 42.415884,26.46875 C 45.139435,26.46875 45.46875,24.282574 45.46875,20.53125 L 45.46875,8.46875 C 45.46875,5.0973915 43.158268,2.53125 40.46875,2.53125 L 20.53125,2.53125 z "
-       id="path6535"
-       sodipodi:nodetypes="cccccccccccccc" />
+       style="fill:url(#linearGradient8271);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 5,6.7464464 C 6.2268113,5.1783371 10,6.3940033 10,7.5343215 L 7.134176,8 C 8.0531299,6.6379921 5,6.7464464 5,6.7464464 z"
+       id="path8207"
+       sodipodi:nodetypes="cccc" />
     <path
-       style="opacity:1;fill:url(#linearGradient3974);fill-opacity:1.0;stroke:url(#linearGradient3982);stroke-width:1.51128328;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 4.8460021,40.483064 0.49299658,38.484005 0.052646307,45.33795 C 0.052646307,47.422072 1.0380664,48.413461 3.1446965,48.413461 C 4.3321851,48.413461 29.360035,48.5596 32.051034,48.5596 C 34.165161,48.5596 34,46.5 34,46.5 C 34,43.834589 27.597902,41.598052 25.813453,39.641526 C 23.985035,37.640505 26,30.5 26,30.5 C 26.641306,28.9702 27,27.275084 27,25.5 C 27,18.600001 21.624002,13 15,13 z "
-       id="path5176"
-       sodipodi:nodetypes="cccccszcsc"
-       transform="matrix(0.67692,0,0,0.646801,0.464358,-0.908413)" />
+       style="fill:url(#linearGradient8266);fill-opacity:1;stroke:url(#linearGradient8268);stroke-width:0.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.067522,6.4999996 C 6.385278,6.4999996 2.2201068,10.234965 2.6293774,14.884611 C 3.5249724,25.059298 0.81309749,23.680419 0.50183135,28.323515 C 0.50183135,29.735371 1.1983857,30.406973 2.6874788,30.406973 C 3.5268674,30.406973 21.218061,30.505972 23.120221,30.505972 C 24.614613,30.505972 24.497868,29.110729 24.497868,29.110729 C 24.497868,27.305087 19.972479,25.789981 18.711123,24.464564 C 17.418686,23.109004 18.842985,18.271782 18.842985,18.271782 C 19.296299,17.235443 19.549846,16.087114 19.549846,14.884611 C 19.549846,10.210316 15.749766,6.4999996 11.067522,6.4999996 z"
+       id="path8209"
+       sodipodi:nodetypes="cscccszcsc" />
     <path
-       style="opacity:0.5;fill:url(#radialGradient3966);fill-opacity:1.0;stroke:url(#linearGradient6512);stroke-width:1.55319357;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 15,14.0625 C 8.9877035,14.0625 4.0789961,19.13808 4.0625,25.46875 C 4.0624722,25.479427 4.0625,25.489316 4.0625,25.5 C 4.9744187,33.020507 4.3062656,37.469969 2.59375,40.59375 C -0.19778709,46.24536 1.5610206,47.490284 3.9033639,47.490284 C 5.8399452,47.490284 23.958121,47.46049 29.784094,47.46049 C 30.951301,47.46049 32.9375,47.964563 32.9375,46.5 C 32.9375,46.278257 32.737749,45.861323 32.1875,45.34375 C 31.637251,44.826177 30.81426,44.270409 29.90625,43.71875 C 28.99824,43.167091 28.02821,42.609033 27.15625,42.0625 C 26.28429,41.515967 25.511654,41.005793 24.96875,40.28125 C 24.358745,39.467156 24.078806,38.510169 24.024342,37.46875 C 23.969878,36.427331 24.107721,35.310041 24.224561,34.25 C 24.458241,32.129917 24.96875,30.28125 24.96875,30.28125 C 24.98374,30.216952 25.004663,30.154183 25.03125,30.09375 C 25.618731,28.692346 25.9375,27.131297 25.9375,25.5 C 25.9375,19.154404 21.022436,14.0625 15,14.0625 z "
-       id="path5241"
-       sodipodi:nodetypes="csscccssssssscssc"
-       transform="matrix(0.660903,0,0,0.627207,0.731515,-0.320103)" />
+       style="opacity:0.55;fill:url(#radialGradient8261);fill-opacity:1;stroke:url(#linearGradient8263);stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 10.916681,7.4999998 C 6.7712212,7.4999998 3.1789143,10.957612 3.5045886,15.167484 C 3.8937578,20.198131 3.7235067,21.924032 2.4866618,25.116843 C 0.50096208,28.326958 1.8660136,29.846841 3.4810518,29.846841 C 4.8163187,29.846841 17.103621,29.826924 21.120612,29.826924 C 21.925398,29.826924 23.294875,30.163902 23.294875,29.184825 C 23.294875,29.036588 23.157148,28.757863 22.777754,28.411859 C 22.398357,28.065856 21.830907,27.694319 21.204838,27.325529 C 20.578767,26.956739 19.909935,26.583672 19.308721,26.218308 C 18.707508,25.852945 18.174778,25.511888 17.800447,25.027522 C 17.379851,24.483292 17.186833,23.843536 17.14928,23.147336 C 17.111728,22.451136 17.206769,21.704215 17.28733,20.995566 C 17.448452,19.578267 17.800447,18.342413 17.800447,18.342413 C 17.810782,18.299429 17.825209,18.257467 17.84354,18.217067 C 18.248606,17.280213 18.468397,16.236634 18.468397,15.146094 C 18.468397,10.903994 15.069132,7.4999998 10.916681,7.4999998 z"
+       id="path8211"
+       sodipodi:nodetypes="cscccssssssscssc" />
     <path
-       style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 5.0726004,12.086499 C 6.6079483,10.449324 9.1057173,10.885492 10.086057,11.930848 C 11.429483,13.36337 11.273722,15.85472 9.7383746,17.491894 C 8.4041332,18.914624 6.2095475,19.660821 4.8661202,18.228299 C 3.5226923,16.795776 3.8596213,13.379925 5.0726004,12.086499 z "
-       id="path5160"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.0174263"
+       inkscape:original="M 9.96875 19 C 8.022221 19 6.9374998 21.081214 6.9375 23 C 6.9375 25.208 8.5222219 27 10.46875 27 C 11.889191 27 14 25.489251 14 23.28125 C 14 21.536852 11.915281 19 9.96875 19 z "
+       style="fill:url(#linearGradient8284);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       id="path8838"
+       d="M 9.96875,17.96875 C 8.6328774,17.96875 7.5286409,18.753017 6.875,19.71875 C 6.2213591,20.684483 5.9062499,21.848884 5.90625,23 C 5.90625,25.694817 7.8977844,28.03125 10.46875,28.03125 C 11.539674,28.03125 12.596335,27.527372 13.46875,26.71875 C 14.341165,25.910128 15.03125,24.709464 15.03125,23.28125 C 15.03125,22.003744 14.362496,20.808851 13.46875,19.8125 C 12.575004,18.816149 11.384009,17.96875 9.96875,17.96875 z"
+       transform="matrix(0.8767124,0,0,0.795031,-1.1780825,-4.2857136)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 11,14.217567 C 11,15.873567 9.2097808,17 8.0022573,17 C 6.3475044,17 5.0045159,15.655999 5.0045159,14 C 5.0045159,12.56091 5.9251197,11 7.5798726,11 C 9.2346277,11 11,12.909268 11,14.217567 z"
+       id="path8214"
        sodipodi:nodetypes="csssc" />
     <path
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5157"
-       sodipodi:nodetypes="csssc"
-       transform="matrix(1.010846,0,0,1.029732,-3.562503,-10.12874)" />
+       sodipodi:type="arc"
+       style="fill:#6b1a80;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8216"
+       sodipodi:cx="10.169642"
+       sodipodi:cy="24.3125"
+       sodipodi:rx="1.2410715"
+       sodipodi:ry="1.2946428"
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(1.2086331,0,0,1.1586209,-4.7913664,-13.66897)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5162"
+       style="fill:url(#linearGradient8286);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5164"
        sodipodi:cx="10.169642"
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208633,0,0,1.158621,-4.791365,-12.66897)" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.4028777,0,0,0.3862069,3.4028779,5.1103446)" />
     <path
-       transform="matrix(0.596326,-0.813274,-0.562251,-0.766804,24.4163,42.47989)"
-       style="opacity:1;fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5167"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.0250763"
+       inkscape:original="M 24.71875 19 C 23.921039 19.030682 23.197708 19.355158 22.78125 19.8125 C 21.639847 21.065961 21.758036 23.254972 23.0625 24.6875 C 24.196099 25.932389 26.077347 26.565958 27.21875 25.3125 C 28.360153 24.05904 28.061824 21.069247 27.03125 19.9375 C 26.379019 19.221236 25.516461 18.969318 24.71875 19 z "
+       style="fill:url(#linearGradient8288);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       id="path8846"
+       d="M 24.6875,17.96875 C 23.636213,18.009185 22.683031,18.409233 22.03125,19.125 C 20.466122,20.843786 20.678782,23.580894 22.3125,25.375 C 23.011072,26.142154 23.917332,26.724837 24.9375,26.9375 C 25.957668,27.150163 27.151401,26.89759 27.96875,26 C 28.842555,25.04041 29.039766,23.753975 28.96875,22.53125 C 28.897734,21.308525 28.565932,20.111716 27.78125,19.25 C 26.906665,18.289553 25.728905,17.928695 24.6875,17.96875 z"
+       transform="matrix(0.7484239,0,0,0.7741119,-1.6908405,-3.9075188)" />
     <path
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
-       id="path5169"
-       sodipodi:nodetypes="csssc"
-       transform="matrix(0.447398,-0.542185,-0.421833,-0.511203,23.06465,33.31996)" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 18.387083,11.67906 C 17.509743,10.655828 16.082447,10.928433 15.522253,11.58178 C 14.754581,12.477109 14.843587,14.034201 15.720929,15.057435 C 16.483351,15.94664 17.737401,16.413013 18.505073,15.517687 C 19.272745,14.622358 19.080214,12.487451 18.387083,11.67906 z"
+       id="path8220"
+       sodipodi:nodetypes="csssc" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5171"
+       style="fill:#6b1a80;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8222"
        sodipodi:cx="10.169642"
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208633,0,0,1.158621,5.208632,-12.66896)" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.8057552,0,0,1.1586207,7.8057579,-13.668966)" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.45127434"
+       inkscape:original="M 13.4375 16 C 12.661218 16 12.51015 20.901969 8 18.0625 C 9.44341 21.526853 12.98614 22.15225 14.4375 23 C 15.186206 22.224914 17.79624 20.07567 18 17.6875 C 14.33672 20.56768 14.203099 16 13.4375 16 z "
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter9078)"
+       id="path8294"
+       d="M 13.4375,15.5625 C 13.102994,15.5625 12.900231,15.762242 12.78125,15.9375 C 12.662269,16.112758 12.598408,16.320422 12.5,16.53125 C 12.303184,16.952907 12.081096,17.438832 11.78125,17.8125 C 11.481404,18.186168 11.117515,18.452218 10.59375,18.5 C 10.069985,18.547782 9.3270345,18.365572 8.25,17.6875 C 8.0823108,17.580065 7.8640254,17.595242 7.7128173,17.724849 C 7.5616092,17.854456 7.5132259,18.067852 7.59375,18.25 C 9.1305666,21.93854 12.960094,22.63981 14.21875,23.375 C 14.390432,23.472658 14.605671,23.447336 14.75,23.3125 C 15.08711,22.963512 15.981008,22.217382 16.78125,21.25 C 17.581492,20.282618 18.32272,19.06403 18.4375,17.71875 C 18.441912,17.546498 18.34786,17.386764 18.195094,17.30706 C 18.042327,17.227356 17.857509,17.241591 17.71875,17.34375 C 16.849538,18.02715 16.256503,18.203898 15.875,18.1875 C 15.493497,18.171102 15.246785,17.984965 15,17.65625 C 14.753215,17.327535 14.557786,16.863539 14.375,16.46875 C 14.283607,16.271356 14.181058,16.105684 14.0625,15.9375 C 13.943942,15.769316 13.757564,15.5625 13.4375,15.5625 z" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.28790623"
+       inkscape:original="M 11.5 17 C 11.223 17 11 17.223 11 17.5 C 11 17.777 11.223 18 11.5 18 L 15.5 18 C 15.777 18 16 17.777 16 17.5 C 16 17.223 15.777 17 15.5 17 L 11.5 17 z "
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter9122)"
+       id="path9084"
+       d="M 11.5,16.71875 C 11.06848,16.71875 10.71875,17.06848 10.71875,17.5 C 10.71875,17.93152 11.06848,18.28125 11.5,18.28125 L 15.5,18.28125 C 15.93152,18.28125 16.28125,17.93152 16.28125,17.5 C 16.28125,17.06848 15.93152,16.71875 15.5,16.71875 L 11.5,16.71875 z" />
     <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5215"
-       width="4.4400907"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8226"
+       width="5"
        height="1"
-       x="10.535856"
-       y="18"
-       rx="0.69182354"
+       x="11"
+       y="17"
+       rx="0.5"
        ry="0.5" />
     <path
-       transform="matrix(0.670792,0,0,0.486348,-1.815475,1.13962)"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.651119,11.193815 C 13.577759,8.2509126 16.249277,11.481501 17.614226,12.804399 L 14.761306,13.747613 L 11.651119,11.193815 z "
-       id="path5192"
-       sodipodi:nodetypes="cccc" />
+       style="fill:url(#linearGradient8248);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 8,18.051818 C 12.51015,20.891288 12.65519,16 13.431472,16 C 14.197071,16 14.33672,20.582306 18,17.702126 C 17.79624,20.090296 15.178764,22.224914 14.430058,23 C 12.978698,22.15225 9.44341,21.516171 8,18.051818 z"
+       id="rect5187"
+       sodipodi:nodetypes="czccc" />
     <path
-       transform="matrix(0.851014,0,0,0.554879,-1.947706,-0.153319)"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.689238,9.8218679 C 13.591296,8.0161941 17.174576,11.994261 17.519594,13.650486 L 14.543472,12.891665 L 11.689238,9.8218679 z "
-       id="rect5189"
-       sodipodi:nodetypes="cccc" />
+       sodipodi:type="arc"
+       style="opacity:0.61111108999999997;fill:url(#linearGradient8814);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8806"
+       sodipodi:cx="18.097515"
+       sodipodi:cy="29.72571"
+       sodipodi:rx="0.28726214"
+       sodipodi:ry="0.6408155"
+       d="M 18.384777,29.72571 A 0.28726214,0.6408155 0 1 1 17.810253,29.72571 A 0.28726214,0.6408155 0 1 1 18.384777,29.72571 z"
+       transform="matrix(-1.0945739,0.462613,0.6067759,0.7520251,16.272223,-11.226626)" />
     <path
-       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8,18.893438 C 13.088512,22.243015 12.655188,17 13.431469,17 C 14.197069,17 13.699301,22.201991 18,18.895644 C 17.267157,20.102946 15.014668,22 14.06507,22 C 13.104781,22 9.1908718,20.676807 8,18.893438 z "
-       id="path3987"
-       sodipodi:nodetypes="czczc" />
+       sodipodi:type="arc"
+       style="opacity:0.61111108999999997;fill:url(#linearGradient8818);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8816"
+       sodipodi:cx="18.097515"
+       sodipodi:cy="29.72571"
+       sodipodi:rx="0.28726214"
+       sodipodi:ry="0.6408155"
+       d="M 18.384777,29.72571 A 0.28726214,0.6408155 0 1 1 17.810253,29.72571 A 0.28726214,0.6408155 0 1 1 18.384777,29.72571 z"
+       transform="matrix(1.0945739,0.462613,-0.606776,0.7520251,10.727779,-11.226626)" />
     <path
-       style="fill:url(#linearGradient3991);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 8,18.893439 C 12.740404,23.171305 12.655188,17 13.431469,17 C 14.197069,17 13.641283,22.027939 18,18.895646 C 17.267157,20.102947 15.014668,22 14.06507,22 C 13.104781,22 9.1908731,20.676809 8,18.893439 z "
-       id="path3989"
-       sodipodi:nodetypes="czczc" />
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient8290);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8856"
+       sodipodi:cx="10.169642"
+       sodipodi:cy="24.3125"
+       sodipodi:rx="1.2410715"
+       sodipodi:ry="1.2946428"
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.4028777,0,0,0.3862069,11.402878,5.110345)" />
+    <path
+       style="opacity:0.61111109;fill:url(#linearGradient8242);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 1.79252,30.122362 C 0.67392318,29.866621 0.24369361,27.479706 2.3518185,23.856712 C 3.1851311,27.272027 7.0413207,29.73875 7.0413207,29.73875 L 1.79252,30.122362 z"
+       id="rect7959"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:0.61111109;fill:url(#linearGradient8239);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 22.631278,30.122362 C 23.749876,29.866621 24.782427,28.50267 19.275488,25.774768 C 19.517749,28.593354 17.382477,29.73875 17.382477,29.73875 L 22.631278,30.122362 z"
+       id="path8740"
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png b/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png
index ff43d9010b..473c1af2f8 100644
--- a/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
index e877ac35d6..e5408d92a5 100644
--- a/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -13,31 +13,183 @@
    height="48px"
    id="svg4345"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.46"
    sodipodi:docbase="/home/hbons/Desktop/2.0.2/pidgin/pixmaps/icons/48/scalable"
    sodipodi:docname="pidgin.svg"
    inkscape:export-filename="/home/hbons/Desktop/pidgin48.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4347">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2850">
+       id="linearGradient8752">
       <stop
-         style="stop-color:#ce5c00;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop2852" />
+         id="stop8754" />
       <stop
-         style="stop-color:#ce5c00;stop-opacity:0;"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop2854" />
+         id="stop8756" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8744"
+       inkscape:collect="always">
+      <stop
+         id="stop8746"
+         offset="0"
+         style="stop-color:#7a1d90;stop-opacity:1" />
+      <stop
+         id="stop8748"
+         offset="1"
+         style="stop-color:#6b3678;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8732">
+      <stop
+         style="stop-color:#6b3678;stop-opacity:1;"
+         offset="0"
+         id="stop8734" />
+      <stop
+         style="stop-color:#6b3678;stop-opacity:0;"
+         offset="1"
+         id="stop8736" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8904">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop8906" />
+      <stop
+         style="stop-color:#25486d;stop-opacity:1"
+         offset="1"
+         id="stop8908" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8884">
+      <stop
+         style="stop-color:#9a5ba8;stop-opacity:1;"
+         offset="0"
+         id="stop8886" />
+      <stop
+         style="stop-color:#6b3e75;stop-opacity:1"
+         offset="1"
+         id="stop8888" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8876">
+      <stop
+         style="stop-color:#9a5ba8;stop-opacity:1;"
+         offset="0"
+         id="stop8878" />
+      <stop
+         style="stop-color:#744380;stop-opacity:1"
+         offset="1"
+         id="stop8880" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8868">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop8870" />
+      <stop
+         style="stop-color:#a646b7;stop-opacity:1"
+         offset="1"
+         id="stop8872" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8860">
+      <stop
+         style="stop-color:#3b1941;stop-opacity:1;"
+         offset="0"
+         id="stop8862" />
+      <stop
+         style="stop-color:#a949b9;stop-opacity:1"
+         offset="1"
+         id="stop8864" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8848">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8850" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop8852" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8828">
+      <stop
+         style="stop-color:#dc50cd;stop-opacity:1;"
+         offset="0"
+         id="stop8830" />
+      <stop
+         style="stop-color:#dc50cd;stop-opacity:0;"
+         offset="1"
+         id="stop8832" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8820"
+       inkscape:collect="always">
+      <stop
+         id="stop8822"
+         offset="0"
+         style="stop-color:#522400;stop-opacity:1" />
+      <stop
+         id="stop8824"
+         offset="1"
+         style="stop-color:#6e3100;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8808">
+      <stop
+         style="stop-color:#6e3100;stop-opacity:1;"
+         offset="0"
+         id="stop8810" />
+      <stop
+         style="stop-color:#6e3100;stop-opacity:0;"
+         offset="1"
+         id="stop8812" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient8686">
+      <stop
+         style="stop-color:#fdb751;stop-opacity:1"
+         offset="0"
+         id="stop8688" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1"
+         offset="1"
+         id="stop8690" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective75" />
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient2834">
       <stop
-         style="stop-color:#82508e;stop-opacity:1;"
+         style="stop-color:#7e408d;stop-opacity:1"
          offset="0"
          id="stop2836" />
       <stop
@@ -61,7 +213,7 @@
        inkscape:collect="always"
        id="linearGradient2816">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:1"
          offset="0"
          id="stop2818" />
       <stop
@@ -89,7 +241,7 @@
          offset="0"
          id="stop6539" />
       <stop
-         style="stop-color:white;stop-opacity:0;"
+         style="stop-color:#d3e1f1;stop-opacity:1"
          offset="1"
          id="stop6541" />
     </linearGradient>
@@ -97,7 +249,7 @@
        inkscape:collect="always"
        id="linearGradient6506">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.95477384"
          offset="0"
          id="stop6508" />
       <stop
@@ -225,19 +377,19 @@
        xlink:href="#linearGradient6506"
        id="linearGradient6512"
        x1="15.645709"
-       y1="41.751736"
+       y1="40.668503"
        x2="15.645709"
-       y2="47.370037"
+       y2="47.022106"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.988192,0.5625,-1.39645)" />
+       gradientTransform="matrix(1,0,0,0.988192,1.5624997,-2.39645)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient6537"
        id="linearGradient6543"
        x1="30.5"
-       y1="5.7732024"
+       y1="1.0232024"
        x2="30.5"
-       y2="19.518673"
+       y2="22.781603"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -252,12 +404,12 @@
        inkscape:collect="always"
        xlink:href="#linearGradient2816"
        id="radialGradient2824"
-       cx="9.4288578"
-       cy="19.283415"
-       fx="9.4288578"
-       fy="19.283415"
+       cx="14.930223"
+       cy="25.801632"
+       fx="14.930223"
+       fy="25.801632"
        r="16.390338"
-       gradientTransform="matrix(1.556432,0,0,1.618148,-5.04294,-15.39321)"
+       gradientTransform="matrix(1.3364897,0,0,1.3894845,-0.759152,-10.711989)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -266,27 +418,187 @@
        x1="13.191773"
        y1="41.606163"
        x2="13.191773"
-       y2="47.843258"
-       gradientUnits="userSpaceOnUse" />
+       y2="49.067719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.988192,1.4473537,-2.486208)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2834"
        id="linearGradient2840"
        x1="11.373499"
-       y1="41.566242"
+       y1="43.444576"
        x2="11.373499"
-       y2="47.746658"
+       y2="47.757988"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.988192,1.4473537,-2.486208)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8686"
+       id="linearGradient8692"
+       x1="18.5"
+       y1="29.911009"
+       x2="19.985121"
+       y2="29.853554"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0769231,0,0,1.1428571,-0.905101,-4.6800586)" />
+    <filter
+       inkscape:collect="always"
+       id="filter8730">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.27197245"
+         id="feGaussianBlur8732" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter8792"
+       x="-0.095301818"
+       width="1.1906036"
+       y="-0.27704017"
+       height="1.5540803">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.31022727"
+         id="feGaussianBlur8794" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8820"
+       id="linearGradient8814"
+       x1="18.339697"
+       y1="29.338558"
+       x2="18.031723"
+       y2="30.431053"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8808"
+       id="linearGradient8818"
+       gradientUnits="userSpaceOnUse"
+       x1="17.969458"
+       y1="29.494703"
+       x2="18.143806"
+       y2="30.188351" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8828"
+       id="linearGradient8834"
+       x1="17.997768"
+       y1="36.416954"
+       x2="17.997768"
+       y2="44.348099"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8848"
+       id="linearGradient8854"
+       x1="10.48653"
+       y1="25.21174"
+       x2="9.7512932"
+       y2="23.675837"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8848"
+       id="linearGradient8858"
+       gradientUnits="userSpaceOnUse"
+       x1="10.498732"
+       y1="24.936121"
+       x2="9.6415968"
+       y2="23.675837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8860"
+       id="linearGradient8866"
+       x1="13.061977"
+       y1="10.027351"
+       x2="16.545418"
+       y2="12.891665"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50247,0,0,1,-6.5946403,-2.139701)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8868"
+       id="linearGradient8874"
+       x1="12.409452"
+       y1="10.602999"
+       x2="16.140554"
+       y2="13.895189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.236264,0,0,0.549587,-5.4828863,3.775206)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8876"
+       id="linearGradient8882"
+       x1="10.46875"
+       y1="25.3125"
+       x2="9.53125"
+       y2="19.6875"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8884"
+       id="linearGradient8890"
+       x1="23.881994"
+       y1="24.343237"
+       x2="24.973602"
+       y2="19.216713"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8904"
+       id="linearGradient8910"
+       x1="26.125"
+       y1="1.8037834"
+       x2="41.875"
+       y2="33.678783"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6537"
+       id="linearGradient8913"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5"
+       y1="4.8871226"
+       x2="30.5"
+       y2="22.781603" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8744"
+       id="linearGradient8738"
+       x1="4.0852318"
+       y1="39.097038"
+       x2="4.0852318"
+       y2="44.321774"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8732"
+       id="linearGradient8742"
+       gradientUnits="userSpaceOnUse"
+       x1="4.0852318"
+       y1="40.416641"
+       x2="4.0852318"
+       y2="43.352409"
+       gradientTransform="matrix(-1,0,0,1,37.022732,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8752"
+       id="linearGradient8758"
+       x1="14.193055"
+       y1="60.525894"
+       x2="18.497854"
+       y2="28.364647"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2850"
-       id="linearGradient2856"
-       x1="21.785719"
-       y1="28.142857"
-       x2="17.785713"
-       y2="30.07143"
+       xlink:href="#linearGradient6537"
+       id="linearGradient7977"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-0.999982)" />
+       x1="30.5"
+       y1="4.8871226"
+       x2="30.5"
+       y2="22.781603" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -295,20 +607,30 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="14"
-     inkscape:cx="34.459692"
-     inkscape:cy="22.220728"
+     inkscape:zoom="2.828427"
+     inkscape:cx="63.722923"
+     inkscape:cy="33.120105"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      inkscape:window-width="1434"
      inkscape:window-height="840"
-     inkscape:window-x="0"
+     inkscape:window-x="-2"
      inkscape:window-y="0"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:grid-points="true" />
+     inkscape:grid-points="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7914"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4350">
     <rdf:RDF>
@@ -324,137 +646,168 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       style="opacity:0.23144106;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6514"
-       width="36.000004"
-       height="2.9999979"
-       x="-4.4446878"
-       y="57.424854"
-       rx="2.0412357"
-       ry="1.4999989" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0057179"
-       inkscape:original="M 20.53125 1.5 C 17.192693 1.5 14.5 4.611235 14.5 8.46875 L 14.5 20.53125 C 14.5 24.388765 17.192693 27.5 20.53125 27.5 L 34.53125 27.5 L 34.53125 31.09375 L 39.34375 27.5 L 41.5 27.5 C 45.512737 27.5 46.5 24.38319 46.5 20.53125 L 46.5 8.46875 C 46.5 4.6112353 43.807307 1.5 40.46875 1.5 L 20.53125 1.5 z "
-       style="fill:none;fill-opacity:1;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="path6504"
-       d="M 20.53125,2.5 C 17.817519,2.5 15.5,5.0792547 15.5,8.46875 L 15.5,20.53125 C 15.5,23.920745 17.817519,26.5 20.53125,26.5 L 34.53125,26.5 C 35.082213,26.503178 35.528072,26.949037 35.53125,27.5 L 35.53125,29.09375 L 38.75,26.6875 C 38.923102,26.563771 39.130983,26.498125 39.34375,26.5 L 41.5,26.5 C 43.245978,26.5 44.034662,25.931926 44.625,24.9375 C 45.215338,23.943074 45.5,22.371297 45.5,20.53125 L 45.5,8.46875 C 45.5,5.079255 43.182481,2.5 40.46875,2.5 L 20.53125,2.5 z " />
-    <path
-       style="fill:#efefef;fill-opacity:1;stroke:#787878;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 20.53125,1.5 C 17.192693,1.5 14.5,4.611235 14.5,8.46875 L 14.5,20.53125 C 14.5,24.388765 17.192693,27.5 20.53125,27.5 L 34.530203,27.5 L 34.530203,31.107567 L 39.353553,27.485509 L 41.5,27.5 C 45.512737,27.5 46.5,24.38319 46.5,20.53125 L 46.5,8.46875 C 46.5,4.6112353 43.807307,1.5 40.46875,1.5 L 20.53125,1.5 z "
+       style="fill:#efefef;fill-opacity:1;stroke:url(#linearGradient8910);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 20.53125,1.5 C 17.192693,1.5 14.5,4.611235 14.5,8.46875 L 14.5,20.53125 C 14.5,24.388765 17.192693,27.5 20.53125,27.5 L 34.530203,27.5 C 34.530203,27.5 34.406442,30.680041 32.92887,32.534344 C 38.120414,32.534344 39.353553,27.485509 39.353553,27.485509 L 41.5,27.5 C 45.512737,27.5 46.5,24.38319 46.5,20.53125 L 46.5,8.46875 C 46.5,4.6112353 43.807307,1.5 40.46875,1.5 L 20.53125,1.5 z"
        id="rect5498"
        sodipodi:nodetypes="cccccccccccc" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.044691"
-       inkscape:original="M 20.53125 1.5 C 17.192693 1.5 14.5 4.611235 14.5 8.46875 L 14.5 20.53125 C 14.5 24.388765 17.192693 27.5 20.53125 27.5 L 34.53125 27.5 L 34.53125 31.09375 L 39.34375 27.5 L 41.5 27.5 C 45.512737 27.5 46.5 24.38319 46.5 20.53125 L 46.5 8.46875 C 46.5 4.6112353 43.807307 1.5 40.46875 1.5 L 20.53125 1.5 z "
-       style="fill:url(#linearGradient6543);fill-opacity:1.0;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       style="fill:url(#linearGradient7977);fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 20.53125,2.5 C 17.815701,2.5 15.5,5.0778932 15.5,8.46875 L 15.5,20.53125 C 15.5,23.922107 17.815701,26.5 20.53125,26.5 L 34.53125,26.5 C 35.082875,26.501589 35.529661,26.948375 35.53125,27.5 C 35.53125,27.5 35.367799,30.212738 34.75,31.34218 C 36.852551,31.34218 38.53125,26.6875 38.53125,26.6875 C 38.704261,26.563588 38.912203,26.497922 39.125,26.5 L 41.5,26.5 C 43.246736,26.5 44.065452,25.932701 44.65625,24.9375 C 45.247048,23.942299 45.5,22.371547 45.5,20.53125 L 45.5,8.46875 C 45.5,5.0778935 43.184299,2.5 40.46875,2.5 L 20.53125,2.5 z"
        id="path6535"
-       d="M 20.53125,2.53125 C 17.841732,2.53125 15.53125,5.0973912 15.53125,8.46875 L 15.53125,20.53125 C 15.53125,23.902609 17.841732,26.46875 20.53125,26.46875 L 34.53125,26.46875 C 35.097743,26.476048 35.555202,26.933507 35.5625,27.5 L 35.5625,29 L 38.71875,26.65625 C 38.901723,26.528628 39.120742,26.462922 39.34375,26.46875 L 41.5,26.46875 C 43.235888,26.46875 44.009537,25.921608 44.59375,24.9375 C 45.177963,23.953392 45.46875,22.367968 45.46875,20.53125 L 45.46875,8.46875 C 45.46875,5.0973915 43.158268,2.53125 40.46875,2.53125 L 20.53125,2.53125 z " />
+       sodipodi:nodetypes="ccccccccccscccc" />
+    <rect
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8734"
+       width="7"
+       height="1.8602936"
+       x="15.642976"
+       y="26.409245"
+       rx="0.81387848"
+       ry="0.93014681" />
+    <path
+       style="fill:url(#linearGradient8866);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 10.968089,7.6821669 C 13.825874,5.8764931 18.683474,9.095739 19.201853,10.751964 L 15.25649,10.751964 C 15.19399,8.408214 10.968089,7.6821669 10.968089,7.6821669 z"
+       id="rect5189"
+       sodipodi:nodetypes="cccc" />
     <path
-       style="opacity:1;fill:url(#linearGradient2840);fill-opacity:1.0;stroke:url(#linearGradient2832);stroke-width:1.00595677;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 15,13 C 8.3759979,13 3,18.600001 3,25.5 C 4.8460021,40.483064 0.49299658,38.484005 0.052646307,45.33795 C 0.052646307,47.422072 1.0380664,48.413461 3.1446965,48.413461 C 4.3321851,48.413461 29.360035,48.5596 32.051034,48.5596 C 34.165161,48.5596 34,46.5 34,46.5 C 34,43.834589 27.597902,41.598052 25.813453,39.641526 C 23.985035,37.640505 26,30.5 26,30.5 C 26.641306,28.9702 27,27.275084 27,25.5 C 27,18.600001 21.624002,13 15,13 z "
+       style="fill:url(#linearGradient8874);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 8.9209727,9.9271812 C 10.543462,8.0699992 15.5336,9.5097671 15.5336,10.860297 L 11.743475,11.411821 C 12.958815,9.7987339 8.9209727,9.9271812 8.9209727,9.9271812 z"
+       id="path5192"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:1;fill:url(#linearGradient2840);fill-opacity:1;stroke:url(#linearGradient2832);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.447354,10.481822 C 9.8233516,10.481822 3.9308558,15.93012 4.5098537,22.712688 C 5.7768579,37.554787 1.9403503,35.543378 1.5,42.316391 C 1.5,44.375904 2.4854201,45.355587 4.5920502,45.355587 C 5.7795388,45.355587 30.807389,45.5 33.498388,45.5 C 35.612515,45.5 35.447354,43.46472 35.447354,43.46472 C 35.447354,40.830782 29.045256,38.620654 27.260807,36.687231 C 25.432389,34.709838 27.447354,27.653648 27.447354,27.653648 C 28.08866,26.141912 28.447354,24.466812 28.447354,22.712688 C 28.447354,15.894164 23.071356,10.481822 16.447354,10.481822 z"
        id="path5176"
-       sodipodi:nodetypes="cccccszcsc"
-       transform="matrix(1,0,0,0.988192,0.447354,-1.486208)" />
+       sodipodi:nodetypes="cscccszcsc" />
     <path
-       style="opacity:0.5;fill:url(#radialGradient2824);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 15.5625,12.5 C 9.550204,12.5 4.641496,17.515648 4.625,23.771565 C 4.624972,23.782116 4.625,23.791888 4.625,23.802446 C 5.536919,31.234151 4.868766,35.631074 3.15625,38.717969 C 0.36471303,44.302845 2.123521,45.533069 4.465864,45.533069 C 6.402445,45.533069 24.520621,45.503627 30.346594,45.503627 C 31.513801,45.503627 33.5,46.001748 33.5,44.554478 C 33.5,44.335354 33.300249,43.923343 32.75,43.411881 C 32.199751,42.90042 31.37676,42.351214 30.46875,41.806069 C 29.56074,41.260924 28.59071,40.709456 27.71875,40.169376 C 26.84679,39.629297 26.074154,39.125147 25.53125,38.409159 C 24.921245,37.604678 24.641306,36.658991 24.586842,35.629869 C 24.532378,34.600747 24.670221,33.49665 24.787061,32.449126 C 25.020741,30.354077 25.53125,28.527239 25.53125,28.527239 C 25.54624,28.4637 25.567163,28.401673 25.59375,28.341953 C 26.181231,26.957097 26.5,25.414481 26.5,23.802446 C 26.5,17.531779 21.584936,12.5 15.5625,12.5 z "
+       style="opacity:0.55000000000000004;fill:url(#radialGradient2824);fill-opacity:1;stroke:url(#linearGradient6512);stroke-width:0.99999994000000003;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 16.25,11.5 C 10.237704,11.5 5.0276636,16.611038 5.4999997,22.834065 C 6.0644244,30.27036 5.8175038,32.821583 4.0236672,37.541192 C 1.1437418,42.286379 3.1235207,44.533069 5.4658637,44.533069 C 7.4024447,44.533069 25.520621,44.503627 31.346594,44.503627 C 32.513801,44.503627 34.5,45.001748 34.5,43.554478 C 34.5,43.335354 34.300249,42.923343 33.75,42.411881 C 33.199751,41.90042 32.37676,41.351214 31.46875,40.806069 C 30.56074,40.260924 29.59071,39.709456 28.71875,39.169376 C 27.84679,38.629297 27.074154,38.125147 26.53125,37.409159 C 25.921245,36.604678 25.641306,35.658991 25.586842,34.629869 C 25.532378,33.600747 25.670221,32.49665 25.787061,31.449126 C 26.020741,29.354077 26.53125,27.527239 26.53125,27.527239 C 26.54624,27.4637 26.567163,27.401673 26.59375,27.341953 C 27.181231,25.957097 27.5,24.414481 27.5,22.802446 C 27.5,16.531779 22.272436,11.5 16.25,11.5 z"
        id="path5241"
-       sodipodi:nodetypes="csscccssssssscssc" />
+       sodipodi:nodetypes="cscccssssssscssc" />
     <path
-       style="opacity:1;fill:#a46bb0;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 7.269301,19.503118 C 9.2717505,17.238166 12.529418,17.841584 13.808008,19.287784 C 15.560146,21.269611 15.356996,24.71627 13.354547,26.981222 C 11.614386,28.949501 8.7521391,29.981828 7,28 C 5.2478601,26.018172 5.6872953,21.292511 7.269301,19.503118 z "
-       id="path5160"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.0174263"
+       inkscape:original="M 9.96875 19 C 8.022221 19 6.9374998 21.081214 6.9375 23 C 6.9375 25.208 8.5222219 27 10.46875 27 C 11.889191 27 14 25.489251 14 23.28125 C 14 21.536852 11.915281 19 9.96875 19 z "
+       style="opacity:1;fill:url(#linearGradient8882);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       id="path8838"
+       d="M 9.96875,17.96875 C 8.6328774,17.96875 7.5286409,18.753017 6.875,19.71875 C 6.2213591,20.684483 5.9062499,21.848884 5.90625,23 C 5.90625,25.694817 7.8977844,28.03125 10.46875,28.03125 C 11.539674,28.03125 12.596335,27.527372 13.46875,26.71875 C 14.341165,25.910128 15.03125,24.709464 15.03125,23.28125 C 15.03125,22.003744 14.362496,20.808851 13.46875,19.8125 C 12.575004,18.816149 11.384009,17.96875 9.96875,17.96875 z"
+       transform="translate(1.09375,-0.96875)" />
     <path
-       transform="matrix(1.46245,0,0,1.378883,-5.440518,-10.80605)"
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.09375,22.321339 C 15.09375,24.52934 12.987869,26.03125 11.567428,26.03125 C 9.6208995,26.03125 8.0411075,24.239249 8.0411075,22.031249 C 8.0411075,20.112462 9.1240375,18.03125 11.070566,18.03125 C 13.017097,18.03125 15.09375,20.576941 15.09375,22.321339 z"
        id="path5157"
        sodipodi:nodetypes="csssc" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#6b1a80;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path5162"
        sodipodi:cx="10.169642"
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208632,0,0,1.544828,-1.738701,-14.41893)" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(1.237779,0,0,1.544828,-1.0301916,-15.38768)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient8854);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path5164"
        sodipodi:cx="10.169642"
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.402878,0,0,0.514947,6.455534,10.62004)" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.4028775,0,0,0.772414,7.4966298,3.2519345)" />
     <path
-       style="opacity:1;fill:#975fa3;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 27.88281,19.946791 C 26.359012,18.309616 23.880032,18.745786 22.907068,19.791141 C 21.573747,21.223665 21.728337,23.715015 23.252136,25.35219 C 24.576341,26.77492 26.754418,27.521117 28.087739,26.088593 C 29.42106,24.656068 29.086665,21.240217 27.88281,19.946791 z "
-       id="path5167"
-       sodipodi:nodetypes="csssc" />
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.0250763"
+       inkscape:original="M 24.71875 19 C 23.921039 19.030682 23.197708 19.355158 22.78125 19.8125 C 21.639847 21.065961 21.758036 23.254972 23.0625 24.6875 C 24.196099 25.932389 26.077347 26.565958 27.21875 25.3125 C 28.360153 24.05904 28.061824 21.069247 27.03125 19.9375 C 26.379019 19.221236 25.516461 18.969318 24.71875 19 z "
+       style="opacity:1;fill:url(#linearGradient8890);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       id="path8846"
+       d="M 24.6875,17.96875 C 23.636213,18.009185 22.683031,18.409233 22.03125,19.125 C 20.466122,20.843786 20.678782,23.580894 22.3125,25.375 C 23.011072,26.142154 23.917332,26.724837 24.9375,26.9375 C 25.957668,27.150163 27.151401,26.89759 27.96875,26 C 28.842555,25.04041 29.039766,23.753975 28.96875,22.53125 C 28.897734,21.308525 28.565932,20.111716 27.78125,19.25 C 26.906665,18.289553 25.728905,17.928695 24.6875,17.96875 z"
+       transform="translate(1.0348213,-0.9657729)" />
     <path
-       transform="matrix(0.726374,-0.813272,-0.684868,-0.766801,34.41717,50.34012)"
-       style="opacity:1;fill:white;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.257119,24.626053 C 13.257119,26.227351 11.8279,27.316574 10.863875,27.316574 C 9.5428049,27.316574 8.4706318,26.01697 8.4706318,24.415672 C 8.4706318,23.024119 9.2055946,21.514771 10.526665,21.514771 C 11.847736,21.514771 13.257119,23.360971 13.257119,24.626053 z "
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 28.07086,18.984912 C 26.766398,17.552385 24.644242,17.934034 23.811326,18.848719 C 22.669923,20.102179 22.802261,22.282108 24.106725,23.714636 C 25.240323,24.959524 27.104889,25.612445 28.246292,24.358987 C 29.387696,23.105527 29.101434,20.116659 28.07086,18.984912 z"
        id="path5169"
        sodipodi:nodetypes="csssc" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#6b1a80;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path5171"
        sodipodi:cx="10.169642"
        sodipodi:cy="24.3125"
        sodipodi:rx="1.2410715"
        sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(1.208632,0,0,1.598777,13.20865,-15.80042)" />
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(1.208632,0,0,1.598777,13.243467,-16.766194)" />
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5173"
-       sodipodi:cx="10.169642"
-       sodipodi:cy="24.3125"
-       sodipodi:rx="1.2410715"
-       sodipodi:ry="1.2946428"
-       d="M 11.410714 24.3125 A 1.2410715 1.2946428 0 1 1  8.928571,24.3125 A 1.2410715 1.2946428 0 1 1  11.410714 24.3125 z"
-       transform="matrix(0.402878,0,0,0.53293,21.40289,10.11299)" />
+       transform="matrix(0.9902622,0,0,1.0468412,0.6803699,-1.6322179)"
+       style="fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter8730)"
+       d="M 19.0625,25.21875 C 18.601377,25.21875 18.273569,25.504007 18.09375,25.71875 C 17.913931,25.933493 17.816385,26.151947 17.6875,26.375 C 17.42973,26.821106 17.161718,27.281061 16.8125,27.625 C 16.463282,27.968939 15.753081,28.431077 15.090677,28.457564 C 13.768981,28.152971 12.567412,27.574567 11.44337,27.388802 C 11.190855,27.626888 11.124903,28.002654 11.28125,28.3125 C 12.447615,30.480389 13.704893,31.652553 16.158709,32.98462 C 17.36658,33.640319 19.551532,34.28873 20.662703,34.736506 C 22.03071,33.835346 25.543472,30.338576 25.75,28.125 C 25.844084,27.808258 25.729503,27.466527 25.463497,27.270522 C 24.478872,27.816677 23.360045,28.165794 22.250307,28.426314 C 21.786763,28.408951 21.509989,27.99255 21.21875,27.65625 C 20.927511,27.31995 20.680079,26.828945 20.4375,26.375 C 20.31621,26.148027 20.208768,25.937142 20.03125,25.71875 C 19.853732,25.500358 19.525474,25.21875 19.0625,25.21875 z"
+       id="path8696"
+       sodipodi:nodetypes="cssscccsccccsssc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.36336106"
+       inkscape:original="M 15.8125 27 C 15.361611 27 15 27.422198 15 27.9375 C 15 28.452801 15.361612 28.874999 15.8125 28.875 L 21.1875 28.875 C 21.638389 28.875 22 28.452801 22 27.9375 C 22 27.422199 21.638389 27 21.1875 27 L 15.8125 27 z "
+       style="opacity:1;fill:#5c3566;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter8792)"
+       id="path8738"
+       d="M 15.8125,26.625 C 15.134785,26.625 14.625,27.252207 14.625,27.9375 C 14.625,28.622793 15.134785,29.249998 15.8125,29.25 L 21.1875,29.25 C 21.865216,29.25 22.375,28.622793 22.375,27.9375 C 22.375,27.252207 21.865216,26.625 21.1875,26.625 L 15.8125,26.625 z"
+       transform="translate(1.0492259,-0.5907729)" />
     <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5215"
        width="7"
        height="1.8602936"
-       x="15"
-       y="27.000017"
+       x="16.017977"
+       y="26.173933"
        rx="0.81387848"
        ry="0.93014681" />
     <path
-       style="fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 12.000005,28.650812 C 17.33287,31.553263 18.051747,26 19.060912,26 C 20.056192,26 20.46502,31.577054 25,28.653901 C 24.047304,30.344123 21.119071,32.999996 19.884593,32.999996 C 18.636217,32.999996 13.548138,31.147528 12.000005,28.650812 z "
+       style="fill:url(#linearGradient8692);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 12.017976,27.284466 C 18.332186,30.947891 18.535242,25.034227 19.622035,25.034227 C 20.693875,25.034227 20.889384,30.946219 26.017976,27.230273 C 25.73271,30.311439 22.068246,33.065477 21.020058,34.065477 C 18.988153,32.971727 14.03875,31.7541 12.017976,27.284466 z"
        id="rect5187"
-       sodipodi:nodetypes="czczc" />
+       sodipodi:nodetypes="czccc" />
     <path
-       transform="matrix(1.236264,0,0,0.549587,-6.482886,4.775206)"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.651119,11.193815 C 12.963532,7.814583 16.999999,10.43431 16.999999,12.891665 L 13.737594,13.834879 L 11.651119,11.193815 z "
-       id="path5192"
-       sodipodi:nodetypes="cccc" />
+       sodipodi:type="arc"
+       style="opacity:0.61111109;fill:url(#linearGradient8814);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8806"
+       sodipodi:cx="18.097515"
+       sodipodi:cy="29.72571"
+       sodipodi:rx="0.28726214"
+       sodipodi:ry="0.6408155"
+       d="M 18.384777,29.72571 A 0.28726214,0.6408155 0 1 1 17.810253,29.72571 A 0.28726214,0.6408155 0 1 1 18.384777,29.72571 z"
+       transform="matrix(-1.0945752,0.9356227,0.6067766,1.5209514,23.290203,-33.120817)" />
     <path
-       transform="matrix(1.50247,0,0,1,-7.59464,-1.139701)"
-       style="fill:#3b1941;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.689238,9.8218679 C 13.591296,8.0161941 17.219555,11.23544 17.564573,12.891665 L 14.543472,12.891665 L 11.689238,9.8218679 z "
-       id="rect5189"
+       sodipodi:type="arc"
+       style="opacity:0.61111109;fill:url(#linearGradient8818);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8816"
+       sodipodi:cx="18.097515"
+       sodipodi:cy="29.72571"
+       sodipodi:rx="0.28726214"
+       sodipodi:ry="0.6408155"
+       d="M 18.384777,29.72571 A 0.28726214,0.6408155 0 1 1 17.810253,29.72571 A 0.28726214,0.6408155 0 1 1 18.384777,29.72571 z"
+       transform="matrix(1.0945741,0.9356227,-0.606776,1.5209514,16.745752,-33.098342)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#linearGradient8858);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8856"
+       sodipodi:cx="10.169642"
+       sodipodi:cy="24.3125"
+       sodipodi:rx="1.2410715"
+       sodipodi:ry="1.2946428"
+       d="M 11.410714,24.3125 A 1.2410715,1.2946428 0 1 1 8.928571,24.3125 A 1.2410715,1.2946428 0 1 1 11.410714,24.3125 z"
+       transform="matrix(0.4028775,0,0,0.772414,21.437701,3.254912)" />
+    <path
+       style="opacity:0.61111108999999997;fill:url(#linearGradient8738);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 3.375,44.9375 C 1.75,44.5625 1.125,41.0625 4.1875,35.75 C 5.3980639,40.757973 11,44.375 11,44.375 L 3.375,44.9375 z"
+       id="rect7959"
        sodipodi:nodetypes="cccc" />
     <path
-       style="fill:url(#linearGradient2856);fill-opacity:1;stroke:none;stroke-width:1.0283047;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 12.000005,28.650834 C 17.332871,31.553285 18.051747,26.000022 19.060912,26.000022 C 20.056192,26.000022 20.46502,31.577076 25,28.653923 C 24.047304,30.344145 21.119071,33.000018 19.884593,33.000018 C 18.636217,33.000018 13.548139,31.14755 12.000005,28.650834 z "
-       id="path6561"
-       sodipodi:nodetypes="czczc" />
+       style="opacity:0.61111108999999997;fill:url(#linearGradient8742);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 33.647731,44.9375 C 35.272732,44.5625 36.772732,42.5625 28.772731,38.5625 C 29.124668,42.695473 26.022731,44.375 26.022731,44.375 L 33.647731,44.9375 z"
+       id="path8740"
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/pidgin/pixmaps/logo.png b/pidgin/pixmaps/logo.png
index bb526cf94b..f16a50ec28 100644
--- a/pidgin/pixmaps/logo.png
+++ b/pidgin/pixmaps/logo.png
diff --git a/pidgin/pixmaps/pidgin.ico b/pidgin/pixmaps/pidgin.ico
index f672939cfe..b215586d1c 100644
--- a/pidgin/pixmaps/pidgin.ico
+++ b/pidgin/pixmaps/pidgin.ico
diff --git a/pidgin/pixmaps/status/16/chat.png b/pidgin/pixmaps/status/16/chat.png
index 6c6b7deb63..bf08118061 100644
--- a/pidgin/pixmaps/status/16/chat.png
+++ b/pidgin/pixmaps/status/16/chat.png
diff --git a/pidgin/pixmaps/status/16/invisible.png b/pidgin/pixmaps/status/16/invisible.png
index a85e7c3ac8..7f2bcfdd58 100644
--- a/pidgin/pixmaps/status/16/invisible.png
+++ b/pidgin/pixmaps/status/16/invisible.png
diff --git a/pidgin/pixmaps/status/16/scalable/chat.svg b/pidgin/pixmaps/status/16/scalable/chat.svg
index faae24676e..b71ad72924 100644
--- a/pidgin/pixmaps/status/16/scalable/chat.svg
+++ b/pidgin/pixmaps/status/16/scalable/chat.svg
@@ -13,10 +13,10 @@
    height="16"
    id="svg7380"
    sodipodi:version="0.32"
-   inkscape:version="0.46+devel"
+   inkscape:version="0.46"
    sodipodi:docbase="/home/hbons/Desktop"
-   sodipodi:docname="person.svg"
-   inkscape:export-filename="/home/hbons/Desktop/person.png"
+   sodipodi:docname="chat.svg"
+   inkscape:export-filename="/home/hbons/Bureaublad/chat.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -24,64 +24,136 @@
   <defs
      id="defs7382">
     <linearGradient
+       id="linearGradient9105"
+       inkscape:collect="always">
+      <stop
+         id="stop9107"
+         offset="0"
+         style="stop-color:#75507b;stop-opacity:1" />
+      <stop
+         id="stop9109"
+         offset="1"
+         style="stop-color:#5c3566;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9099"
+       inkscape:collect="always">
+      <stop
+         id="stop9101"
+         offset="0"
+         style="stop-color:#75507b;stop-opacity:1" />
+      <stop
+         id="stop9103"
+         offset="1"
+         style="stop-color:#5c3566;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9093"
+       inkscape:collect="always">
+      <stop
+         id="stop9095"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop9097"
+         offset="1"
+         style="stop-color:#5c3566;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       id="linearGradient3301">
+       id="linearGradient9034">
       <stop
-         style="stop-color:#46284e;stop-opacity:1;"
+         style="stop-color:#204a87;stop-opacity:1;"
          offset="0"
-         id="stop3303" />
+         id="stop9036" />
       <stop
-         style="stop-color:#7a4588;stop-opacity:1"
+         style="stop-color:#204a87;stop-opacity:0;"
          offset="1"
-         id="stop3305" />
+         id="stop9038" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3483">
+       id="linearGradient9022">
       <stop
-         style="stop-color:#c17802;stop-opacity:1"
+         style="stop-color:#5c3566;stop-opacity:1;"
          offset="0"
-         id="stop3485" />
+         id="stop9024" />
       <stop
-         style="stop-color:#935a00;stop-opacity:1"
+         style="stop-color:#5c3566;stop-opacity:0;"
          offset="1"
-         id="stop3487" />
+         id="stop9026" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3475">
+       id="linearGradient8986">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop3477" />
+         id="stop8988" />
       <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop8990" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8978">
+      <stop
+         style="stop-color:#884a02;stop-opacity:1"
+         offset="0"
+         id="stop8980" />
+      <stop
+         style="stop-color:#b37124;stop-opacity:1"
+         offset="1"
+         id="stop8982" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8970">
+      <stop
+         style="stop-color:#b85400;stop-opacity:1"
+         offset="0"
+         id="stop8972" />
+      <stop
+         style="stop-color:#954400;stop-opacity:1"
          offset="1"
-         id="stop3479" />
+         id="stop8974" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3451">
+       id="linearGradient8944">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop3453" />
+         id="stop8946" />
       <stop
-         style="stop-color:#15325b;stop-opacity:1"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop3455" />
+         id="stop8948" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3335">
+       id="linearGradient8920">
       <stop
-         style="stop-color:#b2730d;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop3337" />
+         id="stop8922" />
       <stop
-         style="stop-color:#935f0a;stop-opacity:1"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop3339" />
+         id="stop8924" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8901">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8903" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop8905" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -191,17 +263,6 @@
        fx="27.702486"
        fy="14.540437"
        r="9.1620579" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="radialGradient2631"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.964825,0,0,0.631898,0.954495,11.94073)"
-       cx="24.248138"
-       cy="27.184834"
-       fx="24.248138"
-       fy="27.184834"
-       r="12.499089" />
     <inkscape:perspective
        id="perspective2506"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -209,15 +270,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3327"
-       id="linearGradient3333"
-       x1="32.26284"
-       y1="18.39094"
-       x2="40.463146"
-       y2="28.908117"
-       gradientUnits="userSpaceOnUse" />
     <inkscape:perspective
        id="perspective3358"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -225,26 +277,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       r="9.1620579"
-       fy="14.809424"
-       fx="26.819485"
-       cy="14.809424"
-       cx="26.819485"
-       gradientTransform="matrix(0.9647715,0.3755394,-0.3764009,0.966985,7.9289748,-9.623708)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3376"
-       xlink:href="#linearGradient3800"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="25.307449"
-       x2="33.637684"
-       y1="20.449879"
-       x1="30.189112"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3378"
-       xlink:href="#linearGradient3335"
-       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3327"
@@ -261,55 +293,217 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="radialGradient3449"
+       xlink:href="#linearGradient3327"
+       id="linearGradient8895"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.964825,0,0,0.631898,0.954495,11.94073)"
-       cx="24.248138"
-       cy="27.184834"
-       fx="24.248138"
-       fy="27.184834"
-       r="12.499089" />
+       x1="32.26284"
+       y1="18.39094"
+       x2="40.463146"
+       y2="28.908117" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3451"
-       id="linearGradient3457"
-       x1="5.0000005"
-       y1="11.446214"
-       x2="8.2252016"
-       y2="16.493296"
+       xlink:href="#linearGradient8901"
+       id="linearGradient8907"
+       x1="1.5392504"
+       y1="5.5203876"
+       x2="8.2186995"
+       y2="19.06147"
        gradientUnits="userSpaceOnUse" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3475"
-       id="radialGradient3481"
-       cx="28.779234"
-       cy="14.68485"
-       fx="28.779234"
-       fy="14.68485"
-       r="9.8994964"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1189106,0,0,1.1189106,-3.422157,-1.7461848)" />
+       xlink:href="#linearGradient8920"
+       id="linearGradient8926"
+       x1="16.822878"
+       y1="19.008617"
+       x2="32.99292"
+       y2="19.008623"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3483"
-       id="linearGradient3489"
-       x1="30.669531"
-       y1="17.247086"
-       x2="34.812038"
-       y2="24.987169"
+       xlink:href="#linearGradient8944"
+       id="linearGradient8950"
+       x1="21.635874"
+       y1="16.722939"
+       x2="34.254536"
+       y2="19.008621"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3301"
-       id="linearGradient3307"
-       x1="16.510134"
-       y1="13.467242"
-       x2="13.781501"
-       y2="9.1689024"
+       xlink:href="#linearGradient8970"
+       id="linearGradient8976"
+       x1="29.945496"
+       y1="15.951253"
+       x2="36.016682"
+       y2="26.057554"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8978"
+       id="linearGradient8984"
+       x1="34.021988"
+       y1="23.42482"
+       x2="28.033556"
+       y2="13.403446"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8986"
+       id="linearGradient8992"
+       x1="5.1100583"
+       y1="5.9662361"
+       x2="5.1100583"
+       y2="14.328883"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8986"
+       id="linearGradient8996"
+       gradientUnits="userSpaceOnUse"
+       x1="5.1100583"
+       y1="5.9662361"
+       x2="5.1100583"
+       y2="14.328883" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8901"
+       id="linearGradient8998"
+       gradientUnits="userSpaceOnUse"
+       x1="5.1017504"
+       y1="7.2391376"
+       x2="10.718699"
+       y2="18.06147" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9028"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,-0.9999997)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9032"
+       gradientUnits="userSpaceOnUse"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932"
+       gradientTransform="translate(-11,-0.9999997)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9034"
+       id="linearGradient9040"
+       x1="2.5"
+       y1="14.016466"
+       x2="2.5"
+       y2="10.34835"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(11,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-7.3128157,-1.4029516)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9058"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.25,-12,11)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9062"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.25,-4,11)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9034"
+       id="linearGradient9066"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.25,12,10.25)"
+       x1="2.5"
+       y1="14.016466"
+       x2="2.5"
+       y2="10.34835" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9070"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.25,-25,11)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9099"
+       id="linearGradient9073"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,22,-0.9999997)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9077"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,21.8125,0.8750003)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9105"
+       id="linearGradient9081"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-11,-0.9999997)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9022"
+       id="linearGradient9087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,23.0625,-1.5624997)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9093"
+       id="linearGradient9091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,27,-1.9999997)"
+       x1="13.5"
+       y1="15.016466"
+       x2="13.5"
+       y2="11.480932" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -318,9 +512,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="36.060436"
-     inkscape:cx="12.472661"
-     inkscape:cy="7.0601917"
+     inkscape:zoom="32"
+     inkscape:cx="17.053842"
+     inkscape:cy="7.0543638"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -328,7 +522,7 @@
      inkscape:window-width="1440"
      inkscape:window-height="847"
      inkscape:window-x="0"
-     inkscape:window-y="22"
+     inkscape:window-y="0"
      width="11px"
      height="11px"
      inkscape:snap-nodes="false"
@@ -360,80 +554,119 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:1;color:#000000;fill:#855b8c;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3307);stroke-width:0.99999987999999995px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-       d="m 9.2852706,13.499999 3.6531493,0 c 1.0350584,0 2.059811,-0.3777864 2.4354322,-1.4545452 C 15.730548,11.022944 15.434737,9.0757587 13.121077,7.5000022 l -4.3228932,0 C 6.4845226,8.9545462 6.1953886,10.943768 6.7280666,12.106061 7.2707356,13.290156 8.1893256,13.5 9.2852706,13.5 z"
-       id="path3443"
-       sodipodi:nodetypes="cczcczc" />
+       style="opacity:1;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 10.5,6.4999997 C 13.26,6.4999997 15.5,8.2919998 15.5,10.5 L 15.5,13.010217 C 15.5,13.919263 14.969825,14.5 14.006545,14.5 L 6.949881,14.5 C 6.029272,14.5 5.503482,14.019448 5.503482,12.993824 C 5.503482,12.323147 5.5,11.14772 5.5,10.5 C 5.5,8.2919998 7.74,6.4999997 10.5,6.4999997 z"
+       id="path8952"
+       sodipodi:nodetypes="cccccscc" />
     <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.1784238"
-       inkscape:original="M 24.5625 24.125 C 17.844986 28.367641 17.015916 34.172303 18.5625 37.5625 C 20.138096 41.016289 22.818019 41.625 26 41.625 L 36.59375 41.625 C 39.598953 41.624999 42.565667 40.546959 43.65625 37.40625 C 44.691891 34.423774 43.842514 28.721194 37.125 24.125 L 24.5625 24.125 z "
-       style="opacity:0.5;color:#000000;fill:url(#radialGradient3449);fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:3.58186674000000016px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-       id="path3445"
-       d="m 24.96875,25.3125 c -6.080867,3.980556 -6.594767,9.007702 -5.34375,11.75 0.693936,1.521145 1.541625,2.278662 2.5625,2.75 1.020875,0.471338 2.296653,0.625 3.8125,0.625 l 10.59375,0 c 1.361692,0 2.658712,-0.23791 3.6875,-0.78125 1.028788,-0.54334 1.79962,-1.327976 2.25,-2.625 0.804003,-2.315397 0.274744,-7.39869 -5.8125,-11.71875 z"
-       transform="matrix(0.2947246,0,0,0.2644629,1.8788978,1.8057826)" />
+       d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
+       sodipodi:ry="8.6620579"
+       sodipodi:rx="8.6620579"
+       sodipodi:cy="19.008621"
+       sodipodi:cx="31.112698"
+       id="path9012"
+       style="opacity:0.625;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.88735723px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc"
+       transform="matrix(0.2041125,0.2041124,-0.2041124,0.2041125,8.0294047,-1.7303844)" />
     <path
-       style="opacity:0.78977272;fill:#eeeeec;fill-opacity:1;stroke:none"
-       d="m 12.999999,10.150001 c 0,1.0212 -1.053115,1.320578 -2,1.85 -1.339673,-0.49828 -2,-0.8288 -2,-1.85 0,-1.0212014 0.8959998,-1.8500014 2,-1.8500014 1.104,0 2,0.8288 2,1.8500014 z"
-       id="path3447"
-       sodipodi:nodetypes="ccssc" />
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0099438"
+       inkscape:original="M 5.5 7.5 C 2.74 7.5 0.5 9.2920001 0.5 11.5 L 0.5 14 C 0.50000002 14.909046 1.03672 15.5 2 15.5 L 9.0625 15.5 C 9.9831085 15.5 10.5 15.025624 10.5 14 C 10.5 13.329323 10.5 12.14772 10.5 11.5 C 10.5 9.2920001 8.26 7.5 5.5 7.5 z "
+       style="opacity:1;fill:url(#linearGradient8996);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8998);stroke-width:0.99999994000000003;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8994"
+       d="M 5.5,8.5 C 3.1771545,8.5 1.5,9.9750539 1.5,11.5 L 1.5,14 C 1.5,14.255759 1.5835553,14.332452 1.625,14.375 C 1.6664447,14.417548 1.7248871,14.5 2,14.5 L 9.0625,14.5 C 9.3493345,14.5 9.3965243,14.447325 9.40625,14.4375 C 9.4159757,14.427675 9.5,14.343149 9.5,14 C 9.5,13.329323 9.5,12.14772 9.5,11.5 C 9.5,9.9750539 7.8228455,8.5 5.5,8.5 z"
+       transform="translate(5,-1)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#d28812;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3489);stroke-width:1.92490505999999995px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-       id="path2549"
+       style="opacity:1;fill:#cdaa71;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8984);stroke-width:2.16551828px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path8887"
        sodipodi:cx="31.112698"
        sodipodi:cy="19.008621"
        sodipodi:rx="8.6620579"
        sodipodi:ry="8.6620579"
-       d="m 39.774755,19.008621 a 8.6620579,8.6620579 0 1 1 -17.324116,0 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
-       transform="matrix(0.5195068,0,0,0.5195069,-5.1632599,-4.8751084)" />
+       d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
+       transform="matrix(0.461784,0,0,0.4617839,-3.8673469,-4.2778756)" />
     <path
-       d="m 39.774755,19.008621 a 8.6620579,8.6620579 0 1 1 -17.324116,0 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
+       d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
        sodipodi:ry="8.6620579"
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
-       id="path2551"
-       style="opacity:0.625;color:#000000;fill:url(#radialGradient3481);fill-opacity:1;stroke:url(#linearGradient3333);stroke-width:2.47487712px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
+       id="path8889"
+       style="opacity:0.59722218000000005;fill:url(#linearGradient8950);fill-opacity:1;stroke:url(#linearGradient8895);stroke-width:2.88735342000000017;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       transform="matrix(0.4040609,0,0,0.4040609,-1.5714252,-2.6806412)" />
+       transform="matrix(0.2448979,0.2448979,-0.2448979,0.2448979,7.5357341,-7.7746052)" />
     <path
-       style="opacity:1;color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3457);stroke-width:0.99999987999999995px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-       d="m 3.2852716,15.499999 3.6531493,0 c 1.0350584,0 2.059811,-0.3777864 2.4354322,-1.4545452 C 9.7305489,13.022944 9.4347379,11.075758 7.1210779,9.5000014 l -4.3228932,0 c -2.3136607,1.454544 -2.6027951,3.443766 -2.0701172,4.606059 0.54266971,1.184095 1.4612592,1.393939 2.5572041,1.393939 z"
-       id="path4308"
-       sodipodi:nodetypes="cczcczc" />
+       style="opacity:1;fill:#ad7fa8;fill-opacity:1;fill-rule:nonzero;stroke:#5c3566;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 5.5,7.5000003 C 8.26,7.5000003 10.5,9.2920004 10.5,11.5 L 10.5,14.010217 C 10.5,14.919263 9.969825,15.5 9.006545,15.5 L 1.949881,15.5 C 1.029272,15.5 0.503482,15.019448 0.503482,13.993824 C 0.503482,13.323147 0.5,12.14772 0.5,11.5 C 0.5,9.2920004 2.74,7.5000003 5.5,7.5000003 z"
+       id="path8878"
+       sodipodi:nodetypes="cccccscc" />
     <path
        sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.1784238"
-       inkscape:original="M 24.5625 24.125 C 17.844986 28.367641 17.015916 34.172303 18.5625 37.5625 C 20.138096 41.016289 22.818019 41.625 26 41.625 L 36.59375 41.625 C 39.598953 41.624999 42.565667 40.546959 43.65625 37.40625 C 44.691891 34.423774 43.842514 28.721194 37.125 24.125 L 24.5625 24.125 z "
-       style="opacity:0.5;color:#000000;fill:url(#radialGradient2631);fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:3.58186674000000016px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
-       id="path7281"
-       d="m 24.96875,25.3125 c -6.080867,3.980556 -6.594767,9.007702 -5.34375,11.75 0.693936,1.521145 1.541625,2.278662 2.5625,2.75 1.020875,0.471338 2.296653,0.625 3.8125,0.625 l 10.59375,0 c 1.361692,0 2.658712,-0.23791 3.6875,-0.78125 1.028788,-0.54334 1.79962,-1.327976 2.25,-2.625 0.804003,-2.315397 0.274744,-7.39869 -5.8125,-11.71875 z"
-       transform="matrix(0.2947246,0,0,0.2644629,-4.1211012,3.8057819)" />
+       inkscape:radius="-1.0099438"
+       inkscape:original="M 5.5 7.5 C 2.74 7.5 0.5 9.2920001 0.5 11.5 L 0.5 14 C 0.50000002 14.909046 1.03672 15.5 2 15.5 L 9.0625 15.5 C 9.9831085 15.5 10.5 15.025624 10.5 14 C 10.5 13.329323 10.5 12.14772 10.5 11.5 C 10.5 9.2920001 8.26 7.5 5.5 7.5 z "
+       style="opacity:1;fill:url(#linearGradient8992);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8907);stroke-width:0.99999994000000003;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8899"
+       d="M 5.5,8.5 C 3.1771545,8.5 1.5,9.9750539 1.5,11.5 L 1.5,14 C 1.5,14.255759 1.5835553,14.332452 1.625,14.375 C 1.6664447,14.417548 1.7248871,14.5 2,14.5 L 9.0625,14.5 C 9.3493345,14.5 9.3965243,14.447325 9.40625,14.4375 C 9.4159757,14.427675 9.5,14.343149 9.5,14 C 9.5,13.329323 9.5,12.14772 9.5,11.5 C 9.5,9.9750539 7.8228455,8.5 5.5,8.5 z" />
     <path
-       style="opacity:0.78977272;fill:#eeeeec;fill-opacity:1;stroke:none"
-       d="M 7,12.15 C 7,13.1712 5.9468852,13.470578 5.0000003,14 3.6603268,13.50172 2.9999998,13.1712 2.9999998,12.15 c 0,-1.021201 0.896,-1.850001 2.000001,-1.850001 1.1039998,0 1.9999997,0.8288 1.9999997,1.850001 z"
-       id="path7285"
-       sodipodi:nodetypes="ccssc" />
+       d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
+       sodipodi:ry="8.6620579"
+       sodipodi:rx="8.6620579"
+       sodipodi:cy="19.008621"
+       sodipodi:cx="31.112698"
+       id="path9006"
+       style="opacity:0.625;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.88735723px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc"
+       transform="matrix(0.2041125,0.2041124,-0.2041124,0.2041125,3.0294049,-0.7303849)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:url(#radialGradient3376);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3378);stroke-width:1.92490506px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
+       style="opacity:1;fill:#e2b369;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8976);stroke-width:2.16551828px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.95686484;visibility:visible;display:inline;overflow:visible"
        id="path3405"
        sodipodi:cx="31.112698"
        sodipodi:cy="19.008621"
        sodipodi:rx="8.6620579"
        sodipodi:ry="8.6620579"
-       d="m 39.774755,19.008621 a 8.6620579,8.6620579 0 1 1 -17.324116,0 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
-       transform="matrix(0.5195068,0,0,0.5195069,-11.163257,-2.8751094)" />
+       d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
+       transform="matrix(0.461784,0,0,0.4617839,-8.867346,-3.2778756)" />
     <path
-       d="m 39.774755,19.008621 a 8.6620579,8.6620579 0 1 1 -17.324116,0 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
+       d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
        sodipodi:ry="8.6620579"
        sodipodi:rx="8.6620579"
        sodipodi:cy="19.008621"
        sodipodi:cx="31.112698"
        id="path3407"
-       style="opacity:0.625;color:#000000;fill:none;stroke:url(#linearGradient3409);stroke-width:2.47487712px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
+       style="opacity:0.73611111;fill:url(#linearGradient8926);fill-opacity:1;stroke:url(#linearGradient3409);stroke-width:2.88735723000000011px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc"
+       transform="matrix(0.2448979,0.2448978,-0.2448978,0.2448979,2.5357361,-6.7746053)" />
+    <image
+       xlink:href="/usr/share/icons/Tango/16x16/apps/system-users.png"
+       sodipodi:absref="/usr/share/icons/Tango/16x16/apps/system-users.png"
+       width="16"
+       height="16"
+       id="image8875"
+       x="-26"
+       y="-1.5467961" />
+    <path
+       d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A 8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
+       sodipodi:ry="8.6620579"
+       sodipodi:rx="8.6620579"
+       sodipodi:cy="19.008621"
+       sodipodi:cx="31.112698"
+       id="path9000"
+       style="opacity:0.625;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.88735723px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        sodipodi:type="arc"
-       transform="matrix(0.4040609,0,0,0.4040609,-7.5714222,-0.6806422)" />
+       transform="matrix(0.2448979,0.2448978,-0.2448978,0.2448979,21.525366,-19.96268)" />
+    <path
+       style="opacity:1;fill:url(#linearGradient9073);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 8.5,11 C 8.777,11 9,11.223 9,11.5 L 9,14 L 9.5,14 C 9.777,14 10,14.223 10,14.5 C 10,14.777 9.777,15 9.5,15 L 8.5,15 C 8.43075,15 8.3723594,14.993984 8.3125,14.96875 C 8.1329219,14.893047 8,14.70775 8,14.5 L 8,11.5 C 8,11.223 8.223,11 8.5,11 z"
+       id="rect9030" />
+    <path
+       style="opacity:1;fill:url(#linearGradient9081);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 2.5,11 C 2.223,11 2,11.223 2,11.5 L 2,14 L 1.5,14 C 1.223,14 1,14.223 1,14.5 C 1,14.777 1.223,15 1.5,15 L 2.5,15 C 2.56925,15 2.6276406,14.993984 2.6875,14.96875 C 2.8670781,14.893047 3,14.70775 3,14.5 L 3,11.5 C 3,11.223 2.777,11 2.5,11 z"
+       id="path9079" />
+    <path
+       style="opacity:1;fill:url(#linearGradient9091);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 13.5,10 C 13.777,10 14,10.223 14,10.5 L 14,13 L 14.5,13 C 14.777,13 15,13.223 15,13.5 C 15,13.777 14.777,14 14.5,14 L 13.5,14 C 13.43075,14 13.372359,13.993984 13.3125,13.96875 C 13.132922,13.893047 13,13.70775 13,13.5 L 13,10.5 C 13,10.223 13.223,10 13.5,10 z"
+       id="path9083" />
   </g>
 </svg>
diff --git a/pidgin/pixmaps/status/16/scalable/invisible.svg b/pidgin/pixmaps/status/16/scalable/invisible.svg
new file mode 100644
index 0000000000..9fb633a72f
--- /dev/null
+++ b/pidgin/pixmaps/status/16/scalable/invisible.svg
@@ -0,0 +1,1448 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg7943"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="invisible.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Bureaublad/Projecten/Pidgin/Pidgin objecten voor 2.5.0/invisible.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs7945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9042">
+      <stop
+         style="stop-color:#8cb1d9;stop-opacity:1;"
+         offset="0"
+         id="stop9044" />
+      <stop
+         style="stop-color:#437fc2;stop-opacity:1"
+         offset="1"
+         id="stop9046" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8907">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop8909" />
+      <stop
+         style="stop-color:#2f5379;stop-opacity:1"
+         offset="1"
+         id="stop8911" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient8799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.2733"
+       y2="24.143761" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8710">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8712" />
+      <stop
+         style="stop-color:#c7d9ed;stop-opacity:1"
+         offset="1"
+         id="stop8714" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="9.9977369"
+       y1="2.5581124"
+       x2="9.9977369"
+       y2="15.90989"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2855" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective7951" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.364647"
+       x2="18.497854"
+       y1="60.525894"
+       x1="14.193055"
+       id="linearGradient8758"
+       xlink:href="#linearGradient8752"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.781603"
+       x2="30.5"
+       y1="4.8871226"
+       x1="30.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8913"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="44.348099"
+       x2="17.997768"
+       y1="36.416954"
+       x1="17.997768"
+       id="linearGradient8834"
+       xlink:href="#linearGradient8828"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.0769231,0,0,1.1428571,-0.905101,-4.6800586)"
+       gradientUnits="userSpaceOnUse"
+       y2="29.853554"
+       x2="19.985121"
+       y1="29.911009"
+       x1="18.5"
+       id="linearGradient8692"
+       xlink:href="#linearGradient8686"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="44.272076"
+       x2="5.5366187"
+       y1="38.950283"
+       x1="12.01321"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6573"
+       xlink:href="#linearGradient6563"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="22.781603"
+       x2="30.5"
+       y1="1.0232024"
+       x1="30.5"
+       id="linearGradient6543"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="43.5"
+       x2="5.6917014"
+       y1="43.5"
+       x1="3.3105288"
+       id="linearGradient6499"
+       xlink:href="#linearGradient6493"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
+       r="9.7225161"
+       fy="39.80859"
+       fx="15.004828"
+       cy="39.80859"
+       cx="15.004828"
+       id="radialGradient5286"
+       xlink:href="#linearGradient5280"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3800">
+      <stop
+         id="stop3802"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3804"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient25554"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient25546"
+       inkscape:collect="always">
+      <stop
+         id="stop25548"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop25550"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25568"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25572"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5280"
+       inkscape:collect="always">
+      <stop
+         id="stop5282"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop5284"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6493"
+       inkscape:collect="always">
+      <stop
+         id="stop6495"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6497"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6537"
+       inkscape:collect="always">
+      <stop
+         id="stop6539"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6541"
+         offset="1"
+         style="stop-color:#d3e1f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6563"
+       inkscape:collect="always">
+      <stop
+         id="stop6565"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective75"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient8686"
+       inkscape:collect="always">
+      <stop
+         id="stop8688"
+         offset="0"
+         style="stop-color:#fdb751;stop-opacity:1" />
+      <stop
+         id="stop8690"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8828"
+       inkscape:collect="always">
+      <stop
+         id="stop8830"
+         offset="0"
+         style="stop-color:#dc50cd;stop-opacity:1;" />
+      <stop
+         id="stop8832"
+         offset="1"
+         style="stop-color:#dc50cd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8752"
+       inkscape:collect="always">
+      <stop
+         id="stop8754"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop8756"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient8914"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective8012"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.2733"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8986"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8980">
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop8982" />
+      <stop
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop8984" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="15.010952"
+       x2="16.499542"
+       y1="2.5071414"
+       x1="6.924273"
+       id="linearGradient8978"
+       xlink:href="#linearGradient8710"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7770035,0,2.6759581)"
+       r="8.96875"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient3210"
+       xlink:href="#linearGradient3204"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="18.288521"
+       x2="12.015625"
+       y1="10.420408"
+       x1="12.015625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3200"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="13.251127"
+       x2="12.750399"
+       y1="19.780256"
+       x1="12.726427"
+       id="linearGradient3197"
+       xlink:href="#linearGradient3191"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="19.148933"
+       x2="15.742911"
+       y1="8.850009"
+       x1="13.038205"
+       id="linearGradient3189"
+       xlink:href="#linearGradient3183"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1364"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,0,0,0.665505,-3.088585,4.013937)"
+       r="8.96875"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient4152"
+       xlink:href="#linearGradient4146"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.151861"
+       x2="12.015625"
+       y1="12.513933"
+       x1="12.015625"
+       id="linearGradient4144"
+       xlink:href="#linearGradient4138"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.157516"
+       x2="12.015625"
+       y1="12.904307"
+       x1="12.015625"
+       id="linearGradient4136"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3150"
+       inkscape:collect="always">
+      <stop
+         id="stop3152"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3154"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4130"
+       inkscape:collect="always">
+      <stop
+         id="stop4132"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4134"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4138"
+       inkscape:collect="always">
+      <stop
+         id="stop4140"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4142"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4146"
+       inkscape:collect="always">
+      <stop
+         id="stop4148"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4150"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective30"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3183"
+       inkscape:collect="always">
+      <stop
+         id="stop3185"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3187"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3191"
+       inkscape:collect="always">
+      <stop
+         id="stop3193"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop3195"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3204"
+       inkscape:collect="always">
+      <stop
+         id="stop3206"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3208"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3142"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3146">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3148" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3150" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3164"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,0,0,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3166"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3168"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient3170"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient3172"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3174">
+      <stop
+         id="stop3176"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop3178"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3180"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3194"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3196"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3198"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,5.518529,18.82427)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3084"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3082"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient3022"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3030"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2194"
+       x1="6.2538223"
+       y1="3.7276814"
+       x2="14.441897"
+       y2="19.159578"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3045"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3047"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3049">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3051" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3053" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3067"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,0,0,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3069"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2006"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2014"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2022"
+       x1="9.2594385"
+       y1="-1.5641226"
+       x2="11.226587"
+       y2="17.697369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2030"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2032"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2034">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2036" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2038" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2053"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,0,0,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2055"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3044"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3046">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3048" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3050" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,0,0,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3066"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2963"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         id="stop2953"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2955"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2949"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.018044"
+       x2="10.043059"
+       y1="1.3319674"
+       x1="1.5769236"
+       id="linearGradient2995"
+       xlink:href="#linearGradient2989"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2084"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2046"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2048">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2050" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2060"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2062"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient8152">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop8154" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop8156" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2857"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6606"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1357"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.003407"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,0,0,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.003407"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,0,0,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8108">
+      <stop
+         id="stop8110"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop8112" />
+      <stop
+         id="stop8114"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.2733"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8101">
+      <stop
+         id="stop8103"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop8105"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2989"
+       inkscape:collect="always">
+      <stop
+         id="stop2991"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective8092"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4665246,0,0,0.4665245,-0.3461549,-0.1980139)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9042"
+       id="linearGradient9048"
+       x1="15.562512"
+       y1="16.125008"
+       x2="17.500002"
+       y2="20.375008"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1538472,0,0,1.1538472,-9.3077161,-9.307716)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="8.5353963"
+     inkscape:cy="7.3061685"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1232"
+     inkscape:window-height="718"
+     inkscape:window-x="200"
+     inkscape:window-y="90"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7872"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7948">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2057"
+       inkscape:label="Layer 1"
+       transform="matrix(1.1538472,0,0,1.1538472,39.303014,-3.4950557)" />
+    <path
+       style="opacity:0.8;fill:#c0d4ea;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9048);stroke-width:0.99999934;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 15.5,7.9999989 C 15.5,12.14 12.139999,15.5 7.9999992,15.5 C 3.8599988,15.5 0.49999967,12.14 0.49999967,7.9999989 C 0.49999967,3.8599986 3.8599988,0.49999967 7.9999992,0.49999967 C 12.139999,0.49999967 15.5,3.8599986 15.5,7.9999989 z"
+       id="path8239" />
+    <path
+       style="opacity:0.47999998;fill:url(#linearGradient8270);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999869;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 14.500001,7.9999996 C 14.500001,11.588001 11.588002,14.5 8.0000012,14.5 C 4.4119997,14.5 1.4999994,11.588001 1.4999994,7.9999996 C 1.4999994,4.4119983 4.4119997,1.4999994 8.0000012,1.4999994 C 11.588002,1.4999994 14.500001,4.4119983 14.500001,7.9999996 z"
+       id="path8241" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/toolbar/16/insert.png b/pidgin/pixmaps/toolbar/16/insert.png
index c541e6efc8..b93726fa55 100644
--- a/pidgin/pixmaps/toolbar/16/insert.png
+++ b/pidgin/pixmaps/toolbar/16/insert.png
diff --git a/pidgin/pixmaps/tray/22/scalable/tray-away.svg b/pidgin/pixmaps/tray/22/scalable/tray-away.svg
new file mode 100644
index 0000000000..396492f42f
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/scalable/tray-away.svg
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg8004"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tray-away.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Bureaublad/Projecten/Pidgin/Pidgin objecten voor 2.5.0/Pidgin Polish/tray/tray-away.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs8006">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8907">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop8909" />
+      <stop
+         style="stop-color:#2f5379;stop-opacity:1"
+         offset="1"
+         id="stop8911" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient8914"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3284">
+      <stop
+         style="stop-color:#173867;stop-opacity:1;"
+         offset="0"
+         id="stop3286" />
+      <stop
+         style="stop-color:#173867;stop-opacity:0;"
+         offset="1"
+         id="stop3288" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3284"
+       id="linearGradient8867"
+       gradientUnits="userSpaceOnUse"
+       x1="23.221344"
+       y1="24.700239"
+       x2="8.2601509"
+       y2="0.92288947" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2804">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient8865"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.6807978"
+       x2="9.7444448"
+       y2="9.9594812" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3276">
+      <stop
+         style="stop-color:#2863b7;stop-opacity:1"
+         offset="0"
+         id="stop3278" />
+      <stop
+         style="stop-color:#14325c;stop-opacity:1"
+         offset="1"
+         id="stop3280" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3276"
+       id="linearGradient8863"
+       gradientUnits="userSpaceOnUse"
+       x1="15.377563"
+       y1="12.744186"
+       x2="22.868998"
+       y2="29.821121" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8710">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8712" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop8714" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="6.924273"
+       y1="2.5071414"
+       x2="16.499542"
+       y2="15.010952"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient8799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective8012" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient9143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,29.382532,-2.0350722)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient9145"
+       gradientUnits="userSpaceOnUse"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792"
+       gradientTransform="translate(-1.2198017,-0.5326039)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9147"
+       gradientUnits="userSpaceOnUse"
+       x1="6.924273"
+       y1="2.5071414"
+       x2="16.499542"
+       y2="15.010952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient9151"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.502468)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient9153"
+       gradientUnits="userSpaceOnUse"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9155"
+       gradientUnits="userSpaceOnUse"
+       x1="6.924273"
+       y1="2.5071414"
+       x2="16.499542"
+       y2="15.010952" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="19.080813"
+     inkscape:cy="11.944037"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7879"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata8009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       id="path9137"
+       d="M 17.120074,2.4999997 C 17.911234,2.4999997 18.5,3.0785204 18.5,4.0031287 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609012,14.487782 C 8.0308789,15.189395 7.1533459,17.327271 4.6806889,18.274119 C 5.781573,16.971634 5.5012167,14.487782 5.5012167,14.487782 L 4.0268296,14.487782 C 3.3637331,14.487782 2.5000011,13.703698 2.4999997,13.036127 L 2.4999997,3.9394191 C 2.4999997,3.2718468 3.3000235,2.4999997 3.96312,2.4999997 L 17.120074,2.4999997 z"
+       style="fill:url(#linearGradient9151);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9153);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.99184585"
+       inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
+       style="fill:url(#linearGradient9155);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="path9139"
+       d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
+       transform="translate(1.0197678e-7,-0.9999999)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8863);stroke-width:2.20694971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1339"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
+       transform="matrix(0.453114,0,0,0.4531141,7.9358503,7.4909151)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.76704544;fill:none;fill-opacity:1;stroke:url(#linearGradient8865);stroke-width:0.95346284;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2802"
+       sodipodi:cx="7.5"
+       sodipodi:cy="7"
+       sodipodi:rx="5.5"
+       sodipodi:ry="5"
+       d="M 13,7 A 5.5,5 0 1 1 2,7 A 5.5,5 0 1 1 13,7 z"
+       transform="matrix(1,0,0,1.1,7.500001,7.2999999)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8ab0d7;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="-3.8088531"
+       sodipodi:cy="3.303823"
+       sodipodi:rx="3.1932809"
+       sodipodi:ry="3.3471739"
+       d="M -0.61557221,3.303823 A 3.1932809,3.3471739 0 1 1 -7.0021341,3.303823 A 3.1932809,3.3471739 0 1 1 -0.61557221,3.303823 z"
+       transform="matrix(1.5657877,0,0,1.4933941,20.963856,10.06744)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.40340911;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8867);stroke-width:3.18781281px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1341"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
+       transform="matrix(0.3136944,0,0,0.3136944,10.109434,9.8014033)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2796"
+       sodipodi:cx="6.0403023"
+       sodipodi:cy="7.5551186"
+       sodipodi:rx="1.615877"
+       sodipodi:ry="1.3273276"
+       d="M 7.6561793,7.5551186 A 1.615877,1.3273276 0 1 1 4.4244252,7.5551186 A 1.615877,1.3273276 0 1 1 7.6561793,7.5551186 z"
+       transform="matrix(2.4754359,0,0,3.013574,4.7619625e-2,-7.7679095)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2832"
+       width="1"
+       height="1"
+       x="14"
+       y="-16"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2838"
+       width="2"
+       height="2"
+       x="14"
+       y="-16"
+       rx="1"
+       ry="1"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2840"
+       width="1"
+       height="1"
+       x="13"
+       y="-16.999998"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2848"
+       width="1"
+       height="1"
+       x="-16"
+       y="-16"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2850"
+       width="1"
+       height="1"
+       x="-17"
+       y="-16.999998"
+       transform="matrix(0,-1,-1,0,0,0)" />
+    <rect
+       style="fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8869"
+       width="1"
+       height="1"
+       x="12"
+       y="-18"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8871"
+       width="1"
+       height="1"
+       x="17"
+       y="-18"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/22/scalable/tray-busy.svg b/pidgin/pixmaps/tray/22/scalable/tray-busy.svg
new file mode 100644
index 0000000000..e0d280c8c3
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/scalable/tray-busy.svg
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg8999"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tray-busy.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Bureaublad/Projecten/Pidgin/Pidgin objecten voor 2.5.0/Pidgin Polish/tray/tray-busy.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs9001">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9155"
+       gradientUnits="userSpaceOnUse"
+       x1="6.924273"
+       y1="2.5071414"
+       x2="16.499542"
+       y2="15.010952" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8907">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop8909" />
+      <stop
+         style="stop-color:#2f5379;stop-opacity:1"
+         offset="1"
+         id="stop8911" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient9153"
+       gradientUnits="userSpaceOnUse"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient9151"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.502468)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <filter
+       height="1.2203122"
+       y="-0.11015608"
+       width="1.2623479"
+       x="-0.13117394"
+       id="filter3416"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3418"
+         stdDeviation="0.19309804"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient2239"
+       inkscape:collect="always">
+      <stop
+         id="stop2241"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2243"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient8993"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4077791,0,0,0.4061995,8.3985887,9.5673376)"
+       x1="-1.5418521"
+       y1="-6.2826729"
+       x2="63.127094"
+       y2="59.183727" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8968">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8970" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop8972" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8968"
+       id="linearGradient8991"
+       gradientUnits="userSpaceOnUse"
+       x1="1.000047"
+       y1="-4.5287623"
+       x2="10.253004"
+       y2="11.790199"
+       gradientTransform="matrix(0.8444696,0,0,0.8412122,8.1707406,9.3403614)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8192">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop8194" />
+      <stop
+         style="stop-color:#810000;stop-opacity:1"
+         offset="1"
+         id="stop8196" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8192"
+       id="linearGradient8997"
+       gradientUnits="userSpaceOnUse"
+       x1="4.3481388"
+       y1="10.84792"
+       x2="26.936407"
+       y2="24.065733" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8710">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8712" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop8714" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="6.924273"
+       y1="2.5071414"
+       x2="16.499542"
+       y2="15.010952"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient8799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024669)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective9007" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.696216"
+     inkscape:cx="7.1937074"
+     inkscape:cy="14.21622"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="650"
+     inkscape:window-height="669"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7874"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata9004">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       id="path9137"
+       d="M 17.120074,2.4999997 C 17.911234,2.4999997 18.5,3.0785204 18.5,4.0031287 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609012,14.487782 C 8.0308789,15.189395 7.1533459,17.327271 4.6806889,18.274119 C 5.781573,16.971634 5.5012167,14.487782 5.5012167,14.487782 L 4.0268296,14.487782 C 3.3637331,14.487782 2.5000011,13.703698 2.4999997,13.036127 L 2.4999997,3.9394191 C 2.4999997,3.2718468 3.3000235,2.4999997 3.96312,2.4999997 L 17.120074,2.4999997 z"
+       style="fill:url(#linearGradient9151);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9153);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.99184585"
+       inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
+       style="fill:url(#linearGradient9155);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="path9139"
+       d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
+       transform="translate(1.0197678e-7,-0.9999999)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36561811px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1311"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
+       transform="matrix(0.4103372,0,0,0.4103372,8.5779752,9.2975807)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#f13d3d;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8997);stroke-width:2.19154143px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path1339"
+       sodipodi:cx="15.590227"
+       sodipodi:cy="16.57217"
+       sodipodi:rx="14.345175"
+       sodipodi:ry="14.345175"
+       d="M 29.935402,16.57217 A 14.345175,14.345175 0 1 1 1.2450523,16.57217 A 14.345175,14.345175 0 1 1 29.935402,16.57217 z"
+       transform="matrix(0.457354,0,0,0.455248,7.8089242,8.4861647)" />
+    <path
+       style="opacity:0.75;fill:url(#linearGradient8991);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8993);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 20.437485,16.061225 C 20.437485,19.097224 17.973484,21.561226 14.937484,21.561226 C 11.901484,21.561226 9.4374847,19.097224 9.4374847,16.061225 C 9.4374847,13.025226 11.901484,10.561226 14.937484,10.561226 C 17.973484,10.561226 20.437485,13.025226 20.437485,16.061225 L 20.437485,16.061225 z"
+       id="path2220" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.19499996;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3416)"
+       id="path3302"
+       sodipodi:cx="11.484269"
+       sodipodi:cy="4.7465701"
+       sodipodi:rx="1.8659533"
+       sodipodi:ry="1.9428998"
+       d="M 13.350222,4.7465701 A 1.8659533,1.9428998 0 1 1 9.6183158,4.7465701 A 1.8659533,1.9428998 0 1 1 13.350222,4.7465701 z"
+       transform="matrix(1.9262296,-1.1216182,0.826622,1.4439935,-12.37164,20.356286)" />
+    <rect
+       style="fill:#eeeeec;fill-opacity:1;stroke:#a40000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3207"
+       width="9"
+       height="2.9999998"
+       x="10.437485"
+       y="14.561226"
+       rx="0.91377938"
+       ry="0.91377938" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg b/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
index eb1a638d00..372c1d5c63 100644
--- a/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
+++ b/pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -11,323 +11,676 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="24"
    height="24"
-   id="svg2"
+   id="svg7943"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.46"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop"
    sodipodi:docname="tray-invisible.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/notification-area/tray-busy.png"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Bureaublad/Projecten/Pidgin/Pidgin objecten voor 2.5.0/Pidgin Polish/tray/tray-available.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
-     id="defs4">
+     id="defs7945">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2989">
+       id="linearGradient9042">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#8cb1d9;stop-opacity:1;"
          offset="0"
-         id="stop2991" />
+         id="stop9044" />
       <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
+         style="stop-color:#437fc2;stop-opacity:1"
          offset="1"
-         id="stop2993" />
+         id="stop9046" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2225">
+       id="linearGradient8907">
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1;"
+         style="stop-color:#729fcf;stop-opacity:1"
          offset="0"
-         id="stop2227" />
+         id="stop8909" />
       <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
+         style="stop-color:#2f5379;stop-opacity:1"
          offset="1"
-         id="stop2229" />
+         id="stop8911" />
     </linearGradient>
     <linearGradient
        id="linearGradient29418">
       <stop
-         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         id="stop29420"
          offset="0.0000000"
-         id="stop29420" />
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         id="stop29422"
          offset="1.0000000"
-         id="stop29422" />
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient29418"
-       id="linearGradient29443"
+       id="linearGradient8799"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
        x1="35.003674"
        y1="10.957423"
        x2="27.273300"
        y2="24.143761" />
     <linearGradient
-       id="linearGradient2804">
+       inkscape:collect="always"
+       id="linearGradient8710">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop2806" />
-      <stop
-         id="stop2812"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop8712" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         style="stop-color:#c7d9ed;stop-opacity:1"
          offset="1"
-         id="stop2808" />
+         id="stop8714" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2804"
-       id="linearGradient2831"
-       gradientUnits="userSpaceOnUse"
-       x1="21.875"
-       y1="48.000977"
-       x2="21.875"
-       y2="40" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient2829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="9.9977369"
+       y1="2.5581124"
+       x2="9.9977369"
+       y2="15.90989"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2781">
+       id="linearGradient3286"
+       inkscape:collect="always">
       <stop
-         style="stop-color:black;stop-opacity:1;"
+         id="stop2476"
          offset="0"
-         id="stop2783" />
+         style="stop-color:#459000;stop-opacity:1" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop3290"
          offset="1"
-         id="stop2785" />
+         style="stop-color:#204300;stop-opacity:1" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient2827"
+       xlink:href="#linearGradient3286"
+       id="linearGradient7920"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2186">
+       id="linearGradient2851">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#73d216;stop-opacity:1;"
          offset="0"
-         id="stop2188" />
+         id="stop2853" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#5ca911;stop-opacity:1;"
          offset="1"
-         id="stop2190" />
+         id="stop2855" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient2260">
+       xlink:href="#linearGradient2851"
+       id="linearGradient7918"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
       <stop
-         style="stop-color:#555753;stop-opacity:1;"
+         style="stop-color:#eeeeec;stop-opacity:1;"
          offset="0"
-         id="stop2262" />
+         id="stop3151" />
       <stop
-         style="stop-color:#555753;stop-opacity:0;"
+         style="stop-color:#eeeeec;stop-opacity:0;"
          offset="1"
-         id="stop2264" />
+         id="stop3153" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3816">
+       xlink:href="#linearGradient3149"
+       id="linearGradient7915"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201"
+       gradientTransform="matrix(0.3953421,0,0,0.3953421,7.9273006,8.0528386)" />
+    <filter
+       height="1.2203122"
+       y="-0.11015608"
+       width="1.2623479"
+       x="-0.13117394"
+       id="filter3374"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3376"
+         stdDeviation="0.19309804"
+         inkscape:collect="always" />
+    </filter>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective7951" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.364647"
+       x2="18.497854"
+       y1="60.525894"
+       x1="14.193055"
+       id="linearGradient8758"
+       xlink:href="#linearGradient8752"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.781603"
+       x2="30.5"
+       y1="4.8871226"
+       x1="30.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8913"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="44.348099"
+       x2="17.997768"
+       y1="36.416954"
+       x1="17.997768"
+       id="linearGradient8834"
+       xlink:href="#linearGradient8828"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.0769231,0,0,1.1428571,-0.905101,-4.6800586)"
+       gradientUnits="userSpaceOnUse"
+       y2="29.853554"
+       x2="19.985121"
+       y1="29.911009"
+       x1="18.5"
+       id="linearGradient8692"
+       xlink:href="#linearGradient8686"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="44.272076"
+       x2="5.5366187"
+       y1="38.950283"
+       x1="12.01321"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6573"
+       xlink:href="#linearGradient6563"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="22.781603"
+       x2="30.5"
+       y1="1.0232024"
+       x1="30.5"
+       id="linearGradient6543"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="43.5"
+       x2="5.6917014"
+       y1="43.5"
+       x1="3.3105288"
+       id="linearGradient6499"
+       xlink:href="#linearGradient6493"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
+       r="9.7225161"
+       fy="39.80859"
+       fx="15.004828"
+       cy="39.80859"
+       cx="15.004828"
+       id="radialGradient5286"
+       xlink:href="#linearGradient5280"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3800">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3818" />
+         id="stop3802"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3820" />
+         id="stop3804"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3816"
-       id="radialGradient3822"
-       cx="31.112698"
-       cy="19.008621"
-       fx="31.112698"
-       fy="19.008621"
-       r="8.6620579"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient25554"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2200">
+       id="linearGradient25546"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
+         id="stop25548"
          offset="0"
-         id="stop2202" />
+         style="stop-color:white;stop-opacity:1;" />
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
+         id="stop25550"
          offset="1"
-         id="stop2204" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2200"
-       id="radialGradient2216"
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
-       cx="9.9988937"
-       cy="8.963316"
-       fx="9.9988937"
-       fy="8.963316"
-       r="7.0034069" />
+       id="radialGradient25568"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2200"
-       id="radialGradient2225"
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
-       cx="9.9988937"
-       cy="8.963316"
-       fx="9.9988937"
-       fy="8.963316"
-       r="7.0034069" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2260"
-       id="radialGradient2266"
-       cx="11.756953"
-       cy="17.588654"
-       fx="11.756953"
-       fy="17.588654"
-       r="6.3436799"
-       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
-       gradientUnits="userSpaceOnUse" />
+       id="radialGradient25572"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5280"
+       inkscape:collect="always">
+      <stop
+         id="stop5282"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop5284"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6493"
+       inkscape:collect="always">
+      <stop
+         id="stop6495"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6497"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6537"
+       inkscape:collect="always">
+      <stop
+         id="stop6539"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6541"
+         offset="1"
+         style="stop-color:#d3e1f1;stop-opacity:1" />
+    </linearGradient>
     <linearGradient
-       id="linearGradient2239"
+       id="linearGradient6563"
        inkscape:collect="always">
       <stop
-         id="stop2241"
+         id="stop6565"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective75"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient8686"
+       inkscape:collect="always">
+      <stop
+         id="stop8688"
+         offset="0"
+         style="stop-color:#fdb751;stop-opacity:1" />
+      <stop
+         id="stop8690"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8828"
+       inkscape:collect="always">
+      <stop
+         id="stop8830"
+         offset="0"
+         style="stop-color:#dc50cd;stop-opacity:1;" />
+      <stop
+         id="stop8832"
+         offset="1"
+         style="stop-color:#dc50cd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8752"
+       inkscape:collect="always">
+      <stop
+         id="stop8754"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         id="stop2243"
+         id="stop8756"
          offset="1"
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2239"
-       id="linearGradient1357"
+       xlink:href="#linearGradient8907"
+       id="linearGradient8914"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective8012"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
-       x1="15.602553"
-       y1="1.5657365"
-       x2="15.522223"
-       y2="33.483475" />
+       id="linearGradient8986"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8980">
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop8982" />
+      <stop
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop8984" />
+    </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2186"
-       id="linearGradient2337"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
-       x1="11.226587"
-       y1="-5.4832759"
-       x2="11.226587"
-       y2="17.697369" />
+       y2="15.010952"
+       x2="16.499542"
+       y1="2.5071414"
+       x1="6.924273"
+       id="linearGradient8978"
+       xlink:href="#linearGradient8710"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7770035,0,2.6759581)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient3210"
+       xlink:href="#linearGradient3204"
+       inkscape:collect="always" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2239"
-       id="linearGradient2339"
+       y2="18.288521"
+       x2="12.015625"
+       y1="10.420408"
+       x1="12.015625"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
-       x1="15.535398"
-       y1="1.8014067"
-       x2="15.535398"
-       y2="48.674999" />
+       id="linearGradient3200"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2225"
-       id="linearGradient6606"
        gradientUnits="userSpaceOnUse"
-       x1="11.802028"
-       y1="1.9986149"
-       x2="11.802028"
-       y2="14.895812" />
+       y2="13.251127"
+       x2="12.750399"
+       y1="19.780256"
+       x1="12.726427"
+       id="linearGradient3197"
+       xlink:href="#linearGradient3191"
+       inkscape:collect="always" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       y2="27.77807"
-       x2="12.233074"
-       y1="11.789385"
-       x1="6.878005"
-       id="linearGradient2857"
-       xlink:href="#linearGradient2851"
+       y2="19.148933"
+       x2="15.742911"
+       y1="8.850009"
+       x1="13.038205"
+       id="linearGradient3189"
+       xlink:href="#linearGradient3183"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1364"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,0,0,0.665505,-3.088585,4.013937)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient4152"
+       xlink:href="#linearGradient4146"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.151861"
+       x2="12.015625"
+       y1="12.513933"
+       x1="12.015625"
+       id="linearGradient4144"
+       xlink:href="#linearGradient4138"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.157516"
+       x2="12.015625"
+       y1="12.904307"
+       x1="12.015625"
+       id="linearGradient4136"
+       xlink:href="#linearGradient4130"
        inkscape:collect="always" />
     <linearGradient
-       id="linearGradient3149"
+       id="linearGradient3150"
        inkscape:collect="always">
       <stop
-         id="stop3151"
+         id="stop3152"
          offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
+         style="stop-color:#2e3436;stop-opacity:1;" />
       <stop
-         id="stop3153"
+         id="stop3154"
          offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0;" />
+         style="stop-color:#2e3436;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2851">
+       id="linearGradient4130"
+       inkscape:collect="always">
       <stop
-         id="stop2853"
+         id="stop4132"
          offset="0"
-         style="stop-color:#73d216;stop-opacity:1;" />
+         style="stop-color:#babdb6;stop-opacity:1;" />
       <stop
-         id="stop2855"
+         id="stop4134"
          offset="1"
-         style="stop-color:#5ca911;stop-opacity:1;" />
+         style="stop-color:#babdb6;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       y2="40.032413"
-       x2="17.890068"
-       y1="8.0617304"
-       x1="17.890068"
+       id="linearGradient4138"
+       inkscape:collect="always">
+      <stop
+         id="stop4140"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4142"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4146"
+       inkscape:collect="always">
+      <stop
+         id="stop4148"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4150"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective30"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3183"
+       inkscape:collect="always">
+      <stop
+         id="stop3185"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3187"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3191"
+       inkscape:collect="always">
+      <stop
+         id="stop3193"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop3195"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3204"
+       inkscape:collect="always">
+      <stop
+         id="stop3206"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3208"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3142"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient2269"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient3149"
-       inkscape:collect="always" />
+       id="linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
     <linearGradient
-       id="linearGradient2812"
-       inkscape:collect="always">
+       id="linearGradient3146">
       <stop
-         id="stop2814"
+         style="stop-color:#73d216;stop-opacity:1;"
          offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
+         id="stop3148" />
       <stop
-         id="stop2816"
+         style="stop-color:#5ca911;stop-opacity:1;"
          offset="1"
-         style="stop-color:#2e3436;stop-opacity:0;" />
+         id="stop3150" />
     </linearGradient>
     <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3164"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3166"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
        gradientUnits="userSpaceOnUse"
        r="8.6620579"
        fy="19.008621"
        fx="31.112698"
        cy="19.008621"
        cx="31.112698"
-       id="radialGradient2064"
+       id="radialGradient3168"
        xlink:href="#linearGradient2812"
        inkscape:collect="always" />
     <linearGradient
@@ -336,7 +689,7 @@
        x2="10.623409"
        y1="2.7991772"
        x1="4.5264969"
-       id="linearGradient2062"
+       id="linearGradient3170"
        xlink:href="#linearGradient2804"
        inkscape:collect="always" />
     <linearGradient
@@ -345,17 +698,17 @@
        x2="12.233074"
        y1="11.789385"
        x1="6.878005"
-       id="linearGradient2060"
+       id="linearGradient3172"
        xlink:href="#linearGradient2851"
        inkscape:collect="always" />
     <linearGradient
-       id="linearGradient2048">
+       id="linearGradient3174">
       <stop
-         id="stop2050"
+         id="stop3176"
          offset="0"
          style="stop-color:#73d216;stop-opacity:1;" />
       <stop
-         id="stop2052"
+         id="stop3178"
          offset="1"
          style="stop-color:#5ca911;stop-opacity:1;" />
     </linearGradient>
@@ -365,13 +718,13 @@
        y1="8.0617304"
        x1="17.890068"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient2046"
+       id="linearGradient3180"
        xlink:href="#linearGradient3149"
        inkscape:collect="always" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2812"
-       id="radialGradient2084"
+       id="radialGradient3194"
        gradientUnits="userSpaceOnUse"
        cx="31.112698"
        cy="19.008621"
@@ -380,31 +733,32 @@
        r="8.6620579" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2989"
-       id="linearGradient2995"
-       x1="1.5769236"
-       y1="1.3319674"
-       x2="10.043059"
-       y2="10.018044"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       r="8.6620579"
-       fy="19.008621"
-       fx="31.112698"
-       cy="19.008621"
-       cx="31.112698"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3196"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3025"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient2812"
-       inkscape:collect="always" />
+       id="radialGradient3198"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
     <linearGradient
-       y2="11.024895"
-       x2="10.623409"
-       y1="2.7991772"
-       x1="4.5264969"
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,5.518529,18.82427)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3007"
-       xlink:href="#linearGradient2804"
+       id="linearGradient3084"
+       xlink:href="#linearGradient2239"
        inkscape:collect="always" />
     <radialGradient
        r="8.6620579"
@@ -413,209 +767,252 @@
        cy="19.008621"
        cx="31.112698"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3005"
+       id="radialGradient3082"
        xlink:href="#linearGradient2812"
        inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient3022"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3030"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2194"
+       x1="6.2538223"
+       y1="3.7276814"
+       x2="14.441897"
+       y2="19.159578"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3045"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3149"
-       id="linearGradient2949"
+       id="linearGradient3047"
        gradientUnits="userSpaceOnUse"
        x1="17.890068"
        y1="8.0617304"
        x2="17.890068"
        y2="40.032413" />
     <linearGradient
-       id="linearGradient2951">
+       id="linearGradient3049">
       <stop
          style="stop-color:#73d216;stop-opacity:1;"
          offset="0"
-         id="stop2953" />
+         id="stop3051" />
       <stop
          style="stop-color:#5ca911;stop-opacity:1;"
          offset="1"
-         id="stop2955" />
+         id="stop3053" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3067"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2851"
-       id="linearGradient2963"
+       id="linearGradient3069"
        x1="6.878005"
        y1="11.789385"
        x2="12.233074"
        y2="27.77807"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
+    <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2804"
-       id="linearGradient2810"
-       x1="4.5264969"
-       y1="2.7991772"
-       x2="10.623409"
-       y2="11.024895"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2006"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2812"
-       id="radialGradient2818"
+       id="radialGradient2014"
+       gradientUnits="userSpaceOnUse"
        cx="31.112698"
        cy="19.008621"
        fx="31.112698"
        fy="19.008621"
-       r="8.6620579"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2022"
+       x1="9.2594385"
+       y1="-1.5641226"
+       x2="11.226587"
+       y2="17.697369"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
-       r="0.8078171"
-       fy="6.9473476"
-       fx="4.8470273"
-       cy="6.9473476"
-       cx="4.8470273"
-       id="radialGradient2904"
-       xlink:href="#linearGradient2898"
-       inkscape:collect="always" />
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
     <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2030"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
        gradientUnits="userSpaceOnUse"
-       y2="27.77807"
-       x2="12.233074"
-       y1="11.789385"
-       x1="6.878005"
-       id="linearGradient3066"
-       xlink:href="#linearGradient2851"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2032"
        gradientUnits="userSpaceOnUse"
-       r="8.6620579"
-       fy="19.008621"
-       fx="31.112698"
-       cy="19.008621"
-       cx="31.112698"
-       id="radialGradient3064"
-       xlink:href="#linearGradient3816"
-       inkscape:collect="always" />
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
     <linearGradient
-       id="linearGradient3046">
+       id="linearGradient2034">
       <stop
-         id="stop3048"
+         style="stop-color:#73d216;stop-opacity:1;"
          offset="0"
-         style="stop-color:#73d216;stop-opacity:1;" />
+         id="stop2036" />
       <stop
-         id="stop3050"
+         style="stop-color:#5ca911;stop-opacity:1;"
          offset="1"
-         style="stop-color:#5ca911;stop-opacity:1;" />
+         id="stop2038" />
     </linearGradient>
-    <linearGradient
-       y2="40.032413"
-       x2="17.890068"
-       y1="8.0617304"
-       x1="17.890068"
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2053"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3044"
-       xlink:href="#linearGradient3149"
-       inkscape:collect="always" />
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
     <linearGradient
-       y2="36.603138"
-       x2="24.240097"
-       y1="9.4211226"
-       x1="15.498499"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4740"
-       xlink:href="#linearGradient3149"
-       inkscape:collect="always" />
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2055"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
-       id="linearGradient2898"
-       inkscape:collect="always">
+       inkscape:collect="always"
+       id="linearGradient2898">
       <stop
-         id="stop2900"
+         style="stop-color:white;stop-opacity:1;"
          offset="0"
-         style="stop-color:white;stop-opacity:1;" />
+         id="stop2900" />
       <stop
-         id="stop2902"
+         style="stop-color:white;stop-opacity:0;"
          offset="1"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop2902" />
     </linearGradient>
     <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3044"
        gradientUnits="userSpaceOnUse"
-       y2="27.77807"
-       x2="12.233074"
-       y1="11.789385"
-       x1="6.878005"
-       id="linearGradient2055"
-       xlink:href="#linearGradient2851"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
-       gradientUnits="userSpaceOnUse"
-       r="8.6620579"
-       fy="19.008621"
-       fx="31.112698"
-       cy="19.008621"
-       cx="31.112698"
-       id="radialGradient2053"
-       xlink:href="#linearGradient3816"
-       inkscape:collect="always" />
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
     <linearGradient
-       id="linearGradient2034">
+       id="linearGradient3046">
       <stop
-         id="stop2036"
+         style="stop-color:#73d216;stop-opacity:1;"
          offset="0"
-         style="stop-color:#73d216;stop-opacity:1;" />
+         id="stop3048" />
       <stop
-         id="stop2038"
+         style="stop-color:#5ca911;stop-opacity:1;"
          offset="1"
-         style="stop-color:#5ca911;stop-opacity:1;" />
+         id="stop3050" />
     </linearGradient>
-    <linearGradient
-       y2="40.032413"
-       x2="17.890068"
-       y1="8.0617304"
-       x1="17.890068"
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient2032"
-       xlink:href="#linearGradient3149"
-       inkscape:collect="always" />
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
     <linearGradient
-       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)"
-       gradientUnits="userSpaceOnUse"
-       y2="39.834526"
-       x2="31.18539"
-       y1="4.5934086"
-       x1="8.7505674"
-       id="linearGradient2030"
-       xlink:href="#linearGradient2239"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)"
-       gradientUnits="userSpaceOnUse"
-       y2="17.697369"
-       x2="11.226587"
-       y1="-1.5641226"
-       x1="9.2594385"
-       id="linearGradient2022"
-       xlink:href="#linearGradient2186"
-       inkscape:collect="always" />
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3066"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
     <radialGradient
+       gradientUnits="userSpaceOnUse"
        r="8.6620579"
        fy="19.008621"
        fx="31.112698"
        cy="19.008621"
        cx="31.112698"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2014"
+       id="radialGradient2818"
        xlink:href="#linearGradient2812"
        inkscape:collect="always" />
-    <radialGradient
+    <linearGradient
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
-       r="0.8078171"
-       fy="6.9473476"
-       fx="4.8470273"
-       cy="6.9473476"
-       cx="4.8470273"
-       id="radialGradient2006"
-       xlink:href="#linearGradient2898"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
        inkscape:collect="always" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
@@ -623,28 +1020,17 @@
        x2="12.233074"
        y1="11.789385"
        x1="6.878005"
-       id="linearGradient3069"
+       id="linearGradient2963"
        xlink:href="#linearGradient2851"
        inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
-       gradientUnits="userSpaceOnUse"
-       r="8.6620579"
-       fy="19.008621"
-       fx="31.112698"
-       cy="19.008621"
-       cx="31.112698"
-       id="radialGradient3067"
-       xlink:href="#linearGradient3816"
-       inkscape:collect="always" />
     <linearGradient
-       id="linearGradient3049">
+       id="linearGradient2951">
       <stop
-         id="stop3051"
+         id="stop2953"
          offset="0"
          style="stop-color:#73d216;stop-opacity:1;" />
       <stop
-         id="stop3053"
+         id="stop2955"
          offset="1"
          style="stop-color:#5ca911;stop-opacity:1;" />
     </linearGradient>
@@ -654,54 +1040,13 @@
        y1="8.0617304"
        x1="17.890068"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3047"
+       id="linearGradient2949"
        xlink:href="#linearGradient3149"
        inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)"
-       gradientUnits="userSpaceOnUse"
-       y2="39.834526"
-       x2="31.18539"
-       y1="4.5934086"
-       x1="8.7505674"
-       id="linearGradient3045"
-       xlink:href="#linearGradient2239"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)"
-       gradientUnits="userSpaceOnUse"
-       y2="19.159578"
-       x2="14.441897"
-       y1="3.7276814"
-       x1="6.2538223"
-       id="linearGradient2194"
-       xlink:href="#linearGradient2186"
-       inkscape:collect="always" />
-    <radialGradient
-       r="8.6620579"
-       fy="19.008621"
-       fx="31.112698"
-       cy="19.008621"
-       cx="31.112698"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3030"
-       xlink:href="#linearGradient2812"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
-       r="0.8078171"
-       fy="6.9473476"
-       fx="4.8470273"
-       cy="6.9473476"
-       cx="4.8470273"
-       id="radialGradient3022"
-       xlink:href="#linearGradient2898"
-       inkscape:collect="always" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2812"
-       id="radialGradient3082"
+       id="radialGradient3005"
        gradientUnits="userSpaceOnUse"
        cx="31.112698"
        cy="19.008621"
@@ -710,32 +1055,21 @@
        r="8.6620579" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient2239"
-       id="linearGradient3084"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37378,0,0,0.375227,5.518529,18.82427)"
-       x1="15.535398"
-       y1="1.8014067"
-       x2="15.535398"
-       y2="48.674999" />
-    <radialGradient
-       r="8.6620579"
-       fy="19.008621"
-       fx="31.112698"
-       cy="19.008621"
-       cx="31.112698"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3198"
-       xlink:href="#linearGradient2812"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="11.024895"
-       x2="10.623409"
-       y1="2.7991772"
        x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <linearGradient
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3196"
-       xlink:href="#linearGradient2804"
+       y2="10.018044"
+       x2="10.043059"
+       y1="1.3319674"
+       x1="1.5769236"
+       id="linearGradient2995"
+       xlink:href="#linearGradient2989"
        inkscape:collect="always" />
     <radialGradient
        r="8.6620579"
@@ -744,33 +1078,33 @@
        cy="19.008621"
        cx="31.112698"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3194"
+       id="radialGradient2084"
        xlink:href="#linearGradient2812"
        inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3149"
-       id="linearGradient3180"
+       id="linearGradient2046"
        gradientUnits="userSpaceOnUse"
        x1="17.890068"
        y1="8.0617304"
        x2="17.890068"
        y2="40.032413" />
     <linearGradient
-       id="linearGradient3174">
+       id="linearGradient2048">
       <stop
          style="stop-color:#73d216;stop-opacity:1;"
          offset="0"
-         id="stop3176" />
+         id="stop2050" />
       <stop
          style="stop-color:#5ca911;stop-opacity:1;"
          offset="1"
-         id="stop3178" />
+         id="stop2052" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2851"
-       id="linearGradient3172"
+       id="linearGradient2060"
        x1="6.878005"
        y1="11.789385"
        x2="12.233074"
@@ -779,7 +1113,7 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2804"
-       id="linearGradient3170"
+       id="linearGradient2062"
        x1="4.5264969"
        y1="2.7991772"
        x2="10.623409"
@@ -788,7 +1122,7 @@
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2812"
-       id="radialGradient3168"
+       id="radialGradient2064"
        cx="31.112698"
        cy="19.008621"
        fx="31.112698"
@@ -796,54 +1130,365 @@
        r="8.6620579"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
        gradientUnits="userSpaceOnUse"
-       y2="27.77807"
-       x2="12.233074"
-       y1="11.789385"
-       x1="6.878005"
-       id="linearGradient3166"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient8152">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop8154" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop8156" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient2851"
+       id="linearGradient2857"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6606"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
        inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1357"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
     <radialGradient
-       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
        gradientUnits="userSpaceOnUse"
        r="8.6620579"
        fy="19.008621"
        fx="31.112698"
        cy="19.008621"
        cx="31.112698"
-       id="radialGradient3164"
+       id="radialGradient3822"
        xlink:href="#linearGradient3816"
        inkscape:collect="always" />
     <linearGradient
-       id="linearGradient3146">
+       id="linearGradient3816"
+       inkscape:collect="always">
       <stop
-         id="stop3148"
+         id="stop3818"
          offset="0"
-         style="stop-color:#73d216;stop-opacity:1;" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         id="stop3150"
+         id="stop3820"
          offset="1"
-         style="stop-color:#5ca911;stop-opacity:1;" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       y2="40.032413"
-       x2="17.890068"
-       y1="8.0617304"
-       x1="17.890068"
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3144"
-       xlink:href="#linearGradient3149"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
        inkscape:collect="always" />
     <linearGradient
-       y2="36.603138"
-       x2="24.240097"
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8108">
+      <stop
+         id="stop8110"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop8112" />
+      <stop
+         id="stop8114"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8101">
+      <stop
+         id="stop8103"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop8105"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2989"
+       inkscape:collect="always">
+      <stop
+         id="stop2991"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective8092"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8251"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8253"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
        y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8259"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8261"
+       gradientUnits="userSpaceOnUse"
        x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8264"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3142"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138"
+       gradientTransform="matrix(0.4043208,0,0,0.4043216,7.7666799,7.8950675)" />
+    <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient3149"
-       inkscape:collect="always" />
+       id="linearGradient8270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3947516,0,0,0.3947515,7.9378683,8.0632187)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9042"
+       id="linearGradient9048"
+       x1="15.562512"
+       y1="16.125008"
+       x2="17.500002"
+       y2="20.375008"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -852,19 +1497,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="20.899939"
-     inkscape:cx="26.526463"
-     inkscape:cy="11.289944"
-     inkscape:document-units="px"
+     inkscape:zoom="1"
+     inkscape:cx="255.24383"
+     inkscape:cy="72.8062"
      inkscape:current-layer="layer1"
-     showgrid="true"
-     fill="#d3d7cf"
-     inkscape:window-width="1440"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1232"
+     inkscape:window-height="718"
+     inkscape:window-x="200"
+     inkscape:window-y="90"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7872"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata7">
+     id="metadata7948">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -875,55 +1530,33 @@
     </rdf:RDF>
   </metadata>
   <g
+     id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
+     inkscape:groupmode="layer">
     <path
-       style="opacity:1;fill:#efefef;fill-opacity:1;fill-rule:evenodd;stroke:#787878;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 14.877402,1.4999995 C 15.782108,1.4999995 16.499998,2.2063381 16.499998,3.1046506 L 16.499998,12.174417 C 16.499998,13.07273 15.78211,13.491987 14.877402,13.491987 L 8.2067299,13.491987 L 4.5191254,16.212917 L 4.5191254,13.491987 L 3.1225959,13.491987 C 2.2178895,13.491987 1.4999988,13.07273 1.5,12.174417 L 1.5,3.1046506 C 1.5,2.2063381 2.2178895,1.4999995 3.1225959,1.4999995 L 14.877402,1.4999995 z "
-       id="path2221"
+       id="path29441"
+       d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
+       style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
        sodipodi:nodetypes="cccccccccccc" />
     <path
        sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0047876"
-       inkscape:original="M 3.125 1.5 C 2.2202936 1.5 1.5 2.1954376 1.5 3.09375 L 1.5 12.1875 C 1.4999988 13.085813 2.2202937 13.5 3.125 13.5 L 4.53125 13.5 L 4.53125 16.21875 L 8.21875 13.5 L 14.875 13.5 C 15.779708 13.5 16.5 13.085813 16.5 12.1875 L 16.5 3.09375 C 16.5 2.1954375 15.779706 1.5 14.875 1.5 L 3.125 1.5 z "
-       xlink:href="#path2221"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path5807"
-       inkscape:href="#path2221"
-       d="M 2.90625,2.5 C 2.6627552,2.5 2.5,2.6506524 2.5,2.9375 L 2.5,11.0625 C 2.4999996,11.349346 2.6627555,11.5 2.90625,11.5 L 4.53125,11.5 C 5.0824231,11.502675 5.5285754,11.948827 5.53125,12.5 L 5.53125,12.75 L 6.65625,11.75 C 6.8378154,11.590455 7.0708028,11.501698 7.3125,11.5 L 13.09375,11.5 C 13.337246,11.5 13.5,11.349348 13.5,11.0625 L 13.5,2.9375 C 13.5,2.6506524 13.337245,2.5 13.09375,2.5 L 2.90625,2.5 z " />
+       inkscape:radius="-0.99184585"
+       inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
+       style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="path8805"
+       d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
+       transform="translate(0,-1.0000002)" />
     <g
        id="g2057"
        inkscape:label="Layer 1"
-       transform="translate(19.12926,4.037634)" />
-    <g
-       id="g3200"
-       inkscape:label="Layer 1"
-       transform="translate(6.999999,7.000001)">
-      <g
-         style="opacity:0.8"
-         id="g1918">
-        <path
-           d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1  22.45064,19.008621 A 8.6620579 8.6620579 0 1 1  39.774755 19.008621 z"
-           sodipodi:ry="8.6620579"
-           sodipodi:rx="8.6620579"
-           sodipodi:cy="19.008621"
-           sodipodi:cx="31.112698"
-           id="path3203"
-           style="color:black;fill:url(#radialGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           sodipodi:type="arc"
-           transform="matrix(0.923568,0,0,0.173169,-20.73469,11.2083)" />
-        <path
-           transform="matrix(0.538297,0,0,0.538297,-1.630177,-1.459246)"
-           style="fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1.85770929;stroke-miterlimit:4;stroke-opacity:1"
-           d="M 31.822886,17.572527 C 31.822886,25.263442 25.580983,31.505344 17.890068,31.505344 C 10.199153,31.505344 3.9572506,25.263442 3.9572506,17.572527 C 3.9572506,9.8816117 10.199153,3.6397095 17.890068,3.6397095 C 25.580983,3.6397095 31.822886,9.8816117 31.822886,17.572527 z "
-           id="path4331" />
-        <path
-           transform="matrix(0.466524,0,0,0.466525,-0.346154,-0.198015)"
-           style="opacity:0.6;fill:url(#linearGradient4740);fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:2.14350748;stroke-miterlimit:4;stroke-opacity:1"
-           d="M 31.822886,17.572527 C 31.822886,25.263442 25.580983,31.505344 17.890068,31.505344 C 10.199153,31.505344 3.9572506,25.263442 3.9572506,17.572527 C 3.9572506,9.8816117 10.199153,3.6397095 17.890068,3.6397095 C 25.580983,3.6397095 31.822886,9.8816117 31.822886,17.572527 z "
-           id="path4333" />
-      </g>
-    </g>
+       transform="translate(42.12926,5.0376345)" />
+    <path
+       style="opacity:0.80000000000000004;fill:#c0d4ea;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9048);stroke-width:0.99999934000000001;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 21.500001,15.000006 C 21.500001,18.588004 18.588003,21.500001 15.000006,21.500001 C 11.412009,21.500001 8.5000125,18.588004 8.5000125,15.000006 C 8.5000125,11.412009 11.412009,8.5000126 15.000006,8.5000126 C 18.588003,8.5000126 21.500001,11.412009 21.500001,15.000006 z"
+       id="path8239" />
+    <path
+       style="opacity:0.47999998;fill:url(#linearGradient8270);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999875;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 20.5,14.999999 C 20.5,18.036 18.036,20.5 15,20.5 C 11.963999,20.5 9.4999988,18.036 9.4999988,14.999999 C 9.4999988,11.963998 11.963999,9.4999991 15,9.4999991 C 18.036,9.4999991 20.5,11.963998 20.5,14.999999 z"
+       id="path8241" />
   </g>
 </svg>
diff --git a/pidgin/pixmaps/tray/22/scalable/tray-message-new.svg b/pidgin/pixmaps/tray/22/scalable/tray-message-new.svg
new file mode 100644
index 0000000000..998d833c22
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/scalable/tray-message-new.svg
@@ -0,0 +1,1393 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg7943"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tray-message-new.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Bureaublad/Projecten/Pidgin/Pidgin objecten voor 2.5.0/Pidgin Polish/tray/tray-available.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs7945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9676">
+      <stop
+         style="stop-color:#da8200;stop-opacity:1"
+         offset="0"
+         id="stop9678" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop9680" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9670">
+      <stop
+         style="stop-color:#d27c00;stop-opacity:1"
+         offset="0"
+         id="stop9672" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop9674" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8907">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop8909" />
+      <stop
+         style="stop-color:#2f5379;stop-opacity:1"
+         offset="1"
+         id="stop8911" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient8799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8710">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8712" />
+      <stop
+         style="stop-color:#c7d9ed;stop-opacity:1"
+         offset="1"
+         id="stop8714" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="9.9977369"
+       y1="2.5581124"
+       x2="9.9977369"
+       y2="15.90989"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3286"
+       inkscape:collect="always">
+      <stop
+         id="stop2476"
+         offset="0"
+         style="stop-color:#459000;stop-opacity:1" />
+      <stop
+         id="stop3290"
+         offset="1"
+         style="stop-color:#204300;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient7920"
+       gradientUnits="userSpaceOnUse"
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2855" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient7918"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient7915"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201"
+       gradientTransform="matrix(0.3953421,0,0,0.3953421,7.9273006,8.0528386)" />
+    <filter
+       height="1.2203122"
+       y="-0.11015608"
+       width="1.2623479"
+       x="-0.13117394"
+       id="filter3374"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3376"
+         stdDeviation="0.19309804"
+         inkscape:collect="always" />
+    </filter>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective7951" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.364647"
+       x2="18.497854"
+       y1="60.525894"
+       x1="14.193055"
+       id="linearGradient8758"
+       xlink:href="#linearGradient8752"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.781603"
+       x2="30.5"
+       y1="4.8871226"
+       x1="30.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8913"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="44.348099"
+       x2="17.997768"
+       y1="36.416954"
+       x1="17.997768"
+       id="linearGradient8834"
+       xlink:href="#linearGradient8828"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.0769231,0,0,1.1428571,-0.905101,-4.6800586)"
+       gradientUnits="userSpaceOnUse"
+       y2="29.853554"
+       x2="19.985121"
+       y1="29.911009"
+       x1="18.5"
+       id="linearGradient8692"
+       xlink:href="#linearGradient8686"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="44.272076"
+       x2="5.5366187"
+       y1="38.950283"
+       x1="12.01321"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6573"
+       xlink:href="#linearGradient6563"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="22.781603"
+       x2="30.5"
+       y1="1.0232024"
+       x1="30.5"
+       id="linearGradient6543"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="43.5"
+       x2="5.6917014"
+       y1="43.5"
+       x1="3.3105288"
+       id="linearGradient6499"
+       xlink:href="#linearGradient6493"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
+       r="9.7225161"
+       fy="39.80859"
+       fx="15.004828"
+       cy="39.80859"
+       cx="15.004828"
+       id="radialGradient5286"
+       xlink:href="#linearGradient5280"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3800">
+      <stop
+         id="stop3802"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3804"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient25554"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient25546"
+       inkscape:collect="always">
+      <stop
+         id="stop25548"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop25550"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25568"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25572"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5280"
+       inkscape:collect="always">
+      <stop
+         id="stop5282"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop5284"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6493"
+       inkscape:collect="always">
+      <stop
+         id="stop6495"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6497"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6537"
+       inkscape:collect="always">
+      <stop
+         id="stop6539"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6541"
+         offset="1"
+         style="stop-color:#d3e1f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6563"
+       inkscape:collect="always">
+      <stop
+         id="stop6565"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective75"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient8686"
+       inkscape:collect="always">
+      <stop
+         id="stop8688"
+         offset="0"
+         style="stop-color:#fdb751;stop-opacity:1" />
+      <stop
+         id="stop8690"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8828"
+       inkscape:collect="always">
+      <stop
+         id="stop8830"
+         offset="0"
+         style="stop-color:#dc50cd;stop-opacity:1;" />
+      <stop
+         id="stop8832"
+         offset="1"
+         style="stop-color:#dc50cd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8752"
+       inkscape:collect="always">
+      <stop
+         id="stop8754"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop8756"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient8914"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective8012"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8986"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8980">
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop8982" />
+      <stop
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop8984" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="15.010952"
+       x2="16.499542"
+       y1="2.5071414"
+       x1="6.924273"
+       id="linearGradient8978"
+       xlink:href="#linearGradient8710"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7770035,0,2.6759581)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient3210"
+       xlink:href="#linearGradient3204"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="18.288521"
+       x2="12.015625"
+       y1="10.420408"
+       x1="12.015625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3200"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="13.251127"
+       x2="12.750399"
+       y1="19.780256"
+       x1="12.726427"
+       id="linearGradient3197"
+       xlink:href="#linearGradient3191"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="19.148933"
+       x2="15.742911"
+       y1="8.850009"
+       x1="13.038205"
+       id="linearGradient3189"
+       xlink:href="#linearGradient3183"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1364"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,0,0,0.665505,-3.088585,4.013937)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient4152"
+       xlink:href="#linearGradient4146"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.151861"
+       x2="12.015625"
+       y1="12.513933"
+       x1="12.015625"
+       id="linearGradient4144"
+       xlink:href="#linearGradient4138"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.157516"
+       x2="12.015625"
+       y1="12.904307"
+       x1="12.015625"
+       id="linearGradient4136"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3150"
+       inkscape:collect="always">
+      <stop
+         id="stop3152"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3154"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4130"
+       inkscape:collect="always">
+      <stop
+         id="stop4132"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4134"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4138"
+       inkscape:collect="always">
+      <stop
+         id="stop4140"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4142"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4146"
+       inkscape:collect="always">
+      <stop
+         id="stop4148"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4150"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective30"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3183"
+       inkscape:collect="always">
+      <stop
+         id="stop3185"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3187"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3191"
+       inkscape:collect="always">
+      <stop
+         id="stop3193"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop3195"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3204"
+       inkscape:collect="always">
+      <stop
+         id="stop3206"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3208"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3183"
+       id="linearGradient9461"
+       gradientUnits="userSpaceOnUse"
+       x1="13.038205"
+       y1="8.850009"
+       x2="15.742911"
+       y2="19.148933" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3204"
+       id="radialGradient9463"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7770035,0,2.6759581)"
+       cx="12"
+       cy="12"
+       fx="12"
+       fy="12"
+       r="8.9687502" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4146"
+       id="radialGradient9465"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,0,0,0.665505,-3.088585,4.013937)"
+       cx="12"
+       cy="12"
+       fx="12"
+       fy="12"
+       r="8.9687502" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3191"
+       id="linearGradient9467"
+       gradientUnits="userSpaceOnUse"
+       x1="12.726427"
+       y1="19.780256"
+       x2="12.750399"
+       y2="13.251127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4138"
+       id="linearGradient9469"
+       gradientUnits="userSpaceOnUse"
+       x1="12.015625"
+       y1="12.513933"
+       x2="12.015625"
+       y2="17.151861" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4130"
+       id="linearGradient9471"
+       gradientUnits="userSpaceOnUse"
+       x1="12.015625"
+       y1="10.420408"
+       x2="12.015625"
+       y2="18.288521" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4130"
+       id="linearGradient9474"
+       gradientUnits="userSpaceOnUse"
+       x1="12.015625"
+       y1="10.420408"
+       x2="12.015625"
+       y2="18.288521"
+       gradientTransform="matrix(0.6353791,0,0,-0.6665194,7.3754508,22.684738)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3191"
+       id="linearGradient9479"
+       gradientUnits="userSpaceOnUse"
+       x1="12.726427"
+       y1="19.780256"
+       x2="12.750399"
+       y2="13.251127"
+       gradientTransform="matrix(0.6875,0,0,0.7638888,6.78125,5.6041678)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4138"
+       id="linearGradient9481"
+       gradientUnits="userSpaceOnUse"
+       x1="12.015625"
+       y1="12.513933"
+       x2="12.015625"
+       y2="17.151861" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3183"
+       id="linearGradient9486"
+       gradientUnits="userSpaceOnUse"
+       x1="13.038205"
+       y1="8.850009"
+       x2="15.742911"
+       y2="19.148933"
+       gradientTransform="matrix(0.6842106,0,0,0.7335576,6.789476,6.1989666)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3204"
+       id="radialGradient9488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7770035,0,2.6759581)"
+       cx="12"
+       cy="12"
+       fx="12"
+       fy="12"
+       r="8.9687502" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4146"
+       id="radialGradient9490"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,0,0,0.665505,-3.088585,4.013937)"
+       cx="12"
+       cy="12"
+       fx="12"
+       fy="12"
+       r="8.9687502" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.073978"
+       x2="9.4590645"
+       y1="9.1751938"
+       x1="9.9935493"
+       id="linearGradient3404"
+       xlink:href="#linearGradient3398"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="6.9919"
+       x2="5.9832082"
+       y1="6.0080996"
+       x1="5.0167913"
+       id="linearGradient3396"
+       xlink:href="#linearGradient3390"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6444693,0,0,1.4596828,-7.5849142,-16.236248)"
+       r="9.8412299"
+       fy="25.560368"
+       fx="11.76924"
+       cy="25.560368"
+       cx="11.76924"
+       id="radialGradient3384"
+       xlink:href="#linearGradient3378"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="19.751348"
+       x2="13.745301"
+       y1="12.357164"
+       x1="12.549859"
+       id="linearGradient3363"
+       xlink:href="#linearGradient3357"
+       inkscape:collect="always" />
+    <radialGradient
+       r="9.975256"
+       fy="16.737026"
+       fx="5.7434092"
+       cy="16.737026"
+       cx="5.7434092"
+       gradientTransform="matrix(-1.30241,1.304442,-1.325199,-1.323009,41.46631,16.11711)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3344"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       r="9.975256"
+       fy="16.737026"
+       fx="5.7434092"
+       cy="16.737026"
+       cx="5.7434092"
+       gradientTransform="matrix(-1.30241,1.304442,-1.325199,-1.323009,41.46631,16.11711)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3331"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       id="perspective3265" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3274"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2247"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3263">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop3265" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop3267" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2216"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3263"
+       id="linearGradient3269"
+       x1="12.845698"
+       y1="16.037401"
+       x2="10.698112"
+       y2="15.449714"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3175"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient3292"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(-1.3308754,1.3308124,-1.4391023,-1.4390341,45.391773,16.51952)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="18.005522"
+       fx="8.7359829"
+       cy="18.005522"
+       cx="8.7359829"
+       id="radialGradient2214"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3313"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       r="2.5781252"
+       fy="11.083743"
+       fx="17.911736"
+       cy="11.083743"
+       cx="17.911736"
+       gradientTransform="matrix(-1.591138,1.574803,-1.783257,-1.76495,68.854751,-2.8442229)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient2382"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2867">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2869" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2871" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2847">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop2849" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop2851" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2382">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2384" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2386" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2230"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2847"
+       id="linearGradient2853"
+       x1="12.5"
+       y1="18.202251"
+       x2="12.746171"
+       y2="20.761486"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867"
+       id="linearGradient2873"
+       x1="12.720216"
+       y1="20.952612"
+       x2="12.720216"
+       y2="17.682426"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2303"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2349"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <radialGradient
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       gradientUnits="userSpaceOnUse"
+       r="9.975256"
+       fy="14.186539"
+       fx="8.3343515"
+       cy="14.186539"
+       cx="8.3343515"
+       id="radialGradient2233"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient2264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3186" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5269">
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1;"
+         offset="0"
+         id="stop5271" />
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:0;"
+         offset="1"
+         id="stop5273" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3104">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3106" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3108" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3114"
+       cx="5.7434092"
+       cy="16.737026"
+       fx="5.7434092"
+       fy="16.737026"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.30241,1.304442,-1.325199,-1.323009,41.46631,16.11711)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient3156"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,0,0,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5269"
+       id="linearGradient5275"
+       x1="26.243328"
+       y1="13.001364"
+       x2="26.243328"
+       y2="10.507664"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective9"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3357"
+       inkscape:collect="always">
+      <stop
+         id="stop3359"
+         offset="0"
+         style="stop-color:#dd6c00;stop-opacity:1" />
+      <stop
+         id="stop3361"
+         offset="1"
+         style="stop-color:#7c3c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3378"
+       inkscape:collect="always">
+      <stop
+         id="stop3380"
+         offset="0"
+         style="stop-color:#a64a00;stop-opacity:1;" />
+      <stop
+         id="stop3382"
+         offset="1"
+         style="stop-color:#a64a00;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3390"
+       inkscape:collect="always">
+      <stop
+         id="stop3392"
+         offset="0"
+         style="stop-color:#fe9906;stop-opacity:1" />
+      <stop
+         id="stop3394"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3398"
+       inkscape:collect="always">
+      <stop
+         id="stop3400"
+         offset="0"
+         style="stop-color:#fe9906;stop-opacity:1;" />
+      <stop
+         id="stop3402"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9676"
+       id="linearGradient9655"
+       gradientUnits="userSpaceOnUse"
+       x1="5.0167913"
+       y1="6.0080996"
+       x2="5.9832082"
+       y2="6.9919"
+       gradientTransform="matrix(0.9659258,0.258819,-0.258819,0.9659258,8.8697318,5.7979771)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient9660"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.30241,1.304442,-1.325199,-1.323009,41.46631,16.11711)"
+       cx="5.7434092"
+       cy="16.737026"
+       fx="5.7434092"
+       fy="16.737026"
+       r="9.975256" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3357"
+       id="linearGradient9662"
+       gradientUnits="userSpaceOnUse"
+       x1="12.549859"
+       y1="12.357164"
+       x2="13.745301"
+       y2="19.751348" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3378"
+       id="radialGradient9664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6444693,0,0,1.4596828,-7.5849142,-16.236248)"
+       cx="11.76924"
+       cy="25.560368"
+       fx="11.76924"
+       fy="25.560368"
+       r="9.8412299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9670"
+       id="linearGradient9666"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9935493"
+       y1="9.1751938"
+       x2="9.4590645"
+       y2="10.073978" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.098901"
+     inkscape:cx="19.791507"
+     inkscape:cy="12.903216"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1232"
+     inkscape:window-height="718"
+     inkscape:window-x="200"
+     inkscape:window-y="90"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7872"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7948">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       id="path29441"
+       d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
+       style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.99184585"
+       inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
+       style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="path8805"
+       d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
+       transform="translate(0,-1.0000002)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#edd400;fill-opacity:1;stroke:url(#linearGradient9662);stroke-width:1.42882562;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3317"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414,10.983024 A 9.975256,9.975256 0 1 1 1.8309021,10.983024 A 9.975256,9.975256 0 1 1 21.781414,10.983024 z"
+       transform="matrix(0.701612,0,0,0.701612,6.2166577,6.7941787)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.64044949;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.6625427;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3321"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414,10.983024 A 9.975256,9.975256 0 1 1 1.8309021,10.983024 A 9.975256,9.975256 0 1 1 21.781414,10.983024 z"
+       transform="matrix(0.6014884,0,0,0.6014884,7.3987337,7.8938395)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.79545456;fill:url(#radialGradient9660);fill-opacity:1;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3319"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414,10.983024 A 9.975256,9.975256 0 1 1 1.8309021,10.983024 A 9.975256,9.975256 0 1 1 21.781414,10.983024 z"
+       transform="matrix(0.6516124,0,0,0.6516124,6.8069615,7.3433261)" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:url(#linearGradient9655);stroke-width:0.99999988;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 14.431852,14.017638 C 14.146115,15.08402 13.048744,15.717588 11.982362,15.431852 C 10.91598,15.146115 10.282412,14.048744 10.568148,12.982362 C 10.853885,11.91598 11.951256,11.282412 13.017638,11.568148 C 14.08402,11.853885 14.717588,12.951256 14.431852,14.017638 z"
+       id="path3154" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2172"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
+       transform="matrix(0.9747194,0,0,0.5150957,3.5384624,9.0279469)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#eeeeec;fill-opacity:1;stroke:url(#linearGradient9666);stroke-width:0.70564497;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3152"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
+       transform="matrix(1.9494389,0,0,1.0301914,-2.4230764,3.5558945)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.75;fill:none;fill-opacity:1;stroke:#ce5c00;stroke-width:0.85073602;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2259"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(1.4017776,0.3494647,-0.2648498,0.9196421,7.6361947,-0.2342213)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.75;fill:none;fill-opacity:1;stroke:#ce5c00;stroke-width:0.8507362;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2261"
+       sodipodi:cx="8.3258924"
+       sodipodi:cy="9.2232141"
+       sodipodi:rx="1.2276785"
+       sodipodi:ry="1.7410715"
+       d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
+       transform="matrix(-1.4017777,0.3494645,0.2648498,0.9196416,21.85044,-0.2342154)"
+       sodipodi:start="3.5782199"
+       sodipodi:end="5.6135639"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3346"
+       sodipodi:cx="9.7069349"
+       sodipodi:cy="9.6526775"
+       sodipodi:rx="1.0259361"
+       sodipodi:ry="1.9413869"
+       d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
+       transform="matrix(0.9747195,0,0,0.5150957,6.5384613,9.0279471)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;stroke:url(#radialGradient9664);stroke-width:2.38744545;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3367"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 20.502108,15.870372 A 9.975256,9.975256 0 0 1 3.0363724,15.736611"
+       transform="matrix(0.4580397,0,0,0.3830275,9.1092209,10.472445)"
+       sodipodi:start="0.51202919"
+       sodipodi:end="2.6448802"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/22/scalable/tray-offline.svg b/pidgin/pixmaps/tray/22/scalable/tray-offline.svg
new file mode 100644
index 0000000000..a885fba048
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/scalable/tray-offline.svg
@@ -0,0 +1,1978 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg7943"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tray-offline.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Bureaublad/Projecten/Pidgin/Pidgin objecten voor 2.5.0/Pidgin Polish/tray/tray-invisible.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs7945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9042">
+      <stop
+         style="stop-color:#8cb1d9;stop-opacity:1;"
+         offset="0"
+         id="stop9044" />
+      <stop
+         style="stop-color:#437fc2;stop-opacity:1"
+         offset="1"
+         id="stop9046" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8907">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop8909" />
+      <stop
+         style="stop-color:#2f5379;stop-opacity:1"
+         offset="1"
+         id="stop8911" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient8799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8710">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8712" />
+      <stop
+         style="stop-color:#c7d9ed;stop-opacity:1"
+         offset="1"
+         id="stop8714" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="9.9977369"
+       y1="2.5581124"
+       x2="9.9977369"
+       y2="15.90989"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3286"
+       inkscape:collect="always">
+      <stop
+         id="stop2476"
+         offset="0"
+         style="stop-color:#459000;stop-opacity:1" />
+      <stop
+         id="stop3290"
+         offset="1"
+         style="stop-color:#204300;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient7920"
+       gradientUnits="userSpaceOnUse"
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2855" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient7918"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient7915"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201"
+       gradientTransform="matrix(0.3953421,0,0,0.3953421,7.9273006,8.0528386)" />
+    <filter
+       height="1.2203122"
+       y="-0.11015608"
+       width="1.2623479"
+       x="-0.13117394"
+       id="filter3374"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3376"
+         stdDeviation="0.19309804"
+         inkscape:collect="always" />
+    </filter>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective7951" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.364647"
+       x2="18.497854"
+       y1="60.525894"
+       x1="14.193055"
+       id="linearGradient8758"
+       xlink:href="#linearGradient8752"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.781603"
+       x2="30.5"
+       y1="4.8871226"
+       x1="30.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8913"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="44.348099"
+       x2="17.997768"
+       y1="36.416954"
+       x1="17.997768"
+       id="linearGradient8834"
+       xlink:href="#linearGradient8828"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.0769231,0,0,1.1428571,-0.905101,-4.6800586)"
+       gradientUnits="userSpaceOnUse"
+       y2="29.853554"
+       x2="19.985121"
+       y1="29.911009"
+       x1="18.5"
+       id="linearGradient8692"
+       xlink:href="#linearGradient8686"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="44.272076"
+       x2="5.5366187"
+       y1="38.950283"
+       x1="12.01321"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6573"
+       xlink:href="#linearGradient6563"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="22.781603"
+       x2="30.5"
+       y1="1.0232024"
+       x1="30.5"
+       id="linearGradient6543"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="43.5"
+       x2="5.6917014"
+       y1="43.5"
+       x1="3.3105288"
+       id="linearGradient6499"
+       xlink:href="#linearGradient6493"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
+       r="9.7225161"
+       fy="39.80859"
+       fx="15.004828"
+       cy="39.80859"
+       cx="15.004828"
+       id="radialGradient5286"
+       xlink:href="#linearGradient5280"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3800">
+      <stop
+         id="stop3802"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3804"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient25554"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient25546"
+       inkscape:collect="always">
+      <stop
+         id="stop25548"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop25550"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25568"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25572"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5280"
+       inkscape:collect="always">
+      <stop
+         id="stop5282"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop5284"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6493"
+       inkscape:collect="always">
+      <stop
+         id="stop6495"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6497"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6537"
+       inkscape:collect="always">
+      <stop
+         id="stop6539"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6541"
+         offset="1"
+         style="stop-color:#d3e1f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6563"
+       inkscape:collect="always">
+      <stop
+         id="stop6565"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective75"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient8686"
+       inkscape:collect="always">
+      <stop
+         id="stop8688"
+         offset="0"
+         style="stop-color:#fdb751;stop-opacity:1" />
+      <stop
+         id="stop8690"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8828"
+       inkscape:collect="always">
+      <stop
+         id="stop8830"
+         offset="0"
+         style="stop-color:#dc50cd;stop-opacity:1;" />
+      <stop
+         id="stop8832"
+         offset="1"
+         style="stop-color:#dc50cd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8752"
+       inkscape:collect="always">
+      <stop
+         id="stop8754"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop8756"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient8914"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective8012"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8986"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8980">
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop8982" />
+      <stop
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop8984" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="15.010952"
+       x2="16.499542"
+       y1="2.5071414"
+       x1="6.924273"
+       id="linearGradient8978"
+       xlink:href="#linearGradient8710"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7770035,0,2.6759581)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient3210"
+       xlink:href="#linearGradient3204"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="18.288521"
+       x2="12.015625"
+       y1="10.420408"
+       x1="12.015625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3200"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="13.251127"
+       x2="12.750399"
+       y1="19.780256"
+       x1="12.726427"
+       id="linearGradient3197"
+       xlink:href="#linearGradient3191"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="19.148933"
+       x2="15.742911"
+       y1="8.850009"
+       x1="13.038205"
+       id="linearGradient3189"
+       xlink:href="#linearGradient3183"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1364"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,0,0,0.665505,-3.088585,4.013937)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient4152"
+       xlink:href="#linearGradient4146"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.151861"
+       x2="12.015625"
+       y1="12.513933"
+       x1="12.015625"
+       id="linearGradient4144"
+       xlink:href="#linearGradient4138"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.157516"
+       x2="12.015625"
+       y1="12.904307"
+       x1="12.015625"
+       id="linearGradient4136"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3150"
+       inkscape:collect="always">
+      <stop
+         id="stop3152"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3154"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4130"
+       inkscape:collect="always">
+      <stop
+         id="stop4132"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4134"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4138"
+       inkscape:collect="always">
+      <stop
+         id="stop4140"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4142"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4146"
+       inkscape:collect="always">
+      <stop
+         id="stop4148"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4150"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective30"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3183"
+       inkscape:collect="always">
+      <stop
+         id="stop3185"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3187"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3191"
+       inkscape:collect="always">
+      <stop
+         id="stop3193"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop3195"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3204"
+       inkscape:collect="always">
+      <stop
+         id="stop3206"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3208"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3142"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3146">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3148" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3150" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3164"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3166"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3168"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient3170"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient3172"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3174">
+      <stop
+         id="stop3176"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop3178"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3180"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3194"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3196"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3198"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,5.518529,18.82427)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3084"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3082"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient3022"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3030"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2194"
+       x1="6.2538223"
+       y1="3.7276814"
+       x2="14.441897"
+       y2="19.159578"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3045"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3047"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3049">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3051" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3053" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3067"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3069"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2006"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2014"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2022"
+       x1="9.2594385"
+       y1="-1.5641226"
+       x2="11.226587"
+       y2="17.697369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2030"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2032"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2034">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2036" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2038" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2053"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2055"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3044"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3046">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3048" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3050" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3066"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2963"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         id="stop2953"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2955"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2949"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.018044"
+       x2="10.043059"
+       y1="1.3319674"
+       x1="1.5769236"
+       id="linearGradient2995"
+       xlink:href="#linearGradient2989"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2084"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2046"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2048">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2050" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2060"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2062"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient8152">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop8154" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop8156" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2857"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6606"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1357"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8108">
+      <stop
+         id="stop8110"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop8112" />
+      <stop
+         id="stop8114"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8101">
+      <stop
+         id="stop8103"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop8105"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2989"
+       inkscape:collect="always">
+      <stop
+         id="stop2991"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective8092"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8251"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8253"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8259"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8261"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8264"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138"
+       gradientTransform="matrix(0.4043208,0,0,0.4043216,7.7666799,7.8950675)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3947516,0,0,0.3947515,7.9378683,8.0632187)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9042"
+       id="linearGradient9048"
+       x1="15.562512"
+       y1="16.125008"
+       x2="17.500002"
+       y2="20.375008"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.579245"
+       x2="26.533659"
+       y1="15.213944"
+       x1="15.893391"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3286"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3025"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8205"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8203"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8189"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient8183">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop8185" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop8187" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient8181"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient8179"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8177"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient8175"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient8173"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient8171"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8153">
+      <stop
+         id="stop8155"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop8157"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8151"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="31.325201"
+       x2="30.341434"
+       y1="10.823074"
+       x1="11.127699"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4740"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4738"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective43"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient8224"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient8226"
+       gradientUnits="userSpaceOnUse"
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8228"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8232"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201"
+       gradientTransform="matrix(0.3947515,0,0,0.3947515,7.9378683,8.0632187)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient8235"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.466769,0,0,0.466769,6.6483659,6.7965842)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient8237"
+       gradientUnits="userSpaceOnUse"
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245"
+       gradientTransform="matrix(0.466769,0,0,0.466769,6.6483659,6.7965842)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-4.1349444"
+       x2="-3.3852992"
+       y1="8.6799088"
+       x1="6.8490844"
+       id="linearGradient3309"
+       xlink:href="#linearGradient3303"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="13.821809"
+       x2="12.060304"
+       y1="3.565635"
+       x1="4.8374491"
+       id="linearGradient3301"
+       xlink:href="#linearGradient3295"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="4.3450422"
+       x2="6.8097677"
+       y1="14.69435"
+       x1="14.345539"
+       id="linearGradient3281"
+       xlink:href="#linearGradient3275"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient8204"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient8202"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8184">
+      <stop
+         id="stop8186"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop8188"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8182"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)"
+       gradientUnits="userSpaceOnUse"
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       id="linearGradient2245"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)"
+       gradientUnits="userSpaceOnUse"
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       id="linearGradient8172"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective34"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3275"
+       inkscape:collect="always">
+      <stop
+         id="stop3277"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3279"
+         offset="1"
+         style="stop-color:#61635f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3295"
+       inkscape:collect="always">
+      <stop
+         id="stop3297"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop3299"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3303"
+       inkscape:collect="always">
+      <stop
+         id="stop3305"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3307"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3295"
+       id="linearGradient8220"
+       gradientUnits="userSpaceOnUse"
+       x1="4.8374491"
+       y1="3.565635"
+       x2="12.060304"
+       y2="13.821809" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3275"
+       id="linearGradient8222"
+       gradientUnits="userSpaceOnUse"
+       x1="14.345539"
+       y1="14.69435"
+       x2="6.8097677"
+       y2="4.3450422" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3303"
+       id="linearGradient8225"
+       gradientUnits="userSpaceOnUse"
+       x1="6.8490844"
+       y1="8.6799088"
+       x2="-3.3852992"
+       y2="-4.1349444" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3295"
+       id="linearGradient8231"
+       gradientUnits="userSpaceOnUse"
+       x1="4.8374491"
+       y1="3.565635"
+       x2="12.060304"
+       y2="13.821809"
+       gradientTransform="matrix(0.8705935,0,0,0.8662612,8.0664838,8.0686285)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3275"
+       id="linearGradient8233"
+       gradientUnits="userSpaceOnUse"
+       x1="14.345539"
+       y1="14.69435"
+       x2="6.8097677"
+       y2="4.3450422"
+       gradientTransform="matrix(0.8705935,0,0,0.8662612,8.0664838,8.0686285)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3303"
+       id="linearGradient8236"
+       gradientUnits="userSpaceOnUse"
+       x1="6.8490844"
+       y1="8.6799088"
+       x2="-3.3852992"
+       y2="-4.1349444" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="15.739764"
+     inkscape:cy="11.526219"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="847"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7872"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7948">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       id="path29441"
+       d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
+       style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.99184585"
+       inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
+       style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="path8805"
+       d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
+       transform="translate(0,-1.0000002)" />
+    <g
+       id="g2057"
+       inkscape:label="Layer 1"
+       transform="translate(42.12926,5.0376345)" />
+    <path
+       style="fill:url(#linearGradient8231);fill-opacity:1;stroke:url(#linearGradient8233);stroke-width:0.99999833;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 19.651536,19.596035 C 17.100596,22.134283 12.96037,22.134712 10.409961,19.596995 C 7.8595522,17.059275 7.8599841,12.939651 10.410925,10.401404 C 12.961866,7.8631562 17.102091,7.8627263 19.6525,10.400445 C 22.202909,12.938163 22.202478,17.057788 19.651536,19.596035 z"
+       id="path2187" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0137641"
+       inkscape:original="M 15.03125 8.5 C 13.358525 8.5001736 11.681721 9.1371259 10.40625 10.40625 C 7.8553091 12.944497 7.8558415 17.056031 10.40625 19.59375 C 12.956659 22.131467 17.105309 22.131998 19.65625 19.59375 C 22.207192 17.055503 22.206659 12.943968 19.65625 10.40625 C 18.381045 9.1373906 16.703975 8.4998264 15.03125 8.5 z "
+       xlink:href="#path2187"
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#linearGradient8236);stroke-width:1.00200045;stroke-miterlimit:4;stroke-opacity:1"
+       id="path2215"
+       inkscape:href="#path2187"
+       d="M 15.03125,9.5 C 13.615807,9.5001469 12.205781,10.049597 11.125,11.125 C 8.9621217,13.277115 8.9626347,16.723393 11.125,18.875 C 13.285811,21.025058 16.776176,21.02557 18.9375,18.875 C 21.100379,16.722885 21.099866,13.276605 18.9375,11.125 C 17.85696,10.049837 16.446305,9.4998531 15.03125,9.5 z"
+       transform="matrix(-0.9948961,0,0,-1.0011165,29.954532,30.010608)" />
+    <path
+       style="fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 18.389146,11.620482 C 17.839918,11.072738 17.23793,10.863672 16.688702,11.411416 L 15.036388,13.059262 L 13.384074,11.411416 C 12.834845,10.863672 12.197152,11.142764 11.647923,11.690508 C 11.098694,12.238251 10.852068,12.841088 11.401297,13.388831 L 13.053611,15.036678 L 11.401297,16.684524 C 10.852068,17.232268 11.096483,17.934576 11.645712,18.482321 C 12.194941,19.030063 12.834845,19.209683 13.384074,18.66194 L 15.036388,17.014093 L 16.688702,18.66194 C 17.23793,19.209683 17.910224,19.0331 18.459452,18.485357 C 19.008681,17.937612 19.220707,17.232268 18.671478,16.684524 L 17.019165,15.036678 L 18.671478,13.388832 C 19.220707,12.841088 18.938375,12.168226 18.389146,11.620482 z"
+       id="rect2920"
+       sodipodi:nodetypes="ccccscccscccscccc" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/22/scalable/tray-online.svg b/pidgin/pixmaps/tray/22/scalable/tray-online.svg
new file mode 100644
index 0000000000..8b6ae25d65
--- /dev/null
+++ b/pidgin/pixmaps/tray/22/scalable/tray-online.svg
@@ -0,0 +1,1791 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg7943"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="tray-available.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/hbons/Bureaublad/Projecten/Pidgin/Pidgin objecten voor 2.5.0/Pidgin Polish/tray/tray-invisible.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs7945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9042">
+      <stop
+         style="stop-color:#8cb1d9;stop-opacity:1;"
+         offset="0"
+         id="stop9044" />
+      <stop
+         style="stop-color:#437fc2;stop-opacity:1"
+         offset="1"
+         id="stop9046" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8907">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop8909" />
+      <stop
+         style="stop-color:#2f5379;stop-opacity:1"
+         offset="1"
+         id="stop8911" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29418">
+      <stop
+         id="stop29420"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop29422"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient29418"
+       id="linearGradient8799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024686)"
+       x1="35.003674"
+       y1="10.957423"
+       x2="27.273300"
+       y2="24.143761" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8710">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop8712" />
+      <stop
+         style="stop-color:#c7d9ed;stop-opacity:1"
+         offset="1"
+         id="stop8714" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="9.9977369"
+       y1="2.5581124"
+       x2="9.9977369"
+       y2="15.90989"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3286"
+       inkscape:collect="always">
+      <stop
+         id="stop2476"
+         offset="0"
+         style="stop-color:#459000;stop-opacity:1" />
+      <stop
+         id="stop3290"
+         offset="1"
+         style="stop-color:#204300;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient7920"
+       gradientUnits="userSpaceOnUse"
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2855" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient7918"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.4668572,0,0,0.4668571,6.6478951,6.7961412)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3149">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3151" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient7915"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201"
+       gradientTransform="matrix(0.3953421,0,0,0.3953421,7.9273006,8.0528386)" />
+    <filter
+       height="1.2203122"
+       y="-0.11015608"
+       width="1.2623479"
+       x="-0.13117394"
+       id="filter3374"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur3376"
+         stdDeviation="0.19309804"
+         inkscape:collect="always" />
+    </filter>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective7951" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.364647"
+       x2="18.497854"
+       y1="60.525894"
+       x1="14.193055"
+       id="linearGradient8758"
+       xlink:href="#linearGradient8752"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.781603"
+       x2="30.5"
+       y1="4.8871226"
+       x1="30.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8913"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="44.348099"
+       x2="17.997768"
+       y1="36.416954"
+       x1="17.997768"
+       id="linearGradient8834"
+       xlink:href="#linearGradient8828"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.0769231,0,0,1.1428571,-0.905101,-4.6800586)"
+       gradientUnits="userSpaceOnUse"
+       y2="29.853554"
+       x2="19.985121"
+       y1="29.911009"
+       x1="18.5"
+       id="linearGradient8692"
+       xlink:href="#linearGradient8686"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="44.272076"
+       x2="5.5366187"
+       y1="38.950283"
+       x1="12.01321"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6573"
+       xlink:href="#linearGradient6563"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="22.781603"
+       x2="30.5"
+       y1="1.0232024"
+       x1="30.5"
+       id="linearGradient6543"
+       xlink:href="#linearGradient6537"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="43.5"
+       x2="5.6917014"
+       y1="43.5"
+       x1="3.3105288"
+       id="linearGradient6499"
+       xlink:href="#linearGradient6493"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.732283,0,10.65742)"
+       r="9.7225161"
+       fy="39.80859"
+       fx="15.004828"
+       cy="39.80859"
+       cx="15.004828"
+       id="radialGradient5286"
+       xlink:href="#linearGradient5280"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3800">
+      <stop
+         id="stop3802"
+         offset="0.0000000"
+         style="stop-color:#f4d9b1;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3804"
+         offset="1.0000000"
+         style="stop-color:#df9725;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.131317,0,0,1.125313,-1.035262,-0.301139)"
+       r="8.4883642"
+       fy="2.6242435"
+       fx="7.8836637"
+       cy="2.6242435"
+       cx="7.8836637"
+       id="radialGradient25554"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient25546"
+       inkscape:collect="always">
+      <stop
+         id="stop25548"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop25550"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="8.4883642"
+       fy="0.14505707"
+       fx="7.8836741"
+       cy="0.14505707"
+       cx="7.8836741"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25568"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.4883642"
+       fy="1.5104795"
+       fx="7.8836637"
+       cy="1.5104795"
+       cx="7.8836637"
+       gradientTransform="matrix(1,0,0,0.994693,0,4.16407e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient25572"
+       xlink:href="#linearGradient25546"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         id="stop2806"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2812" />
+      <stop
+         id="stop2808"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5280"
+       inkscape:collect="always">
+      <stop
+         id="stop5282"
+         offset="0"
+         style="stop-color:#82508e;stop-opacity:1;" />
+      <stop
+         id="stop5284"
+         offset="1"
+         style="stop-color:#82508e;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6493"
+       inkscape:collect="always">
+      <stop
+         id="stop6495"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6497"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6537"
+       inkscape:collect="always">
+      <stop
+         id="stop6539"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6541"
+         offset="1"
+         style="stop-color:#d3e1f1;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6563"
+       inkscape:collect="always">
+      <stop
+         id="stop6565"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop6567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective75"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient8686"
+       inkscape:collect="always">
+      <stop
+         id="stop8688"
+         offset="0"
+         style="stop-color:#fdb751;stop-opacity:1" />
+      <stop
+         id="stop8690"
+         offset="1"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8828"
+       inkscape:collect="always">
+      <stop
+         id="stop8830"
+         offset="0"
+         style="stop-color:#dc50cd;stop-opacity:1;" />
+      <stop
+         id="stop8832"
+         offset="1"
+         style="stop-color:#dc50cd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8752"
+       inkscape:collect="always">
+      <stop
+         id="stop8754"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop8756"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8907"
+       id="linearGradient8914"
+       x1="11.531433"
+       y1="2.0188477"
+       x2="7.6475248"
+       y2="16.513792"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective8012"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.6236299,0,0,0.6278379,30.602334,-1.5024683)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8986"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8980">
+      <stop
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop8982" />
+      <stop
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop8984" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="15.010952"
+       x2="16.499542"
+       y1="2.5071414"
+       x1="6.924273"
+       id="linearGradient8978"
+       xlink:href="#linearGradient8710"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.7770035,0,2.6759581)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient3210"
+       xlink:href="#linearGradient3204"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="18.288521"
+       x2="12.015625"
+       y1="10.420408"
+       x1="12.015625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3200"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="13.251127"
+       x2="12.750399"
+       y1="19.780256"
+       x1="12.726427"
+       id="linearGradient3197"
+       xlink:href="#linearGradient3191"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="19.148933"
+       x2="15.742911"
+       y1="8.850009"
+       x1="13.038205"
+       id="linearGradient3189"
+       xlink:href="#linearGradient3183"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1364"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,0,0,0.665505,-3.088585,4.013937)"
+       r="8.9687502"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient4152"
+       xlink:href="#linearGradient4146"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.151861"
+       x2="12.015625"
+       y1="12.513933"
+       x1="12.015625"
+       id="linearGradient4144"
+       xlink:href="#linearGradient4138"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.157516"
+       x2="12.015625"
+       y1="12.904307"
+       x1="12.015625"
+       id="linearGradient4136"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3150"
+       inkscape:collect="always">
+      <stop
+         id="stop3152"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3154"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4130"
+       inkscape:collect="always">
+      <stop
+         id="stop4132"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4134"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4138"
+       inkscape:collect="always">
+      <stop
+         id="stop4140"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4142"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4146"
+       inkscape:collect="always">
+      <stop
+         id="stop4148"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4150"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective30"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3183"
+       inkscape:collect="always">
+      <stop
+         id="stop3185"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3187"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3191"
+       inkscape:collect="always">
+      <stop
+         id="stop3193"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop3195"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3204"
+       inkscape:collect="always">
+      <stop
+         id="stop3206"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop3208"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3142"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3146">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3148" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3150" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3164"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3166"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3168"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient3170"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient3172"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3174">
+      <stop
+         id="stop3176"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop3178"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3180"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3194"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3196"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3198"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,5.518529,18.82427)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3084"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3082"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient3022"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3030"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2194"
+       x1="6.2538223"
+       y1="3.7276814"
+       x2="14.441897"
+       y2="19.159578"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient3045"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3047"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3049">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3051" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3053" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3067"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3069"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2006"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2014"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2186"
+       id="linearGradient2022"
+       x1="9.2594385"
+       y1="-1.5641226"
+       x2="11.226587"
+       y2="17.697369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.684526,0,0,0.687171,-0.20455,-0.253325)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2239"
+       id="linearGradient2030"
+       x1="8.7505674"
+       y1="4.5934086"
+       x2="31.18539"
+       y2="39.834526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.482882,0,0,0.482874,0.269812,0.26982)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2032"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2034">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2036" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2038" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient2053"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2055"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2898">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2900" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient3044"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient3046">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3048" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop3050" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient3066"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2898"
+       id="radialGradient2904"
+       cx="4.8470273"
+       cy="6.9473476"
+       fx="4.8470273"
+       fy="6.9473476"
+       r="0.8078171"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient2818"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       id="linearGradient2810"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient2963"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2951">
+      <stop
+         id="stop2953"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop2955"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2949"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient3007"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.018044"
+       x2="10.043059"
+       y1="1.3319674"
+       x1="1.5769236"
+       id="linearGradient2995"
+       xlink:href="#linearGradient2989"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2084"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2046"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient2048">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop2050" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop2052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2060"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2062"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient2064"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2812">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2814" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2816" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient2269"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient8152">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop8154" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop8156" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient2857"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="14.895812"
+       x2="11.802028"
+       y1="1.9986149"
+       x1="11.802028"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6606"
+       xlink:href="#linearGradient2225"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="48.674999"
+       x2="15.535398"
+       y1="1.8014067"
+       x1="15.535398"
+       gradientTransform="matrix(0.37378,0,0,0.375227,17.64779,15.86312)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2339"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="17.697369"
+       x2="11.226587"
+       y1="-5.4832759"
+       x1="11.226587"
+       gradientTransform="matrix(0.529942,0,0,0.53199,17.26643,15.48536)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2337"
+       xlink:href="#linearGradient2186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="33.483475"
+       x2="15.522223"
+       y1="1.5657365"
+       x1="15.602553"
+       gradientTransform="matrix(0.371983,0,0,0.372254,2.539836,8.539528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1357"
+       xlink:href="#linearGradient2239"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2239">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2241" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2243" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.626667,0,6.566431)"
+       r="6.3436799"
+       fy="17.588654"
+       fx="11.756953"
+       cy="17.588654"
+       cx="11.756953"
+       id="radialGradient2266"
+       xlink:href="#linearGradient2260"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.80154)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2225"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.0034069"
+       fy="8.963316"
+       fx="9.9988937"
+       cy="8.963316"
+       cx="9.9988937"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2216"
+       xlink:href="#linearGradient2200"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2200"
+       inkscape:collect="always">
+      <stop
+         id="stop2202"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2204"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient3822"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3816"
+       inkscape:collect="always">
+      <stop
+         id="stop3818"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2260"
+       inkscape:collect="always">
+      <stop
+         id="stop2262"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         id="stop2264"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2186"
+       inkscape:collect="always">
+      <stop
+         id="stop2188"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2190"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2827"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2781"
+       inkscape:collect="always">
+      <stop
+         id="stop2783"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop2785"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="5"
+       fy="44"
+       fx="1"
+       cy="44"
+       cx="1"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2829"
+       xlink:href="#linearGradient2781"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="40"
+       x2="21.875"
+       y1="48.000977"
+       x1="21.875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8108">
+      <stop
+         id="stop8110"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop8112" />
+      <stop
+         id="stop8114"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="24.143761"
+       x2="27.273300"
+       y1="10.957423"
+       x1="35.003674"
+       gradientTransform="matrix(-0.977228,0,0,0.995878,50.60272,9.115637)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient29443"
+       xlink:href="#linearGradient29418"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8101">
+      <stop
+         id="stop8103"
+         offset="0.0000000"
+         style="stop-color:#f5f5f5;stop-opacity:1.0000000;" />
+      <stop
+         id="stop8105"
+         offset="1.0000000"
+         style="stop-color:#e9e9e9;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2225"
+       inkscape:collect="always">
+      <stop
+         id="stop2227"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2229"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2989"
+       inkscape:collect="always">
+      <stop
+         id="stop2991"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop2993"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective8092"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 12 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8251"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8253"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8259"
+       gradientUnits="userSpaceOnUse"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8261"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8264"
+       gradientUnits="userSpaceOnUse"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138"
+       gradientTransform="matrix(0.4043208,0,0,0.4043216,7.7666799,7.8950675)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3947516,0,0,0.3947515,7.9378683,8.0632187)"
+       x1="15.498499"
+       y1="9.4211226"
+       x2="24.240097"
+       y2="36.603138" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9042"
+       id="linearGradient9048"
+       x1="15.562512"
+       y1="16.125008"
+       x2="17.500002"
+       y2="20.375008"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.579245"
+       x2="26.533659"
+       y1="15.213944"
+       x1="15.893391"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3286"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3025"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.024895"
+       x2="10.623409"
+       y1="2.7991772"
+       x1="4.5264969"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8205"
+       xlink:href="#linearGradient2804"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8203"
+       xlink:href="#linearGradient2812"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8189"
+       gradientUnits="userSpaceOnUse"
+       x1="17.890068"
+       y1="8.0617304"
+       x2="17.890068"
+       y2="40.032413" />
+    <linearGradient
+       id="linearGradient8183">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop8185" />
+      <stop
+         style="stop-color:#5ca911;stop-opacity:1;"
+         offset="1"
+         id="stop8187" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient8181"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient8179"
+       x1="4.5264969"
+       y1="2.7991772"
+       x2="10.623409"
+       y2="11.024895"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2812"
+       id="radialGradient8177"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.018423,0.664359,-1.388844,4.257661,-0.134567,-26.02469)"
+       r="0.8078171"
+       fy="6.9473476"
+       fx="4.8470273"
+       cy="6.9473476"
+       cx="4.8470273"
+       id="radialGradient8175"
+       xlink:href="#linearGradient2898"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       id="linearGradient8173"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(0.914124,-3.896132e-15,-2.475021e-18,1.631747,2.671799,-12.00863)"
+       gradientUnits="userSpaceOnUse"
+       r="8.6620579"
+       fy="19.008621"
+       fx="31.112698"
+       cy="19.008621"
+       cx="31.112698"
+       id="radialGradient8171"
+       xlink:href="#linearGradient3816"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient8153">
+      <stop
+         id="stop8155"
+         offset="0"
+         style="stop-color:#73d216;stop-opacity:1;" />
+      <stop
+         id="stop8157"
+         offset="1"
+         style="stop-color:#5ca911;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="40.032413"
+       x2="17.890068"
+       y1="8.0617304"
+       x1="17.890068"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8151"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="31.325201"
+       x2="30.341434"
+       y1="10.823074"
+       x1="11.127699"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4740"
+       xlink:href="#linearGradient3149"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="27.77807"
+       x2="12.233074"
+       y1="11.789385"
+       x1="6.878005"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4738"
+       xlink:href="#linearGradient2851"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective43"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 8 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient8224"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient8226"
+       gradientUnits="userSpaceOnUse"
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8228"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3149"
+       id="linearGradient8232"
+       gradientUnits="userSpaceOnUse"
+       x1="11.127699"
+       y1="10.823074"
+       x2="30.341434"
+       y2="31.325201"
+       gradientTransform="matrix(0.3947515,0,0,0.3947515,7.9378683,8.0632187)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2851"
+       id="linearGradient8235"
+       gradientUnits="userSpaceOnUse"
+       x1="6.878005"
+       y1="11.789385"
+       x2="12.233074"
+       y2="27.77807"
+       gradientTransform="matrix(0.466769,0,0,0.466769,6.6483659,6.7965842)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3286"
+       id="linearGradient8237"
+       gradientUnits="userSpaceOnUse"
+       x1="15.893391"
+       y1="15.213944"
+       x2="26.533659"
+       y2="28.579245"
+       gradientTransform="matrix(0.466769,0,0,0.466769,6.6483659,6.7965842)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="143.4694"
+     inkscape:cy="46.795144"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1232"
+     inkscape:window-height="718"
+     inkscape:window-x="200"
+     inkscape:window-y="90"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="10"
+     gridtolerance="10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7872"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7948">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       id="path29441"
+       d="M 17.120074,2.4999994 C 17.911234,2.4999994 18.5,3.0785201 18.5,4.0031284 L 18.5,13.290965 C 18.5,13.958536 17.974302,14.487782 17.311203,14.487782 L 8.5609011,14.487782 C 8.0308788,15.189395 7.1533458,17.327271 4.6806888,18.274119 C 5.7815729,16.971634 5.5012166,14.487782 5.5012166,14.487782 L 4.0268295,14.487782 C 3.363733,14.487782 2.500001,13.703698 2.4999996,13.036127 L 2.4999996,3.9394188 C 2.4999996,3.2718465 3.3000234,2.4999994 3.9631199,2.4999994 L 17.120074,2.4999994 z"
+       style="fill:url(#linearGradient8799);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8914);stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.99184585"
+       inkscape:original="M 3.71875 3.5 C 3.0556535 3.5 2.5000001 4.0511776 2.5 4.71875 L 2.5 14.28125 C 2.5000014 14.948821 3.0556534 15.5 3.71875 15.5 L 5.5 15.5 C 5.5 15.5 5.788384 17.978766 4.6875 19.28125 C 7.160157 18.334402 8.0324781 16.201613 8.5625 15.5 L 17.3125 15.5 C 17.975599 15.5 18.5 14.948821 18.5 14.28125 L 18.5 4.71875 C 18.5 4.0511777 17.975599 3.5000001 17.3125 3.5 L 3.71875 3.5 z "
+       style="fill:url(#linearGradient8716);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999939999999998;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="path8805"
+       d="M 3.71875,4.5 C 3.6052801,4.5 3.5,4.6015523 3.5,4.71875 L 3.5,14.28125 C 3.5000002,14.398448 3.6052813,14.5 3.71875,14.5 L 5.5,14.5 C 6.0083008,14.492334 6.440125,14.87018 6.5,15.375 C 6.5,15.375 6.5264519,16.055972 6.5,16.75 C 6.5214715,16.72401 6.5728376,16.713552 6.59375,16.6875 C 7.1128586,16.040814 7.3826252,15.433927 7.78125,14.90625 C 7.9639971,14.656332 8.2529544,14.506075 8.5625,14.5 L 17.3125,14.5 C 17.425973,14.5 17.5,14.429401 17.5,14.28125 L 17.5,4.71875 C 17.5,4.570597 17.425975,4.5 17.3125,4.5 L 3.71875,4.5 z"
+       transform="translate(0,-1.0000002)" />
+    <g
+       id="g2057"
+       inkscape:label="Layer 1"
+       transform="translate(42.12926,5.0376345)" />
+    <path
+       style="fill:url(#linearGradient8235);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8237);stroke-width:0.99999946;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 21.502303,14.998895 C 21.502303,18.588776 18.588776,21.502302 14.998895,21.502302 C 11.409014,21.502302 8.4954878,18.588776 8.4954878,14.998895 C 8.4954878,11.409014 11.409014,8.4954878 14.998895,8.4954878 C 18.588776,8.4954878 21.502303,11.409014 21.502303,14.998895 z"
+       id="path4331" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient8232);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999869;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 20.5,15 C 20.5,18.036001 18.036,20.5 15,20.5 C 11.963999,20.5 9.4999989,18.036001 9.4999989,15 C 9.4999989,11.964 11.963999,9.4999996 15,9.4999996 C 18.036,9.4999996 20.5,11.964 20.5,15 z"
+       id="path4333" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.19499996;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3374)"
+       id="path3302"
+       sodipodi:cx="11.484269"
+       sodipodi:cy="4.7465701"
+       sodipodi:rx="1.8659533"
+       sodipodi:ry="1.9428998"
+       d="M 13.350222,4.7465701 A 1.8659533,1.9428998 0 1 1 9.6183158,4.7465701 A 1.8659533,1.9428998 0 1 1 13.350222,4.7465701 z"
+       transform="matrix(1.9089437,-1.1115528,0.8192039,1.4310351,-12.113013,19.23752)" />
+  </g>
+</svg>
diff --git a/pidgin/pixmaps/tray/22/tray-away.png b/pidgin/pixmaps/tray/22/tray-away.png
index 070045823d..85c02e5b84 100644
--- a/pidgin/pixmaps/tray/22/tray-away.png
+++ b/pidgin/pixmaps/tray/22/tray-away.png
diff --git a/pidgin/pixmaps/tray/22/tray-busy.png b/pidgin/pixmaps/tray/22/tray-busy.png
index 1b70cc7e52..bdb6c7bd0e 100644
--- a/pidgin/pixmaps/tray/22/tray-busy.png
+++ b/pidgin/pixmaps/tray/22/tray-busy.png
diff --git a/pidgin/pixmaps/tray/22/tray-invisible.png b/pidgin/pixmaps/tray/22/tray-invisible.png
index b79f7509b9..e8b0e089a9 100644
--- a/pidgin/pixmaps/tray/22/tray-invisible.png
+++ b/pidgin/pixmaps/tray/22/tray-invisible.png
diff --git a/pidgin/pixmaps/tray/22/tray-new-im.png b/pidgin/pixmaps/tray/22/tray-new-im.png
index 16c4ef9823..e1ea55435e 100644
--- a/pidgin/pixmaps/tray/22/tray-new-im.png
+++ b/pidgin/pixmaps/tray/22/tray-new-im.png
diff --git a/pidgin/pixmaps/tray/22/tray-offline.png b/pidgin/pixmaps/tray/22/tray-offline.png
index 75e63573cb..eba9d1142f 100644
--- a/pidgin/pixmaps/tray/22/tray-offline.png
+++ b/pidgin/pixmaps/tray/22/tray-offline.png
diff --git a/pidgin/pixmaps/tray/22/tray-online.png b/pidgin/pixmaps/tray/22/tray-online.png
index 58e6f4dd11..244cac41a2 100644
--- a/pidgin/pixmaps/tray/22/tray-online.png
+++ b/pidgin/pixmaps/tray/22/tray-online.png
diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
index f8affaf205..277ac5e859 100644
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -319,8 +319,10 @@ static gboolean stop_flashing(GtkWidget *widget, GdkEventFocus *event, gpointer
 
 	winpidgin_window_flash(window, FALSE);
 
-	if ((handler_id = g_object_get_data(G_OBJECT(window), "flash_stop_handler_id")))
+	if ((handler_id = g_object_get_data(G_OBJECT(window), "flash_stop_handler_id"))) {
 		g_signal_handler_disconnect(G_OBJECT(window), (gulong) GPOINTER_TO_UINT(handler_id));
+		g_object_steal_data(G_OBJECT(window), "flash_stop_handler_id");
+	}
 
 	return FALSE;
 }
@@ -346,7 +348,10 @@ winpidgin_window_flash(GtkWindow *window, gboolean flash) {
 		info.cbSize = sizeof(FLASHWINFO);
 		info.hwnd = GDK_WINDOW_HWND(gdkwin);
 		if (flash) {
+			DWORD flashCount;
 			info.uCount = 3;
+			if (SystemParametersInfo(SPI_GETFOREGROUNDFLASHCOUNT, 0, &flashCount, 0))
+				info.uCount = flashCount;
 			info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
 		} else
 			info.dwFlags = FLASHW_STOP;
diff --git a/po/ChangeLog b/po/ChangeLog
index 77ec4f959d..944bcd0707 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,28 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.5.0
+	* Albanian translation updated (Besnik Bleta)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Daniël Heres, Hylke Bons)
+	* Estonian translation updated (Ivar Smolin)
+	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (Éric Boumaour)
+	* German translation updated (Jochen Kemnade, Björn Voigt)
+	* Hebrew translation updated (Shalom Craimer)
+	* Hungarian translation updated (Gabor Kelemen)
+	* Italian translation updated (Claudio Satriano)
+	* Lithuanian translation updated (Laurynas Biveinis)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
+	  Marques Flores)
+	* Romanian translation updated (Mişu Moldovan)
+	* Sinhala translation update (Yajith Ajantha Dayarathna)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fernández-Sanguino)
+	* Vietnamese translation updated (Clytie Siddall)
+
 version 2.4.2
 	* Afrikaans translation updated (Samuel Murray)
 	* Belarusian Latin translation updated (Ihar Hrachyshka)
@@ -20,7 +43,7 @@ version 2.4.2
 	* Romanian translation updated (Mişu Moldovan)
 	* Russian translation updated (Dmitry Beloglazov)
 	* Slovak translation updated (loptosko)
-	* Slovenian transalation updated (Martin Srebotnjak)
+	* Slovenian translation updated (Martin Srebotnjak)
 	* Spanish translation updated (Javier Fernández-Sanguino)
 
 version 2.4.1
@@ -42,7 +65,7 @@ version 2.4.1
 	* Romanian translation updated (Mişu Moldovan)
 	* Russian translation updated (Dmitry Beloglazov)
 	* Slovak translation updated (loptosko)
-	* Slovenian transalation updated (Martin Srebotnjak)
+	* Slovenian translation updated (Martin Srebotnjak)
 	* Spanish translation updated (Javier Fernández-Sanguino)
 	* Swedish translation updated (Peter Hjalmarsson)
 
@@ -60,7 +83,7 @@ version 2.4.0
 	* Polish translation updated (Emil Nowak)
 	* Sinhala translation added (Danishka Navin)
 	* Slovak translation updated (loptosko)
-	* Slovenian transalation updated (Martin Srebotnjak)
+	* Slovenian translation updated (Martin Srebotnjak)
 	* Spanish translation updated (Javier Fernández-Sanguino)
 	* Vietnamese translation updated (Clytie Siddall)
 
@@ -469,7 +492,7 @@ version 1.1.2 (1/20/2005):
 	* Danish translation updated (Morten (mbrix) Brix Pedersen)
 	* Dutch translation for gaim.desktop file (Vincent van Adrighem)
 	* Dutch translation updated (Vincent van Adrighem)
-	* English (Australian) transation updated (Peter (Bleeter) Lawler)
+	* English (Australian) translation updated (Peter (Bleeter) Lawler)
 	* English (British) translation updated
 	* English (Canadian) translation updated (Adam Weinberger)
 	* Finnish translation updated (Arto Alakulju)
@@ -549,7 +572,7 @@ version 1.0.0 (09/17/2004):
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Danish translation updated (Morten (mbrix) Brix Pedersen)
 	* Dutch translation updated (Vincent van Adrighem)
-	* English (Australian) transation added (Peter (Bleeter) Lawler)
+	* English (Australian) translation added (Peter (Bleeter) Lawler)
 	* English (British) translation updated (Luke (lukeross) Ross)
 	* English (Canadian) translation updated (Adam Weinberger)
 	* Finnish translation updated (Arto Alakulju)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5a127c3f0d..7a33a0faec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ libpurple/protocols/qq/group.c
 libpurple/protocols/qq/group_im.c
 libpurple/protocols/qq/group_internal.c
 libpurple/protocols/qq/group_join.c
-libpurple/protocols/qq/group_network.c
 libpurple/protocols/qq/group_opt.c
 libpurple/protocols/qq/im.c
 libpurple/protocols/qq/qq.c
diff --git a/po/cs.po b/po/cs.po
index d5ecc8719f..df9e621290 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 08:57-0400\n"
-"PO-Revision-Date: 2008-05-09 10:28+0100\n"
+"POT-Creation-Date: 2008-08-15 11:56-0400\n"
+"PO-Revision-Date: 2008-08-11 21:00+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -97,6 +97,10 @@ msgstr "Heslo:"
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Vytvořit tento účet na serveru"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -323,6 +327,7 @@ msgstr "Značka"
 msgid "Nickname"
 msgstr "Přezdívka"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "Nečinný"
@@ -402,6 +407,9 @@ msgstr "Připojit se k chatu..."
 msgid "View Log..."
 msgstr "Zobrazit záznam ..."
 
+msgid "View All Logs"
+msgstr "Zobrazit všechny záznamy"
+
 msgid "Show"
 msgstr "Zobrazit"
 
@@ -598,6 +606,19 @@ msgstr ""
 msgid "Send To"
 msgstr "Odeslat do"
 
+msgid "Invite message"
+msgstr "Zvací zpráva"
+
+msgid "Invite"
+msgstr "Pozvat"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Zadejte prosím jméno uživatele, kterého chcete pozvat,\n"
+"a nepovinně i zvací zprávu."
+
 msgid "Conversation"
 msgstr "Konverzace"
 
@@ -610,6 +631,9 @@ msgstr "Zobrazovat časové značky"
 msgid "Add Buddy Pounce..."
 msgstr "Přidat sledování kamaráda..."
 
+msgid "Invite..."
+msgstr "Pozvat..."
+
 msgid "Enable Logging"
 msgstr "Povolit zaznamenávání"
 
@@ -619,9 +643,12 @@ msgstr "Povolit zvuky"
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-ODPOVĚĎ> "
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "Seznam uživatelů:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Seznam %d uživatelů:\n"
+msgstr[1] "Seznam %d uživatelů:\n"
+msgstr[2] "Seznam %d uživatelů:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "Podporované ladicí přepínače jsou: version"
@@ -636,6 +663,16 @@ msgstr ""
 "Pro nápovědu o konkrétním příkazu použijte \"/help &lt;příkaz&gt;\".\n"
 "V tomto kontextu jsou k dispozici následující příkazy:\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr "%s není platná třída zpráv. Viz '/help msgcolor' pro platné třídy."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s není platná barva. Viz '/help msgcolor' pro platné barvy."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -679,6 +716,19 @@ msgstr "prefs: Zobrazit okno nastavení."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Zobrazit okno uložených stavů."
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Nastaví barvu "
+"pro rozdílné třídy zpráv v okně konverzace.<br>    &lt;class&gt;: receive, "
+"send, highlight, action, timestamp<br>    &lt;foreground/background&gt;: "
+"black, red, green, blue, white, gray, darkgray, magenta, cyan, "
+"default<br><br>PŘÍKLAD:<br>    msgcolor send cyan default"
+
 msgid "Unable to open file."
 msgstr "Nemohu otevřít soubor."
 
@@ -699,8 +749,11 @@ msgid "Pause"
 msgstr "Pozastavit"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Přenosy souborů - %d%% z %d souborů"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Přenos souboru - %d%% z %d souboru"
+msgstr[1] "Přenosy souborů - %d%% z %d souborů"
+msgstr[2] "Přenosy souborů - %d%% z %d souborů"
 
 #. Create the window.
 msgid "File Transfers"
@@ -815,6 +868,9 @@ msgstr "Konverzace v %s"
 msgid "Conversations with %s"
 msgstr "Konverzace s %s"
 
+msgid "All Conversations"
+msgstr "Všechny konverzace"
+
 msgid "System Log"
 msgstr "Systémový záznam"
 
@@ -853,9 +909,6 @@ msgstr "Pokračovat"
 msgid "IM"
 msgstr "IM"
 
-msgid "Invite"
-msgstr "Pozvat"
-
 msgid "(none)"
 msgstr "(žádné)"
 
@@ -1059,6 +1112,7 @@ msgstr "%s šel pryč. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s vám poslal zprávu. (%s)"
 
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznámá událost sledování. Oznamte to prosím!"
 
@@ -1170,7 +1224,7 @@ msgid "Someone says your username in chat"
 msgstr "Někdo v chatu řekne vaše jméno"
 
 msgid "GStreamer Failure"
-msgstr "Selhání GStremaeru"
+msgstr "Selhání GStreameru"
 
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer se nemohl inicializovat."
@@ -1425,6 +1479,7 @@ msgstr ""
 "Když je otevřena nová konverzace, tento zásuvný modul vloží poslední "
 "konverzaci do aktuální konverzace."
 
+#, c-format
 msgid "Online"
 msgstr "Připojen"
 
@@ -1756,6 +1811,7 @@ msgstr ""
 "Chyba při čtení ze souboru vyhledávače:\n"
 "%s"
 
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Konec souboru při čtení z procesu vyhledávače"
 
@@ -1845,6 +1901,7 @@ msgstr "Začínám přenos %s od %s"
 msgid "Transfer of file %s complete"
 msgstr "Přenos souboru %s dokončen"
 
+#, c-format
 msgid "File transfer complete"
 msgstr "Přenos souborů dokončen"
 
@@ -1852,6 +1909,7 @@ msgstr "Přenos souborů dokončen"
 msgid "You canceled the transfer of %s"
 msgstr "Zrušili jste přenos %s"
 
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Přenos souborů zrušen"
 
@@ -2054,6 +2112,7 @@ msgstr "(%s) %s <AUTO-ODPOVĚĎ>: %s\n"
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Používáte %s, ale tento zásuvný modul vyžaduje %s."
 
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Tento zásuvný modul nedefinoval ID."
 
@@ -2065,8 +2124,11 @@ msgstr "Magie zásuvného modulu %d nesouhlasí (potřebuji %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Verze ABI %d.%d.x nesouhlasí (potřebuji %d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "Zásuvný modul neimplementuje všechny vyžadované funkce"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Zásuvný modul neimplementuje všechny vyžadované funkce (list_icon, login a "
+"close)"
 
 #, c-format
 msgid ""
@@ -2148,6 +2210,9 @@ msgstr ""
 "dokončen\n"
 "(jen když neexistuje konverzace s odesílatelem)"
 
+msgid "Create a new directory for each user"
+msgstr "Vytvořit nový adresář pro každého uživatele"
+
 msgid "Notes"
 msgstr "Poznámky"
 
@@ -2244,16 +2309,16 @@ msgid "None of your accounts are idle."
 msgstr "Žádný váš účet není nečinný."
 
 msgid "Unset Account Idle Time"
-msgstr "Zrušit čas nečinnosti účtu"
+msgstr "Odebrat čas nečinnosti účtu"
 
 msgid "_Unset"
-msgstr "_Zrušit"
+msgstr "_Odebrat"
 
 msgid "Set Idle Time for All Accounts"
 msgstr "Nastavit čas nečinnosti pro všechny účty"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Zrušit čas nečinnosti pro všechny nečinné účty"
+msgstr "Odebrat čas nečinnosti pro všechny nečinné účty"
 
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Umožňuje vám ručně nastavit, jak dlouho jste byli nečinní"
@@ -2722,13 +2787,11 @@ msgstr ""
 "TCL, nainstalujte ActiveTCL z http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
-"The Apple Bonjour pro Windows toolkit nebyl nalezen, viz FQA: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"Apple Bonjour pro Windows toolkit nebyl nalezen, viz FAQ: http://d.pidgin.im/"
+"BonjourWindows pro další informace."
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Nemohu poslouchat příchozí spojení IM\n"
@@ -2782,9 +2845,6 @@ msgstr "Nemohu odeslat zprávu, konverzaci nelze spustit."
 msgid "Cannot open socket"
 msgstr "Nemohu otevřít socket"
 
-msgid "Error setting socket options"
-msgstr "Chyba při nastavování možností socketu"
-
 msgid "Could not bind socket to port"
 msgstr "Nemohu připojit socket k portu"
 
@@ -2835,6 +2895,9 @@ msgstr "Seznam kamarádů úspěšně načten!"
 msgid "Save buddylist..."
 msgstr "Uložit seznam kamarádů..."
 
+msgid "Load buddylist from file..."
+msgstr "Načíst seznam kamarádů ze serveru..."
+
 msgid "Fill in the registration fields."
 msgstr "Vyplňte pole pro registraci."
 
@@ -2932,6 +2995,7 @@ msgstr "Přítomen"
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
+#, c-format
 msgid "Away"
 msgstr "Pryč"
 
@@ -3010,9 +3074,6 @@ msgstr "Odstranit seznam kamarádů ze serveru"
 msgid "Save buddylist to file..."
 msgstr "Uložit seznam kamarádů do souboru..."
 
-msgid "Load buddylist from file..."
-msgstr "Načíst seznam kamarádů ze serveru..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -3128,6 +3189,9 @@ msgstr "Port"
 msgid "Encodings"
 msgstr "Kódování"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "Automaticky detekovat příchozí UTF-8"
+
 msgid "Real name"
 msgstr "Skutečné jméno"
 
@@ -3142,8 +3206,8 @@ msgid "Bad mode"
 msgstr "Špatný mód"
 
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "Ban na %s od %s, nastaven před %ld sekundami"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Ban na %s od %s, nastaven před %s"
 
 #, c-format
 msgid "Ban on %s"
@@ -3313,6 +3377,9 @@ msgstr ""
 "away [zpráva]: Nastavit zprávu o nepřítomnosti, nebo nepoužijte žádnou "
 "zprávu pro návrat z nepřítomnosti."
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <přezdívka> <zpráva>: pošle ctcp zprávu."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Odeslat příkaz chanservu"
 
@@ -3379,8 +3446,8 @@ 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;přezdívka|kanál&gt;: Nastavit nebo zrušit "
-"režim kanálu nebo uživatele."
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;přezdívka|kanál&gt;: Nastavit nebo "
+"odebrat režim kanálu nebo uživatele."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
@@ -3459,7 +3526,8 @@ msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nové téma]: Zobrazit nebo změnit téma kanálu."
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Nastavit nebo zrušit režim uživatele."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;: Nastavit nebo odebrat režim uživatele."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [přezdívka]: poslat uživateli požadavek CTCP VERSION"
@@ -3569,6 +3637,8 @@ msgstr "PSČ"
 msgid "Country"
 msgstr "Země"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -3755,12 +3825,12 @@ msgstr "Kontrola hopu"
 msgid "Capabilities"
 msgstr "Schopnosti"
 
-msgid "Resource"
-msgstr "Zdroj"
-
 msgid "Priority"
 msgstr "Priorita"
 
+msgid "Resource"
+msgstr "Zdroj"
+
 msgid "Middle Name"
 msgstr "Prostřední jméno"
 
@@ -3807,6 +3877,7 @@ msgstr "Chatty"
 msgid "Extended Away"
 msgstr "Pryč na dlouho"
 
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Nerušit"
 
@@ -4448,8 +4519,8 @@ msgid "XMPP Message Error"
 msgstr "Chyba zprávy XMPP"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (Kód %s)"
+msgid "(Code %s)"
+msgstr "(Kód %s)"
 
 msgid "XML Parse error"
 msgstr "Chyba zpracování XML"
@@ -4474,14 +4545,14 @@ msgid "_Accept Defaults"
 msgstr "_Přijmout implicitní"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Chyba v chatu %s"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "Chyba při připojování k chatu %s"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "Chyba v chatu %s"
+
+#, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Nemohu odeslat soubor %s, uživatel nepodporuje přenosy souborů"
 
@@ -4563,162 +4634,215 @@ msgstr ""
 "%s je na místním seznamu, ale ne v seznamu na serveru. Chcete přidat tohoto "
 "kamaráda?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "Nemohu zpracovat zprávu"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaktická chyba (pravděpodobně chyba v klientovi)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "Neplatná emailová adresa"
 
+#, c-format
 msgid "User does not exist"
 msgstr "Uživatel neexistuje"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Chybí plně kvalifikovaný název domény"
 
+#, c-format
 msgid "Already logged in"
 msgstr "Již přihlášen"
 
+#, c-format
 msgid "Invalid username"
 msgstr "Neplatné jméno uživatele"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Neplatné přátelské jméno"
 
+#, c-format
 msgid "List full"
 msgstr "Seznam plný"
 
+#, c-format
 msgid "Already there"
 msgstr "Již tam"
 
+#, c-format
 msgid "Not on list"
 msgstr "Ne na seznamu"
 
+#, c-format
 msgid "User is offline"
 msgstr "Uživatel je odpojen"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "Již v daném režimu"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "Již v opačném seznamu"
 
+#, c-format
 msgid "Too many groups"
 msgstr "Příliš mnoho skupin"
 
+#, c-format
 msgid "Invalid group"
 msgstr "Neplatná skupina"
 
+#, c-format
 msgid "User not in group"
 msgstr "Uživatel není ve skupině"
 
+#, c-format
 msgid "Group name too long"
 msgstr "Název skupiny příliš dlouhý"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nemohu odstranit skupinu nula"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Pokus přidat uživatele do skupiny, která neexistuje"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Ústředna selhala"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Přenos upozornění selhal"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "Vyžadovaná pole chybí"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Příliš mnoho výsledků FND"
 
+#, c-format
 msgid "Not logged in"
 msgstr "Nepřihlášen."
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Služba momentálně není k dispozici"
 
+#, c-format
 msgid "Database server error"
 msgstr "Chyba databázového serveru"
 
+#, c-format
 msgid "Command disabled"
 msgstr "Příkaz zakázán"
 
+#, c-format
 msgid "File operation error"
 msgstr "Chyba práce se soubory"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "Chyba alokace paměti"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Serveru odeslána špatná hodnota CHL"
 
+#, c-format
 msgid "Server busy"
 msgstr "Server zaneprázdněn"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "Server nedostupný"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "Server upozornění na partnera nedostupný"
 
+#, c-format
 msgid "Database connect error"
 msgstr "Chyba připojení k databázi"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server se vypíná (opusťte loď)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "Chyba vytváření spojení"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametry CVR nejsou známy nebo nejsou povoleny"
 
+#, c-format
 msgid "Unable to write"
 msgstr "Nemohu zapisovat"
 
+#, c-format
 msgid "Session overload"
 msgstr "Sezení přetíženo"
 
+#, c-format
 msgid "User is too active"
 msgstr "Uživatel je příliš aktivní"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "Příliš mnoho sezení"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport nebyl ověřen"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "Špatný soubor přátel"
 
+#, c-format
 msgid "Not expected"
 msgstr "Neočekáváno"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Přátelské jméno se mění příliš rychle"
 
+#, c-format
 msgid "Server too busy"
 msgstr "Server je příliš zaneprázdněn"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "Autentizace selhala"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Nedovoleno při odpojení"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "Nepřijímám nové uživatele"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport dítěte bez souhlasu rodiče"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Účet passport ještě nebyl ověřen"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "Špatný lístek"
 
@@ -4741,6 +4865,9 @@ msgstr "%s odeslal šťouchnutí."
 msgid "Nudging %s..."
 msgstr "Šťouchám do %s..."
 
+msgid "Email Address..."
+msgstr "Emailová adresa..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše nové přátelské jméno MSN je příliš dlouhé."
 
@@ -4775,8 +4902,20 @@ msgstr "Povolit"
 msgid "Disallow"
 msgstr "Zakázat"
 
-msgid "This Hotmail account may not be active."
-msgstr "Tento účet Hotmail možná není aktivní."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Blokovaný text pro %s"
+
+msgid "No text is blocked for this account."
+msgstr "Žádný text není blokován pro tento účet."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN servery blokují následující regulární výrazy:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Tento účet nemá povolen email."
 
 msgid "Send a mobile message."
 msgstr "Odeslat mobilní zprávu."
@@ -4835,6 +4974,9 @@ msgstr "Povolit/zakázat mobilní zařízení..."
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Povolit/zakázat mobilní stránky..."
 
+msgid "View Blocked Text..."
+msgstr "Zobrazit blokovaný text..."
+
 msgid "Open Hotmail Inbox"
 msgstr "Otevřít Příchozí poštu Hotmailu"
 
@@ -5037,16 +5179,8 @@ msgstr "nudge: získat pozornost uživatele šťouchnutím"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID autentizace: Nemohu se připojit"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Windows Live ID autentizace: Nemohu najít autentifikační příznak v odpovědi "
-"serveru"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID autentizace selhala"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID autentizace: Neplatná odpověď"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5093,6 +5227,9 @@ msgstr "%s není platný účet passport."
 msgid "Service Temporarily Unavailable."
 msgstr "Služba dočasně není k dispozici."
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "Zpráva na mobil nebyla odeslána, protože byla příliš dlouhá."
+
 msgid "Unable to rename group"
 msgstr "Nemohu přejmenovat skupinu"
 
@@ -5130,6 +5267,22 @@ msgstr[2] ""
 "\n"
 "Až bude údržba dokončena, budete se moci přihlásit."
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Zpráva nebyla poslána, protože systém je nedostupný. Stává se to, když je "
+"uživatel blokovaný nebo neexistuje."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Zprávu nelze odeslat, protože odesíláme příliš rychle."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě kódování."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě."
+
 msgid "Unable to connect"
 msgstr "Nemohu se připojit"
 
@@ -5247,6 +5400,9 @@ msgstr "Nemohu přidat \"%s\"."
 msgid "The username specified is invalid."
 msgstr "Zadané jméno uživatele není platné."
 
+msgid "This Hotmail account may not be active."
+msgstr "Tento účet Hotmail možná není aktivní."
+
 msgid "Has you"
 msgstr "Má vás"
 
@@ -5286,8 +5442,14 @@ msgid "Logging in"
 msgstr "Přihlašování"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "Připojení k serveru ztraceno (za %d sekund nebyla přijata žádná data)"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+"Připojení k serveru ztraceno (za %d sekundu nebyla přijata žádná data)"
+msgstr[1] ""
+"Připojení k serveru ztraceno (za %d sekundy nebyla přijata žádná data)"
+msgstr[2] ""
+"Připojení k serveru ztraceno (za %d sekund nebyla přijata žádná data)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5384,9 +5546,18 @@ msgstr "Přátelé IM"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"%d kamarád bylo přidán nebo aktualizován ze serveru (včetně kamarádů, kteří "
+"již jsou na seznamu na serveru)"
+msgstr[1] ""
+"%d kamarádi byli přidáni nebo aktualizováni ze serveru (včetně kamarádů, "
+"kteří již jsou na seznamu na serveru)"
+msgstr[2] ""
 "%d kamarádů bylo přidáno nebo aktualizováno ze serveru (včetně kamarádů, "
 "kteří již jsou na seznamu na serveru)"
 
@@ -5857,6 +6028,7 @@ msgstr ""
 msgid "Error. SSL support is not installed."
 msgstr "Chyba. Není nainstalována podpora SSL."
 
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tato konference byla uzavřena. Nelze tam posílat další zprávy."
 
@@ -6007,11 +6179,11 @@ msgstr "Nedostatečná oprávnění"
 msgid "In local permit/deny"
 msgstr "V místním povolit/zakázat"
 
-msgid "Too evil (sender)"
-msgstr "Příliš zlý (odesílatel)"
+msgid "Warning level too high (sender)"
+msgstr "Hladina varování příliš vysoká (odeslání)"
 
-msgid "Too evil (receiver)"
-msgstr "Příliš zlý (příjemce)"
+msgid "Warning level too high (receiver)"
+msgstr "Hladina varování příliš vysoká (příjem)"
 
 msgid "User temporarily unavailable"
 msgstr "Uživatel dočasně nedostupný"
@@ -6113,18 +6285,26 @@ msgstr "Živé video"
 msgid "Camera"
 msgstr "Kamera"
 
+msgid "Screen Sharing"
+msgstr "Sdílení obrazovky"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Volný pro chat"
 
+#, c-format
 msgid "Not Available"
 msgstr "Nejsem k dispozici"
 
+#, c-format
 msgid "Occupied"
 msgstr "Zaměstnán"
 
+#, c-format
 msgid "Web Aware"
 msgstr "Ví o WWW"
 
+#, c-format
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -6198,7 +6378,6 @@ msgstr ""
 "Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
 "to znovu. Pokud to budete dále zkouše, budete muset čekat ještě déle."
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6243,6 +6422,7 @@ msgstr "Možná budete brzo odpojen. Hledejte aktualizace na %s."
 msgid "Unable to get a valid login hash."
 msgstr "Nemohu získat platný přihlašovací hash."
 
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Heslo odesláno"
 
@@ -6360,18 +6540,33 @@ msgstr[2] ""
 "Přišli jste o %hu zpráv od %s, protože limit rychlosti byl překročen."
 
 #, 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] "Přišli jste o %hu zprávu od %s, protože byli příliš zlí."
-msgstr[1] "Přišli jste o %hu zprávy od %s, protože byli příliš zlí."
-msgstr[2] "Přišli jste o %hu zpráv od %s, protože byli příliš zlí."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Přišli jste o %hu zprávu od %s, protože jeho/její hladina varování je příliš "
+"vysoká."
+msgstr[1] ""
+"Přišli jste o %hu zprávy od %s, protože jeho/její hladina varování je příliš "
+"vysoká."
+msgstr[2] ""
+"Přišli jste o %hu zpráv od %s, protože jeho/její hladina varování je příliš "
+"vysoká."
 
 #, 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] "Přišli jste o %hu zprávu od %s, protože jste velmi zlí."
-msgstr[1] "Přišli jste o %hu zprávy od %s, protože jste velmi zlí."
-msgstr[2] "Přišli jste o %hu zpráv od %s, protože jste velmi zlí."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Přišli jste o %hu zprávu od %s, protože vaše hladina varování je příliš "
+"vysoká."
+msgstr[1] ""
+"Přišli jste o %hu zprávy od %s, protože vaše hladina varování je příliš "
+"vysoká."
+msgstr[2] ""
+"Přišli jste o %hu zpráv od %s, protože vaše hladina varování je příliš "
+"vysoká."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6402,9 +6597,6 @@ msgstr "Odpojen od"
 msgid "Member Since"
 msgstr "Člen od"
 
-msgid "Available Message"
-msgstr "Zpráva o dostupnosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaše spojení AIM může být přerušeno."
 
@@ -6433,12 +6625,17 @@ msgstr "Mobilní telefon"
 msgid "Personal Web Page"
 msgstr "Osobní WWW stránka"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Přídavné informace"
 
 msgid "Zip Code"
 msgstr "PSČ"
 
+msgid "Work Information"
+msgstr "Pracovní informace"
+
 msgid "Division"
 msgstr "Oddělení"
 
@@ -6448,9 +6645,6 @@ msgstr "Pozice"
 msgid "Web Page"
 msgstr "WWW stránka"
 
-msgid "Work Information"
-msgstr "Pracovní informace"
-
 msgid "Pop-Up Message"
 msgstr "Vyskakovací zpráva"
 
@@ -6592,8 +6786,8 @@ msgid ""
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Nemohu přidat kamaráda %s, protože jméno uživatele není platné. Jméno "
-"uživatele musí být platná emailová adresa, nebo začínat písmenem a "
-"obsahovat jen číslice, písmena a mezery, nebo obsahovat jen číslice."
+"uživatele musí být platná emailová adresa, nebo začínat písmenem a obsahovat "
+"jen číslice, písmena a mezery, nebo obsahovat jen číslice."
 
 msgid "Unable To Add"
 msgstr "Nemohu přidat"
@@ -6666,12 +6860,6 @@ msgstr "_Výměna:"
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Váš IM Image nebyl odeslán. Nemůžete odesílat IM Image v chatech AIM."
 
-msgid "Away Message"
-msgstr "Zpráva o nepřítomnosti"
-
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(stahuji)</i>"
-
 msgid "iTunes Music Store Link"
 msgstr "Odkaz na iTunes Music Store"
 
@@ -6795,6 +6983,9 @@ msgstr ""
 "a přímé IM používat proxy server AIM/ICQ\n"
 "(pomalejší, ale neodkryje vaši IP adresu)"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "Povolit několikanásobné současné přihlášení"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Žádám %s, aby se k nám připojili na %s:%hu pro přímé IM."
@@ -6803,6 +6994,7 @@ msgstr "Žádám %s, aby se k nám připojili na %s:%hu pro přímé IM."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Pokouším se připojit k %s:%hu."
 
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Pokouším se připojit přes proxy server."
 
@@ -7099,13 +7291,6 @@ msgstr ""
 "Poznámka, jste-li tvůrce, \n"
 "tato operace časem tento Qun odstraní."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Kód [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "Chyba operace se skupinou"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Chcete tento požadavek schválit?"
@@ -7134,34 +7319,39 @@ msgstr "Zpráva systému"
 msgid "Failed to send IM."
 msgstr "Nemohu odeslat IM."
 
-msgid "Keep alive error"
-msgstr "Chyba při udržování naživu"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Neznámé-%d"
 
-msgid "Error requesting login token"
-msgstr "Chyba při žádání o přihlašovací token"
+msgid "Level"
+msgstr "Úroveň"
 
-msgid "Unable to login. Check debug log."
-msgstr "Nemohu se přihlásit. Zkontrolujte ladicí výpis"
+msgid "Member"
+msgstr "Člen"
 
-msgid "Unable to login"
-msgstr "Nemohu se přihlásit"
+msgid " VIP"
+msgstr " VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nemohu se připojit."
+msgid " TCP"
+msgstr " TCP"
 
-#, c-format
-msgid "Unknown-%d"
-msgstr "Neznámé-%d"
+msgid " FromMobile"
+msgstr " FromMobile"
 
-msgid "TCP Address"
-msgstr "TCP adresa"
+msgid " BindMobile"
+msgstr " BindMobile"
 
-msgid "UDP Address"
-msgstr "UDP adresa"
+msgid " Video"
+msgstr "Video"
 
-msgid "Level"
-msgstr "Úroveň"
+msgid " Space"
+msgstr "Space"
+
+msgid "Flag"
+msgstr "Flag"
+
+msgid "Ver"
+msgstr "Ver"
 
 msgid "Invalid name"
 msgstr "Neplatné jméno"
@@ -7175,12 +7365,16 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Poslední obnovení</b>: %s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Server</b>: %s: %d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Režim připojení</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP serveru</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Hostname</b>: %s: %d<br>\n"
 
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
@@ -7232,12 +7426,91 @@ msgstr "Zásuvný modul\tprotokolu QQ"
 msgid "Connect using TCP"
 msgstr "Připojit se pomocí TCP"
 
+msgid "resend interval(s)"
+msgstr "Interval znovu-poslání"
+
+msgid "Keep alive interval(s)"
+msgstr "Interval udržování naživu"
+
+msgid "Update interval(s)"
+msgstr "Interval updatu"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Neplatná délka symbolu, %d"
+
+msgid "Keep alive error"
+msgstr "Chyba při udržování naživu"
+
+msgid "Failed to connect server"
+msgstr "Selhalo připojení k serveru"
+
 msgid "Socket error"
 msgstr "Chyba socketu"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Ztraceno spojení se serverem:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "Nemohu číst ze socketu"
 
+msgid "Write Error"
+msgstr "Chyba při zápisu"
+
+msgid "Connection lost"
+msgstr "Spojení ztraceno"
+
+msgid "Couldn't resolve host"
+msgstr "Nemohu najít počítač"
+
+msgid "hostname is NULL or port is 0"
+msgstr "hostname je NULL nebo je port 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Připojování serveru %s, %d opětovných pokusů"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Nemohu se připojit."
+
+msgid "Could not resolve hostname"
+msgstr "Nemohu přeložit název počítače"
+
+msgid "Unable to login. Check debug log."
+msgstr "Nemohu se přihlásit. Zkontrolujte ladicí výpis"
+
+msgid "Unable to login"
+msgstr "Nemohu se přihlásit"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Přihlášení selhalo, žádná odpověď"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Vy [%d] jste byli přidáno do skupiny \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Neplatný symbol kódu odpovědi, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d odmítl soubor %s"
@@ -7249,12 +7522,6 @@ msgstr "Odeslání souboru"
 msgid "%d canceled the transfer of %s"
 msgstr "%d zrušil přenos %s"
 
-msgid "Connection lost"
-msgstr "Spojení ztraceno"
-
-msgid "Login failed, no reply"
-msgstr "Přihlášení selhalo, žádná odpověď"
-
 msgid "Do you want to add this buddy?"
 msgstr "Chcete přidat tohoto kamaráda?"
 
@@ -7291,6 +7558,14 @@ msgstr "Zpráva: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s není ve vašem seznamu kamarádů"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "Poznámka od: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Spojení uzavřeno (zápis)"
 
@@ -7881,6 +8156,7 @@ msgstr "<br><b>HMAC kanálu:</b>\t%s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Téma kanálu:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Režimy kanálu:</b> "
 
@@ -7905,6 +8181,7 @@ msgstr "Heslo kanálu"
 msgid "Channel Public Keys List"
 msgstr "Seznam veřejných klíčů kanálu"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8297,9 +8574,14 @@ msgstr "Nemohu inicializovat protokol SILC"
 msgid "Error loading SILC key pair"
 msgstr "Chyba při načítání páru klíčů SILC"
 
+#, c-format
+msgid "Download %s: %s"
+msgstr "Stahování %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Vaše momentální nálada"
 
+#, c-format
 msgid "Normal"
 msgstr "Normální"
 
@@ -8674,33 +8956,43 @@ msgstr "Tabule"
 msgid "No server statistics available"
 msgstr "Statistika o serveru není k dispozici"
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Chyba: Verze nesouhlasí, aktualizujte vašeho klienta"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Chyba: Vzdálený nevěří/nepodporuje váš veřejný klíč"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Chyba: Vzdálený nepodporuje navrženou skupinu KE"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Chyba: Vzdálený nepodporuje navrženou šifru"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Chyba: Vzdálený nepodporuje navržený PKCS"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Chyba: Vzdálený nepodporuje navrženou hašovací funkci"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Chyba: Vzdálený nepodporuje navržený HMAC"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Chyba: Nesprávný podpis"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Chyba: Neplatný cookie"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Autentizace selhala"
 
@@ -8726,12 +9018,6 @@ msgstr "Neznámá odpověď serveru."
 msgid "Could not create listen socket"
 msgstr "Nemohu vytvořit socket pro poslouchání"
 
-msgid "Couldn't resolve host"
-msgstr "Nemohu najít počítač"
-
-msgid "Could not resolve hostname"
-msgstr "Nemohu přeložit název počítače"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Jména uživatelů SIP nemohou obsahovat mezery ani symboly @"
 
@@ -8800,6 +9086,7 @@ msgstr "%s není momentálně přihlášen."
 msgid "Warning of %s not allowed."
 msgstr "Varování %s není povoleno."
 
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Zpráva byla zahozena, překračujete limit rychlosti serveru."
 
@@ -8819,30 +9106,39 @@ msgstr "Přišli jste IM od %s, protože byla příliš dlouhá."
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Přišli jste o IM %s, protože byla odeslána příliš rychle."
 
+#, c-format
 msgid "Failure."
 msgstr "Selhání."
 
+#, c-format
 msgid "Too many matches."
 msgstr "Příliš mnoho odpovědí."
 
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Potřebuji více kvalifikátorů."
 
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Adresářová služba momentálně není k dispozici."
 
+#, c-format
 msgid "Email lookup restricted."
 msgstr "Vyhledávání podle emailu omezeno."
 
+#, c-format
 msgid "Keyword ignored."
 msgstr "Klíčové slovo ignorováno."
 
+#, c-format
 msgid "No keywords."
 msgstr "Žádné klíčové slovo."
 
+#, c-format
 msgid "User has no directory information."
 msgstr "Uživatel nemá žádné informace v adresáři."
 
+#, c-format
 msgid "Country not supported."
 msgstr "Země není podporována."
 
@@ -8850,15 +9146,19 @@ msgstr "Země není podporována."
 msgid "Failure unknown: %s."
 msgstr "Neznámé selhání: %s."
 
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Nesprávné jméno uživatele nebo heslo."
 
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Služba je dočasně nedostupná."
 
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Vaše úroveň výstrahy je momentálně příliš vysoká pro přihlášení."
 
+#, c-format
 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."
@@ -9162,9 +9462,6 @@ msgstr "Nemohu získat deskriptor souboru."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s zkouší vám poslat %d souborů.\n"
 
-msgid "Write Error"
-msgstr "Chyba při zápisu"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonsko"
 
@@ -9460,6 +9757,14 @@ msgstr "Chyba při překladu %s"
 msgid "Could not resolve host name"
 msgstr "Nemohu přeložit název počítače"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Vyžaduji pozornost %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s vyžaduje vaší pozornost!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9489,14 +9794,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s je teď znám jako %s.\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "Vyžaduji pozornost %s..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s vyžaduje vaší pozornost!"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9511,6 +9808,20 @@ msgstr "%s zve %s do místnosti chatu %s\n"
 msgid "Accept chat invitation?"
 msgstr "Přijmout pozvání k chatu?"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "Klávesová zkratka"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Textová zkratka pro smajlíky"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Uložený obrázek"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Uložený obrázek. (který musí být teď vytvořen)"
+
 msgid "SSL Connection Failed"
 msgstr "SSL spojení selhalo"
 
@@ -9566,6 +9877,12 @@ msgstr "+++ %s se stal nečinným"
 msgid "+++ %s became unidle"
 msgstr "+++ %s se stal činným"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9667,21 +9984,30 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Připojení porušeno jiným softwarem na počítači."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "Vzdálený počítač ukončil připojení."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "Spojení vypršel čas."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "Spojení odmítnuto."
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Adresa se již používá"
+
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
 
@@ -9790,8 +10116,8 @@ msgstr "Přidat účet"
 msgid "_Basic"
 msgstr "Zá_kladní"
 
-msgid "Create this new account on the server"
-msgstr "Vytvořit tento nový účet na serveru"
+msgid "Create _this new account on the server"
+msgstr "Vytvořit _tento nový účet na serveru"
 
 msgid "_Advanced"
 msgstr "_Pokročilé"
@@ -9894,6 +10220,12 @@ msgstr "_Alias..."
 msgid "_Remove"
 msgstr "_Odstranit"
 
+msgid "Set Custom Icon"
+msgstr "Nastavit vlastní ikonu"
+
+msgid "Remove Custom Icon"
+msgstr "Odstranit vlastní ikonu"
+
 msgid "Add _Buddy..."
 msgstr "_Přidat kamaráda"
 
@@ -9991,7 +10323,7 @@ msgstr "/Kamarádi/_Konec"
 msgid "/_Accounts"
 msgstr "/_Účty"
 
-msgid "/Accounts/Manage"
+msgid "/Accounts/Manage Accounts"
 msgstr "/Účty/Spravovat"
 
 #. Tools
@@ -10013,6 +10345,9 @@ msgstr "/Nástroje/_Nastavení"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Soukromí"
 
+msgid "/Tools/Smile_y"
+msgstr "/Nástroje/Smajlíky"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Přenosy souborů"
 
@@ -10177,10 +10512,10 @@ 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</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'>Vítá vás %s!</span>\n"
+"<span weight='bold' size='larger'>Vítá vás %s!</span>\n"
 "\n"
 "Nemáte povoleny žádné účty. Povolte své účty IM z menu <b>Účty</b> na "
 "<b>Účty->Spravovat</b>. Až povolíte účty, budete se moci přihlásit, nastavit "
@@ -10244,6 +10579,12 @@ msgstr "_Skrýt chat při zavření okna."
 msgid "Please enter the name of the group to be added."
 msgstr "Zadejte prosím název skupiny, kterou přidat."
 
+msgid "Enable Account"
+msgstr "Povolit účet"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Účty/Povolit účet"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Účty/"
 
@@ -10256,12 +10597,6 @@ msgstr "Žádné akce nejsou k dispozici"
 msgid "_Disable"
 msgstr "Za_kázat"
 
-msgid "Enable Account"
-msgstr "Povolit účet"
-
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Účty/Povolit účet"
-
 msgid "/Tools"
 msgstr "/Nástroje"
 
@@ -10345,9 +10680,6 @@ msgstr "Nastavit vlastní ikonu..."
 msgid "Change Size"
 msgstr "Změnit velikost"
 
-msgid "Remove Custom Icon"
-msgstr "Odstranit vlastní ikonu"
-
 msgid "Show All"
 msgstr "Zobrazit vše"
 
@@ -10615,12 +10947,13 @@ msgstr "Chyba "
 msgid "Fatal Error"
 msgstr "Fatální chyba"
 
-msgid "lead developer"
-msgstr "vedoucí vývojář"
-
 msgid "developer"
 msgstr "vývojář"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "podpora"
 
@@ -10652,6 +10985,9 @@ msgstr "vývojář XMPP"
 msgid "original author"
 msgstr "původní autor"
 
+msgid "lead developer"
+msgstr "vedoucí vývojář"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -10787,6 +11123,9 @@ msgstr "Holandština, vlámština"
 msgid "Norwegian Nynorsk"
 msgstr "Norština Nynorsk"
 
+msgid "Occitan"
+msgstr "Occitan"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -10883,6 +11222,7 @@ msgstr ""
 "Copyright %s vlastní jeho spoluautoři. Pro úplný seznam spoluautorů viz "
 "soubor 'COPYRIGHT'. Pro tento program neposkytujeme žádnou záruku.<BR><BR>"
 
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
@@ -11025,23 +11365,35 @@ msgstr "_Odstranit chat"
 msgid "Right-click for more unread messages...\n"
 msgstr "Pro více nepřečtených zpráv klikněte pravým tlačítkem...\n"
 
-msgid "Change Status"
-msgstr "Změnit stav"
+msgid "_Change Status"
+msgstr "Změnit _stav"
 
-msgid "Show Buddy List"
-msgstr "Zobrazit seznam kamarádů"
+msgid "Show Buddy _List"
+msgstr "Zobrazit seznam _kamarádů"
 
-msgid "New Message..."
-msgstr "Nová zpráva.."
+msgid "_Unread Messages"
+msgstr "Ne_přečtené zprávy"
 
-msgid "Mute Sounds"
-msgstr "Umlčet zvuky"
+msgid "New _Message..."
+msgstr "Nová _zpráva.."
 
-msgid "Blink on New Message"
-msgstr "Blikat při nové zprávě"
+msgid "_Accounts"
+msgstr "_Účty"
 
-msgid "Quit"
-msgstr "Konec"
+msgid "Plu_gins"
+msgstr "Zásuvné _moduly"
+
+msgid "Pr_eferences"
+msgstr "_Nastavení"
+
+msgid "Mute _Sounds"
+msgstr "Umlčet _zvuky"
+
+msgid "_Blink on New Message"
+msgstr "_Blikat při nové zprávě"
+
+msgid "_Quit"
+msgstr "_Konec"
 
 msgid "Not started"
 msgstr "Nezačato"
@@ -11101,6 +11453,14 @@ msgstr "_Vymazat dokončené přenosy"
 msgid "File transfer _details"
 msgstr "_Podrobnosti o přenosu souboru"
 
+#. Pause button
+msgid "_Pause"
+msgstr "_Pozastavit"
+
+#. Resume button
+msgid "_Resume"
+msgstr "Po_kračovat"
+
 msgid "Paste as Plain _Text"
 msgstr "Vložit _jako text"
 
@@ -11146,6 +11506,12 @@ msgstr "Barva IRC akční zprávy"
 msgid "Color to draw the name of an action message."
 msgstr "Barva akční zprávy."
 
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Barva akční zprávy pro šeptané zprávy"
+
+msgid "Whisper Message Name Color"
+msgstr "Barva šeptané zprávy"
+
 msgid "Typing notification color"
 msgstr "Barva pro upozornění na psaní"
 
@@ -11211,9 +11577,14 @@ msgstr ""
 msgid "Save Image"
 msgstr "Uložit obrázek"
 
+#, c-format
 msgid "_Save Image..."
 msgstr "_Uložit obrázek..."
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Přidat uživatelské smajlíky..."
+
 msgid "Select Font"
 msgstr "Vyberte písmo"
 
@@ -11251,9 +11622,21 @@ msgstr "Nemohu uložit obrázek: %s\n"
 msgid "Insert Image"
 msgstr "Vložit obrázek"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Tento smajlík je nedostupný, protože existuje smajlík pro tuto klávesovou "
+"zkratku:\n"
+" %s"
+
 msgid "Smile!"
 msgstr "Úsměv!"
 
+msgid "_Manage custom smileys"
+msgstr "_Spravovat uživatelské smajlíky"
+
 msgid "This theme has no available smileys."
 msgstr "V tomto tématu nejsou k dispozici smajlíky."
 
@@ -11916,21 +12299,27 @@ msgstr "Zaznamenávat všechny změny _stavu do systémového záznamu"
 msgid "Sound Selection"
 msgstr "Výběr zvuku"
 
+#, c-format
 msgid "Quietest"
 msgstr "Nejtišší"
 
+#, c-format
 msgid "Quieter"
 msgstr "Tišší"
 
+#, c-format
 msgid "Quiet"
 msgstr "Tichý"
 
+#, c-format
 msgid "Loud"
 msgstr "Hlasitý"
 
+#, c-format
 msgid "Louder"
 msgstr "Hlasitější"
 
+#, c-format
 msgid "Loudest"
 msgstr "Nejhlasitější"
 
@@ -11963,6 +12352,12 @@ msgstr "Hlasitost:"
 msgid "Play"
 msgstr "Přehrát"
 
+msgid "_Browse..."
+msgstr "_Procházet..."
+
+msgid "_Reset"
+msgstr "_Reset"
+
 msgid "_Report idle time:"
 msgstr "_Hlásit čas nečinnosti:"
 
@@ -12133,6 +12528,47 @@ msgstr "Uložit _a použít"
 msgid "Status for %s"
 msgstr "Stav pro %s"
 
+msgid "Custom Smiley"
+msgstr "Uživatelský smajlík"
+
+msgid "Duplicate Shortcut"
+msgstr "Duplikovat klávesovou zkratku"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Už existuje uživatelský smajlík pro vybranou klávesovou zkratku. "
+"Specifikujte jinou."
+
+msgid "More Data needed"
+msgstr "Je potřeba více dat"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Nastavte klávesovou zkratku asociovanou se smajlíkem."
+
+msgid "Please select an image for the smiley."
+msgstr "Prosím vyberte obrázek pro smajlík."
+
+msgid "Edit Smiley"
+msgstr "Upravit smajlík"
+
+msgid "Add Smiley"
+msgstr "Přidat smajlík"
+
+msgid "Smiley _Image"
+msgstr "Obrázek _smajlíku"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Klávesové _zkratky smajlíků"
+
+msgid "Smiley"
+msgstr "Smajlík"
+
+msgid "Custom Smiley Manager"
+msgstr "Správce smajlíků"
+
 msgid "Waiting for network connection"
 msgstr "Čekám na spojení po síti"
 
@@ -12271,9 +12707,6 @@ msgstr "Z_měnit"
 msgid "_Open Mail"
 msgstr "_Otevřít poštu"
 
-msgid "_Pause"
-msgstr "_Pozastavit"
-
 msgid "Pidgin Tooltip"
 msgstr "Pidgin tipy"
 
@@ -12289,9 +12722,6 @@ msgstr "Výběr tohoto zakáže grafické emotikony."
 msgid "none"
 msgstr "žádné"
 
-msgid "Display Statistics"
-msgstr "Zobrazit statistika"
-
 msgid "Response Probability:"
 msgstr "Pravděpodobnost odpovědi:"
 
@@ -12851,6 +13281,7 @@ msgstr "Dialog upozornění"
 msgid "Select Color"
 msgstr "Vyberte barvu"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "Vyberte písmo rozhraní"
 
@@ -13075,6 +13506,7 @@ msgstr "Každých N minut přidává ke konverzacím časové značky ve stylu i
 msgid "Timestamp Format Options"
 msgstr "Možnosti formátu časové značky"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Vnutit 24-hodinový formát času"
 
@@ -13246,15 +13678,55 @@ msgstr "Přijímat a odesílat přímo sekce XMPP."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů XMPP."
 
-#~ msgid "_Resume"
-#~ msgstr "Po_kračovat"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Kód [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Chyba operace se skupinou"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "Chyba při nastavování možností socketu"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Windows Live ID autentizace: Nemohu najít autentifikační příznak v "
+#~ "odpovědi serveru"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Windows Live ID autentizace selhala"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "Příliš zlý (odesílatel)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Příliš zlý (příjemce)"
+
+#~ msgid "Available Message"
+#~ msgstr "Zpráva o dostupnosti"
+
+#~ msgid "Away Message"
+#~ msgstr "Zpráva o nepřítomnosti"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(stahuji)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Chyba při žádání o přihlašovací token"
+
+#~ msgid "TCP Address"
+#~ msgstr "TCP adresa"
+
+#~ msgid "UDP Address"
+#~ msgstr "UDP adresa"
+
+#~ msgid "Display Statistics"
+#~ msgstr "Zobrazit statistika"
 
 #~ msgid "Screen name:"
 #~ msgstr "Jméno uživatele:"
 
-#~ msgid "Screen Name"
-#~ msgstr "Jméno uživatele"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Někdo v chatu řekne vaše jméno uživatele"
 
@@ -13404,9 +13876,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "_Send To"
 #~ msgstr "_Odeslat do"
 
-#~ msgid "_Smiley"
-#~ msgstr "_Smajlík"
-
 #~ msgid "Conversation History"
 #~ msgstr "Historie konverzace"
 
diff --git a/po/de.po b/po/de.po
index b9474ebc41..f67f908825 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 17:47+0200\n"
-"PO-Revision-Date: 2008-08-06 17:47+0200\n"
+"POT-Creation-Date: 2008-08-12 17:23+0200\n"
+"PO-Revision-Date: 2008-08-12 17:21+0200\n"
 "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -652,11 +652,11 @@ msgstr "Klänge aktivieren"
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "Liste der Benutzer:\n"
-msgstr[1] "Liste der Benutzer:\n"
+msgstr[0] "Liste von %d Benutzer:\n"
+msgstr[1] "Liste von %d Benutzern:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "Unterstützte Debug-Optionen sind:  version"
@@ -2820,8 +2820,9 @@ msgid ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
 "pidgin.im/BonjourWindows for more information."
 msgstr ""
-"Apples Bonjour-Toolkit für Windows konnte nicht gefunden werden, für weitere "
-"Informationen besuchen Sie die FAQ unter: http://d.pidgin.im/BonjourWindows"
+"Apples Bonjour-Toolkit für Windows konnte nicht gefunden werden. Besuchen "
+"Sie die FAQ unter http://d.pidgin.im/BonjourWindows für weitere "
+"Informationen."
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n"
@@ -7330,13 +7331,6 @@ msgstr ""
 "Beachten Sie, dass diese Operation den Qun entfernen könnte, \n"
 "wenn Sie der Ersteller sind."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Code [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "Gruppenoperationsfehler"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Wollen sie die Anfrage akzeptieren?"
@@ -7381,26 +7375,23 @@ msgstr " VIP"
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mobil"
+msgstr " FromMobile"
 
-#, fuzzy
 msgid " BindMobile"
-msgstr "Mobil"
+msgstr "BindMobile"
 
 msgid " Video"
 msgstr " Video"
 
-#, fuzzy
 msgid " Space"
-msgstr "MySpace"
+msgstr " Raum"
 
 msgid "Flag"
-msgstr ""
+msgstr "Flagge"
 
 msgid "Ver"
-msgstr ""
+msgstr "Ver"
 
 msgid "Invalid name"
 msgstr "QQ: Ungültiger Name"
@@ -7476,18 +7467,17 @@ msgid "Connect using TCP"
 msgstr "Über TCP verbinden"
 
 msgid "resend interval(s)"
-msgstr ""
+msgstr "Neusenden-Intervall(e)"
 
-#, fuzzy
 msgid "Keep alive interval(s)"
-msgstr "Fehler beim Aufrechterhalten der Verbindung (Keep alive)"
+msgstr "Intervall(e) zum Aufrechterhalten der Verbindung (Keep alive)"
 
 msgid "Update interval(s)"
-msgstr ""
+msgstr "Aktualisierungsintervall(e)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Ungültige Bezeichnung"
+msgstr "Ungültige Länge des Tokens, %d"
 
 msgid "Keep alive error"
 msgstr "Fehler beim Aufrechterhalten der Verbindung (Keep alive)"
@@ -7539,8 +7529,30 @@ msgid "Unable to login"
 msgstr "Anmeldung fehlgeschlagen"
 
 #, c-format
-msgid "Invalid token reply code, 0x%02X"
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
 msgstr ""
+"Antwort %s(0x%02X )\n"
+"Gesendet %s(0x%02X )\n"
+"Raum-ID %d, Antwort [0x%02X]: \n"
+"%s"
+
+msgid "Failed room reply"
+msgstr "Antwort vom Raum gescheitert"
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Sie sind ein Mitglied der Gruppe „%s“\n"
+
+msgid "Can not decrypt login reply"
+msgstr "Kann die Antwort der Anmeldung nicht entschlüsseln"
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Ungültiger Token-Antwort-Code, 0x%02X"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7589,7 +7601,7 @@ msgstr "Nachricht: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s ist nicht in Ihrer Buddy-Liste"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Notice from: %s"
 msgstr "Ankündigung von %s"
 
@@ -9932,6 +9944,12 @@ msgstr "+++ %s wurde untätig"
 msgid "+++ %s became unidle"
 msgstr "+++ %s wurde tätig"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
diff --git a/po/es.po b/po/es.po
index d023944a16..079fd7a0fb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -53,8 +53,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 03:22-0400\n"
-"PO-Revision-Date: 2008-05-13 23:08+0200\n"
+"POT-Creation-Date: 2008-08-15 11:42-0400\n"
+"PO-Revision-Date: 2008-08-10 00:10+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -64,17 +64,13 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Intente `%s -h' para más información.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -97,7 +93,6 @@ msgstr ""
 "  -n, --nologin        no conectarse de forma automática\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:738
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -108,253 +103,104 @@ msgstr ""
 "el problema y complete la migración de forma manual. Por favor, informe de "
 "este error en http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:595
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772 ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244 ../finch/gntrequest.c:380 ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310 ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121 ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2080
-#: ../libpurple/protocols/jabber/chat.c:682
-#: ../libpurple/protocols/jabber/chat.c:693
-#: ../libpurple/protocols/jabber/jabber.c:1594
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "No se ha añadido la cuenta"
 
-#: ../finch/gntaccount.c:125
 msgid "Username of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vacío."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Recordar contraseña"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "No se han instalado complementos de protocolo."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Posiblemente se olvido de ejecutar 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1449 ../pidgin/gtkblist.c:4671
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nueva cuenta"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Apodo:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Crear esta cuenta en el servidor"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:641 ../finch/gntblist.c:747
-#: ../finch/gntblist.c:782 ../finch/gntblist.c:1134 ../finch/gntblist.c:1360
-#: ../finch/gntblist.c:1494 ../finch/gntblist.c:2661 ../finch/gntblist.c:2712
-#: ../finch/gntblist.c:2776 ../finch/gntblist.c:2838 ../finch/gntcertmgr.c:90
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:471 ../finch/gntpounce.c:679
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1064 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:178 ../libpurple/account.c:1118
-#: ../libpurple/account.c:1437 ../libpurple/account.c:1472
-#: ../libpurple/conversation.c:1235 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:759
-#: ../libpurple/protocols/jabber/buddy.c:2474
-#: ../libpurple/protocols/jabber/buddy.c:2510
-#: ../libpurple/protocols/jabber/chat.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#: ../libpurple/protocols/jabber/jabber.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/jabber/si.c:1113
-#: ../libpurple/protocols/jabber/usermood.c:199
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:403
-#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
-#: ../libpurple/protocols/msn/msn.c:373 ../libpurple/protocols/msnp9/msn.c:284
-#: ../libpurple/protocols/msnp9/msn.c:301
-#: ../libpurple/protocols/msnp9/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:356
-#: ../libpurple/protocols/myspace/user.c:582
-#: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6209
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:120
-#: ../libpurple/protocols/qq/group_opt.c:375
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3440
-#: ../libpurple/protocols/sametime/sametime.c:3526
-#: ../libpurple/protocols/sametime/sametime.c:3700
-#: ../libpurple/protocols/sametime/sametime.c:5453
-#: ../libpurple/protocols/sametime/sametime.c:5543
-#: ../libpurple/protocols/sametime/sametime.c:5668
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc/chat.c:753
-#: ../libpurple/protocols/silc/ops.c:1833
-#: ../libpurple/protocols/silc/silc.c:1039
-#: ../libpurple/protocols/silc/silc.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:742
-#: ../libpurple/protocols/silc10/silc.c:948
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
-#: ../libpurple/protocols/yahoo/yahoo.c:3575 ../pidgin/gtkaccount.c:1843
-#: ../pidgin/gtkaccount.c:2404 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkblist.c:6879 ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:768 ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1019
-#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
-#: ../pidgin/gtkdialogs.c:1113 ../pidgin/gtkdialogs.c:1154
-#: ../pidgin/gtkdialogs.c:1210 ../pidgin/gtkdialogs.c:1249
-#: ../pidgin/gtkdialogs.c:1276 ../pidgin/gtkimhtmltoolbar.c:438
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:302 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1619
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1471 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:758 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkdebug.c:746 ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Guardar"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1834
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1613
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Borrar cuenta"
 
 #. Delete button
-#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1842 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1618
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2528 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2263 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puede (desh)habilitar cuentas de la lista a continuación."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:640
-#: ../finch/gntblist.c:747 ../finch/gntblist.c:782 ../finch/gntblist.c:2947
-#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5542
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2403
-#: ../pidgin/gtkblist.c:6878 ../pidgin/gtkconv.c:1721
-#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Añadir"
 
 #. Modify button
-#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2350
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha hecho a %s su amigo o amiga%s%s"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2402
 msgid "Add buddy to your list?"
 msgstr "¿Desea añadir el amigo a su lista?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quiere añadir a %s a su lista de amigos%s%s."
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2483
-#: ../pidgin/gtkaccount.c:2490
 msgid "Authorize buddy?"
 msgstr "¿Autorizar al amigo?"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2484 ../pidgin/gtkaccount.c:2491
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkaccount.c:2492
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -363,12 +209,10 @@ msgstr ""
 "En línea: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Cuenta: %s (%s)"
 
-#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
@@ -377,349 +221,188 @@ msgstr ""
 "\n"
 "Visto por última vez: hace %s"
 
-#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "(por omisión)"
 
-#: ../finch/gntblist.c:584
 msgid "You must provide a username for the buddy."
 msgstr "Debe dar un nombre de usuario para el amigo."
 
-#: ../finch/gntblist.c:586
 msgid "You must provide a group."
 msgstr "Debe indicar un grupo."
 
-#: ../finch/gntblist.c:588
 msgid "You must select an account."
 msgstr "Debe seleccionar una cuenta."
 
-#: ../finch/gntblist.c:590
 msgid "The selected account is not online."
 msgstr "La cuenta seleccionada no está conectada."
 
-#: ../finch/gntblist.c:595
 msgid "Error adding buddy"
 msgstr "Error al añadir al amigo"
 
-#: ../finch/gntblist.c:622 ../libpurple/protocols/irc/irc.c:974
-#: ../libpurple/protocols/irc/msgs.c:364
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:976
-#: ../libpurple/protocols/oscar/oscar.c:2944
-#: ../libpurple/protocols/oscar/oscar.c:3961
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1210
-#: ../libpurple/protocols/silc/ops.c:1213
-#: ../libpurple/protocols/silc/ops.c:1349
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc/silc.c:1221
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtksavedstatuses.c:971
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../finch/gntblist.c:625
 msgid "Alias (optional)"
 msgstr "Apodo (opcional)"
 
-#: ../finch/gntblist.c:628
 msgid "Add in group"
 msgstr "Añadir a un grupo"
 
-#: ../finch/gntblist.c:632 ../finch/gntblist.c:726 ../finch/gntblist.c:1705
-#: ../finch/gntblist.c:2642 ../finch/gntblist.c:2698 ../finch/gntblist.c:2763
-#: ../finch/gntblist.c:2823 ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3319 ../pidgin/gtknotify.c:530
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../finch/gntblist.c:638 ../finch/gntblist.c:1183
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6427
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "Añadir amigo"
 
-#: ../finch/gntblist.c:638
 msgid "Please enter buddy information."
 msgstr "Introduzca la información del amigo."
 
-#: ../finch/gntblist.c:694 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:732 ../finch/gntblist.c:2637 ../finch/gntblist.c:2693
-#: ../finch/gntblist.c:2818 ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/jabber/jabber.c:994
-#: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1595
-#: ../libpurple/protocols/msnp9/msn.c:1660
-#: ../libpurple/protocols/msnp9/msn.c:1687
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:766
-#: ../pidgin/gtkroomlist.c:749
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nombre"
 
-#: ../finch/gntblist.c:735 ../finch/gntblist.c:1646
-#: ../libpurple/protocols/msn/msn.c:1573
-#: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:609
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1042 ../pidgin/gtkdialogs.c:1064
-#: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Apodo"
 
-#: ../finch/gntblist.c:738 ../finch/gntblist.c:2963
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:742 ../finch/gntblist.c:1150
 msgid "Auto-join"
 msgstr "Conectarse automáticamente"
 
-#: ../finch/gntblist.c:745 ../finch/gntblist.c:1185 ../pidgin/gtkblist.c:6792
 msgid "Add Chat"
 msgstr "Añadir chat"
 
-#: ../finch/gntblist.c:746
 msgid "You can edit more information from the context menu later."
 msgstr ""
 "Puede editar más información más adelante a través del menú contextual."
 
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "Error al añadir al grupo"
 
-#: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a añadir."
 
-#: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: ../finch/gntblist.c:780 ../finch/gntblist.c:1187
-#: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5540 ../pidgin/gtkblist.c:6875
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: ../finch/gntblist.c:780
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"
 
-#: ../finch/gntblist.c:1133 ../pidgin/gtkblist.c:683
 msgid "Edit Chat"
 msgstr "Editar chat"
 
-#: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."
 
-#: ../finch/gntblist.c:1134 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:1159
 msgid "Edit Settings"
 msgstr "Editar configuración"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Information"
 msgstr "Información"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Retrieving..."
 msgstr "Obteniendo..."
 
 # No se traduce como «Obtener Información» porque sino hace muy grande el 
 # botón que utiliza este texto y, consecuentemente, la pantalla de Gaim, jfs
-#: ../finch/gntblist.c:1249 ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:906
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
 msgstr "Añadir aviso de amigo"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1260 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1113
-#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1669
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../finch/gntblist.c:1267 ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../finch/gntblist.c:1273 ../finch/gntblist.c:1662 ../finch/gntblist.c:2832
 msgid "View Log"
 msgstr "Ver registro"
 
-#: ../finch/gntblist.c:1355
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"
 
-#: ../finch/gntblist.c:1357 ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../finch/gntblist.c:1357
 msgid "Set Alias"
 msgstr "Fijar el apodo"
 
-#: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vacía para resetear el nombre."
 
-#: ../finch/gntblist.c:1472
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Si elimina este contacto también eliminará a todos los amigos en el contacto"
 
-#: ../finch/gntblist.c:1480
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Si elimina este grupo también eliminará a todos los amigos en el grupo"
 
-#: ../finch/gntblist.c:1485
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "¿Está seguro que quiere borrar a %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"
 
-#: ../finch/gntblist.c:1493 ../finch/gntblist.c:1648 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1718 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:268
 msgid "Remove"
 msgstr "Quitar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1622 ../finch/gntblist.c:3004 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5166
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1653
 msgid "Place tagged"
 msgstr "Lugares marcados"
 
-#: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
 msgstr "Cambiar marca"
 
 #. General
-#: ../finch/gntblist.c:1698 ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1285
-#: ../libpurple/protocols/jabber/buddy.c:2265
-#: ../libpurple/protocols/jabber/buddy.c:2457
-#: ../libpurple/protocols/jabber/jabber.c:1002
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/jabber.c:1656
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1598
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1016
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3343
 msgid "Nickname"
 msgstr "Apodo"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1720 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:982
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:541
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2968
-#: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3371
-#: ../pidgin/gtkblist.c:3831 ../pidgin/gtkprefs.c:2056
 msgid "Idle"
 msgstr "Está inactivo"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../finch/gntblist.c:1734
 msgid "On Mobile"
 msgstr "En el móvil"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../finch/gntblist.c:2042 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Guardado..."
 
-#: ../finch/gntblist.c:2496 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:715
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2650 ../finch/gntblist.c:2655
 msgid "Block/Unblock"
 msgstr "Bloquear/Desbloquear"
 
-#: ../finch/gntblist.c:2651 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../finch/gntblist.c:2652 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../finch/gntblist.c:2657
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
@@ -730,71 +413,29 @@ msgstr ""
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2660 ../finch/gntblist.c:2711 ../finch/gntblist.c:2837
-#: ../finch/gntcertmgr.c:89 ../finch/gntconn.c:137 ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
-#: ../libpurple/account.c:1436 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1786
-#: ../libpurple/protocols/jabber/xdata.c:402
-#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
-#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
-#: ../libpurple/protocols/msnp9/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:300
-#: ../libpurple/protocols/msnp9/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:334
-#: ../libpurple/protocols/myspace/user.c:581
-#: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6208
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc/chat.c:752
-#: ../libpurple/protocols/silc/ops.c:1306
-#: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1038
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1909
-#: ../libpurple/protocols/silc10/silc.c:741
-#: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3563
-#: ../libpurple/protocols/yahoo/yahoo.c:3574 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:767 ../pidgin/gtkdialogs.c:906
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../finch/gntblist.c:2706 ../pidgin/gtkdialogs.c:762
 msgid "New Instant Message"
 msgstr "Mensaje instantáneo nuevo"
 
-#: ../finch/gntblist.c:2708 ../pidgin/gtkdialogs.c:764
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "Introduzca el nombre de usuario o apodo de la persona con la que quiere comunicarse."
+msgstr ""
+"Introduzca el nombre de usuario o apodo de la persona con la que quiere "
+"comunicarse."
 
-#: ../finch/gntblist.c:2759
 msgid "Channel"
 msgstr "Canal"
 
-#: ../finch/gntblist.c:2771 ../pidgin/gtkblist.c:1036
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: ../finch/gntblist.c:2773
 msgid "Please enter the name of the chat you want to join."
 msgstr "Introduzca el nombre del chat al que quiere unirse."
 
-#: ../finch/gntblist.c:2775 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Unirse"
 
-#: ../finch/gntblist.c:2834 ../pidgin/gtkdialogs.c:995
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -803,84 +444,64 @@ msgstr ""
 "ver información de registro."
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2882 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Opciones"
 
-#: ../finch/gntblist.c:2888
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2893
 msgid "Block/Unblock..."
 msgstr "Bloquear/Desbloquear..."
 
-#: ../finch/gntblist.c:2898
 msgid "Join Chat..."
 msgstr "Unirse a un chat..."
 
-#: ../finch/gntblist.c:2903 ../finch/gntconv.c:611
 msgid "View Log..."
 msgstr "Ver registro..."
 
-#: ../finch/gntblist.c:2908
+msgid "View All Logs"
+msgstr "Mostrar todos los registros"
+
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../finch/gntblist.c:2913
 msgid "Empty groups"
 msgstr "Grupos vacíos"
 
-#: ../finch/gntblist.c:2920
 msgid "Offline buddies"
 msgstr "Amigos desconectados"
 
-#: ../finch/gntblist.c:2927
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../finch/gntblist.c:2932
 msgid "By Status"
 msgstr "Por estado"
 
-#: ../finch/gntblist.c:2937 ../pidgin/gtkblist.c:4322
 msgid "Alphabetically"
 msgstr "Alfabéticamente"
 
-#: ../finch/gntblist.c:2942
 msgid "By Log Size"
 msgstr "Por tamaño de registro"
 
-#: ../finch/gntblist.c:2953
 msgid "Buddy"
 msgstr "Amigo"
 
-#: ../finch/gntblist.c:2958 ../libpurple/protocols/oscar/oscar.c:649
-#: ../libpurple/protocols/silc/silc.c:984
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Charlar"
 
-#: ../finch/gntblist.c:2968 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Agrupar"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Importación de certificado"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Especifique un nombre de sistema"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr ""
 "Especifique el nombre de sistema para el que se utilizará este certificado."
 
-#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -889,19 +510,15 @@ msgstr ""
 "No se pudo importar el archivo %s.\n"
 "Asegúrese de que el fichero puede leerse y que está en formato PEM.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Error en la importación de certificado"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Falló la importación del certificado X.509"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Seleccione un certificado PEM"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -910,24 +527,19 @@ msgstr ""
 "Falló la exportación al fichero %s.\n"
 "Asegúrese de que tiene permisos de escritura en la ruta destino\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Error en la exportación de certificado"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Falló la exportación del certificado X.509"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "Exportación de certificado PEM X.509"
 
-#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificado para %s"
 
-#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -940,57 +552,38 @@ msgstr ""
 "Huella SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "Certificado de equipo SSL"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "¿Seguro que desea borrar el certificado para %s?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Confirme el borrado del certificado"
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Gestor de certificados"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:695
-#: ../libpurple/protocols/silc/silc.c:1223
-#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Servidor"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1697
-#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:417 ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2377
-#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se ha desconectado."
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -1003,11 +596,9 @@ msgstr ""
 "Finch no intentará reconectarse a esta cuenta hasta que corrija el error y "
 "reactive la cuenta."
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Reactivar cuenta"
 
-#: ../finch/gntconn.c:156
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
@@ -1015,46 +606,36 @@ msgstr ""
 "Se ha desconectado la cuenta y ya no está en el chat. Se unirá "
 "automáticamenet al chat cuando se vuelva a conectar la cuenta."
 
-#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:494
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error sintáctico:  Vd. no escribió suficientes argumentos para esa orden."
 
-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:500
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:507
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sólo funciona en chats, no en MIs."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:510
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sólo funciona en MIs, no en chats."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:515
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
-#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "No se pudo enviar el mensaje porque no se ha conectado."
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3566
 #, c-format
 msgid ""
 "\n"
@@ -1063,69 +644,72 @@ msgstr ""
 "\n"
 "%s está escribiendo..."
 
-#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Ha dejado este chat"
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1403
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Se inició el registro. A partir de ahora se registrarán todos los mensajes "
 "de esta conversación."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1411
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Se ha parado el registro. No se registrarán mensajes de esta conversación de "
 "ahora en adelante."
 
-#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:568
+msgid "Invite message"
+msgstr "Mensaje de invitacio"
+
+msgid "Invite"
+msgstr "Invitar"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Introduzca el nombre de usuario al que desea invitar,\\n\n"
+"junto con un mensaje de invitación opcional."
+
 msgid "Conversation"
 msgstr "Conversación"
 
-#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Limpiar histórico"
 
-#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tiempo"
 
-#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Añadir aviso de amigo..."
 
-#: ../finch/gntconv.c:615
+msgid "Invite..."
+msgstr "Invitar..."
+
 msgid "Enable Logging"
 msgstr "Habilitar registro"
 
-#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Habilitar sonidos"
 
-#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOMÁTICA> "
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:970
-msgid "List of users:\n"
-msgstr "Lista de usuarios:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lista de %d usuario:\n"
+msgstr[1] "Lista de %d usuario:\n"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:339
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"
 
-#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:391
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:394
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1133,7 +717,20 @@ msgstr ""
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes órdenes están disponibles en este contexto:\n"
 
-#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7932
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s no es una clase de mensajes válida. Consulte «/help msgcolor» para ver las "
+"clases de mensaje válidas."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s no es un color válido. Consulte «/help msgcolor» para ver los colores "
+"válidos."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1141,12 +738,10 @@ msgstr ""
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7935
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
 
-#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7938
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1154,48 +749,52 @@ msgstr ""
 "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
 "actual."
 
-#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7941
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histórico de la ventana de conversación."
 
-#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7947
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Muestra la lista de usuarios en el chat."
 
-#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostrar la ventana de complementos."
 
-#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostrar la lista de amigos."
 
-#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Muestra la ventana de cuentas."
 
-#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Muestra la ventana de depuración."
 
-#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: Muestra la ventana de preferencias."
 
-#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana «savedstatuses»."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:967 ../pidgin/gtkconv.c:2707
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+# TODO - Can colors and clases be translated here?
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;clase&gt; &lt;primer plano&gt; &lt;segundo plano&gt;: Fija el "
+"color para distintas clases de mensajes en la ventana de conversación."
+"<br>    &lt;clase&gt;: send (enviar), receive (recibir), highlight (marcar), "
+"action (acción), timestamp (marca de tiempo)<br>    &lt;primer plano/segundo "
+"plano&gt;: negro, rojo, verde, azúl, blanco, gris, gris oscuro, magenta, "
+"cian, «default» (por omisión)<br><br>EJEMPLO:<br>    msgcolor send cian "
+"default"
+
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Ventana de depuración"
 
@@ -1203,144 +802,96 @@ msgstr "Ventana de depuración"
 #. * 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:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Trasferencias de archivo - %d%% de %d archivos"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Trasferencias de archivo - %d%% de %d archivo"
+msgstr[1] "Trasferencias de archivo - %d%% de %d archivos"
 
 #. Create the window.
-#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferencia de archivos"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Velocidad"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:809
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:972
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msnp9/msn.c:540
-#: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:822
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:2756
-#: ../libpurple/protocols/oscar/oscar.c:3819
-#: ../libpurple/protocols/sametime/sametime.c:3315
-#: ../libpurple/protocols/sametime/sametime.c:4206
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3415
-#: ../pidgin/gtkblist.c:3429 ../pidgin/gtkblist.c:3431
-#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Estado"
 
-#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias terminen"
 
-#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Limpiar transferencias terminadas"
 
-#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Parar"
 
-#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Falló"
 
-#: ../finch/gntft.c:436 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:447
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../finch/gntft.c:447
 msgid "Received"
 msgstr "Recibido:"
 
-#: ../finch/gntft.c:448 ../pidgin/gtkft.c:160 ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../finch/gntft.c:450
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Se guardó el archivo como %s."
 
-#: ../finch/gntft.c:457
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../finch/gntft.c:457
 msgid "Receiving"
 msgstr "Recibiendo"
 
-#: ../finch/gntlog.c:184
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Conversaciones en %s sobre %s"
 
-#: ../finch/gntlog.c:187
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Conversación con %s sobre %s"
 
-#: ../finch/gntlog.c:230 ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:270 ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -1348,7 +899,6 @@ msgstr ""
 "Sólo se registrarán los eventos del sistema cuando esté habilitada la opción "
 "«Registrar todos los cambios de estado en el registro del sistema»."
 
-#: ../finch/gntlog.c:274 ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -1356,111 +906,85 @@ msgstr ""
 "Sólo se registrarán los mensajes instantáneos si está habilitada la "
 "preferencia «Registrar todos los mensajes instantáneos»."
 
-#: ../finch/gntlog.c:277 ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Los chats sólo serán registrados si la opción \"Registrar todos los chats\" "
 "está habilitada en las preferencias."
 
-#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "No se encontraron registros"
 
-#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Tamaño total del registro:"
 
 #. Search box *********
-#: ../finch/gntlog.c:338
 msgid "Scroll/Search: "
 msgstr "Deslizar/Buscar: "
 
-#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversaciones en %s"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:724
-#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaciones con %s"
 
-#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "All Conversations"
+msgstr "Todas las conversaciones"
+
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Correos"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "¡Tiene correo!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:537
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:544
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) tiene %d mensaje nuevo."
 msgstr[1] "%s (%s) tiene %d nuevos mensajes."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
 msgstr "Nuevo correo"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:984
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s:"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:985
 msgid "Buddy Information"
 msgstr "Información de amigos"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1658
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3525
-msgid "Invite"
-msgstr "Invitar"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../finch/gntnotify.c:426
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "falló la carga del complemento"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "falló la descarga del complemento"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1477,42 +1001,33 @@ msgstr ""
 "Sitio web: %s\n"
 "Nombre de fichero: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Debe cargar el complemento antes de poder configurarlo."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "No hay opciones de configuración para este complemento."
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Error al cargar el complemento"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "El fichero seleccionado no es un complemento válido."
 
-#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "Para ver el mensaje exacto consulte la ventana de depuración y vuelva a "
 "intentarlo de nuevo."
 
-#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Seleccione el complemento a instalar"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Puede (des)cargar complementos de la lista mostrada a continuación."
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Instalar complemento..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Configurar complemento"
 
@@ -1521,387 +1036,290 @@ msgstr "Configurar complemento"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2180
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
-#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Avisar a quién"
 
 #. Account:
-#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Cuenta:"
 
-#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Nombre del amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."
 
-#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Se conecta"
 
-#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "Se desconecta"
 
-#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "Se ausenta"
 
-#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "Deja de estar ausente"
 
-#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "Está inactivo"
 
-#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "Ya no está inactivo."
 
-#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "Empieza a escribir"
 
-#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Hace una pausa mientras escribe"
 
-#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "Deja de escribir"
 
-#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "Envía un mensaje"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Acción"
 
-#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Abrir una ventana de MI"
 
-#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Notificación con una ventana emergente"
 
-#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Enviar un mensaje"
 
-#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Ejecutar una orden"
 
-#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
-#: ../finch/gntpounce.c:460
 msgid "Pounce only when my status is not Available"
 msgstr "Sólo avisar cuando mi estado no sea Disponible"
 
-#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Recurrente"
 
-#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "No se puede crear el aviso"
 
-#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "No tiene ninguna cuenta."
 
-#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Antes de poder crear un aviso debe crear primero una cuenta."
 
-#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "¿Está seguro que desea borrar el aviso en %s para %s?"
 
-#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ha parado mientras le escribía algo (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvió de su inactividad (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s le ha enviado un mensaje. (%s)"
 
-#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Basado en el uso del teclado"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2061
 msgid "From last sent message"
 msgstr "Del último mensaje enviado"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:948 ../pidgin/gtkprefs.c:956
-#: ../pidgin/gtkprefs.c:2060 ../pidgin/gtkprefs.c:2074
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Mostrar tiempos de inactividad"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Mostrar amigos desconectados"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notificar a los amigos cuando les esté escribiendo"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Formato de registro"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Registrar MIs"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Registrar chats"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Registrar los eventos de cambios de estado"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Mostrar el tiempo de inactividad"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Cambiar el estado cuando esté inactivo"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minutos antes de cambiar el estado"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Cambiar estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1046 ../pidgin/gtkprefs.c:2147
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1617 ../pidgin/gtkprefs.c:2158
 msgid "Logging"
 msgstr "Registro"
 
-#: ../finch/gntrequest.c:381
 msgid "You must fill all the required fields."
 msgstr "Debe completar todos los campos obligatorios."
 
-#: ../finch/gntrequest.c:382
 msgid "The required fields are underlined."
 msgstr "Los campos obligatorios están subrayados."
 
-#: ../finch/gntrequest.c:640
 msgid "Not implemented yet."
 msgstr "No implementado aún."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1554
-#: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: ../finch/gntrequest.c:762
 msgid "Choose Location..."
 msgstr "Escojer ubicación..."
 
-#: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Pulse «Intro» para buscar más salas en esta categoría."
 
-#: ../finch/gntroomlist.c:273
 msgid "Get"
 msgstr "Obtener"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Se conecta un amigo"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Se desconecta un amigo"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Se recibe un mensaje"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Se recibe un mensaje que comienza una conversación"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Se envía un mensaje"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Alguien entra al chat"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Alguien deja el chat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Usted habla en el chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Otros hablan en el chat"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your username in chat"
 msgstr "Alguien dice su nombre en el chat"
 
-#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "Fallo de gstreamer"
 
-#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "No se pudo inicializar gstreamer."
 
-#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1741
-#: ../pidgin/gtkprefs.c:1830 ../pidgin/gtkprefs.c:2003
 msgid "(default)"
 msgstr "(por omisión)"
 
-#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "Seleccione un archivo de sonido..."
 
-#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "Preferencias de sonido"
 
-#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1868
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "Timbre de la consola"
 
-#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1872
 msgid "Command"
 msgstr "Comando"
 
-#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "Sin sonido"
 
-#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1863
 msgid "Sound Method"
 msgstr "Método para reproducir sonidos"
 
-#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "Método:"
 
-#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1911,82 +1329,56 @@ msgstr ""
 "(%s para nombre de archivo)"
 
 #. Sound options
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1894
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
-#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "Suena cuando la conversación obtiene el foco"
 
-#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:946 ../pidgin/gtkprefs.c:958
-#: ../pidgin/gtkprefs.c:1901 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Siempre"
 
-#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1899
 msgid "Only when available"
 msgstr "Sólo cuando estoy disponible"
 
-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1900
 msgid "Only when not available"
 msgstr "Sólo cuando no estoy disponible"
 
-#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "Volumen(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1929
 msgid "Sound Events"
 msgstr "Eventos de sonido"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1988
 msgid "Event"
 msgstr "Acontecimiento"
 
-#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "Archivo"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:2007
 msgid "Test"
 msgstr "Probar"
 
-#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:2011
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:2015
 msgid "Choose..."
 msgstr "Seleccionar..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "¿Está seguro que quiere borrar a «%s»?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Borrar estado"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Estados guardados"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1397
-#: ../libpurple/protocols/msn/msn.c:747
-#: ../libpurple/protocols/myspace/myspace.c:171
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Título"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipo"
 
@@ -1998,133 +1390,72 @@ msgstr "Tipo"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:293
-#: ../libpurple/protocols/bonjour/bonjour.c:300
-#: ../libpurple/protocols/bonjour/bonjour.c:383
-#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/jabber/jabber.c:1667
-#: ../libpurple/protocols/jabber/jabber.c:1683
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
-#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2856
-#: ../libpurple/protocols/novell/novell.c:2959
-#: ../libpurple/protocols/novell/novell.c:2965
-#: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5669
-#: ../libpurple/protocols/oscar/oscar.c:5887
-#: ../libpurple/protocols/oscar/oscar.c:5901
-#: ../libpurple/protocols/oscar/oscar.c:5917
-#: ../libpurple/protocols/oscar/oscar.c:5924
-#: ../libpurple/protocols/oscar/oscar.c:5931
-#: ../libpurple/protocols/sametime/sametime.c:3338
-#: ../libpurple/protocols/sametime/sametime.c:3344
-#: ../libpurple/protocols/sametime/sametime.c:3350
-#: ../libpurple/protocols/sametime/sametime.c:3429
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3817
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
-#: ../libpurple/protocols/zephyr/zephyr.c:2352
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Mensaje"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Usar"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Título no válido"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduzca un título no vacío para el estado."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Título duplicado"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Introduzca un título distinto para el estado."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Sub-estado"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Editar estado"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Usar un estado diferente para las siguientes cuentas"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Guardar y usar"
 
-#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2149
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Estados"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Erro al cargar el complemento."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "No se pudo encontrar la pantalla X"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "No se pudo encontrar la ventana"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
 "No se pudo cargar este complemento porque no se construyó con soporte de X11."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "PortapapelesGnt"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Complemento de portapapeles"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -2132,77 +1463,60 @@ msgstr ""
 "El entorno de X tiene acceso a Los contenidos del portapapeles de gnt cuando "
 "estos cambian, si es posible."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s se acaba de conectar"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s se acaba de desconectar"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s le envío un mensaje"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s dijo su apodo en %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s envió un mensaje en %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Un amigo se conecta/desconecta"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Recibe un MI"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Alguien habla5~e en el chat"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Alguien dice su nombre en el chat"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notificar con un «toaster» cuando"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "¡Pitar también!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Fija la ventana de terminal como URGENTE."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntFg"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Complemento «toaster»"
 
-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:132
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversación con %s sobre %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:159
 msgid "History Plugin Requires Logging"
 msgstr "Debe estar conectad para utilizar el complemento de histórico"
 
-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:160
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2214,17 +1528,14 @@ msgstr ""
 "La activación del registro en mensajes instantáneos y/o chats activará el "
 "histórico para los mismos tipos de conversación."
 
-#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "HistóricoGnt"
 
-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:203
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "Muestra las conversaciones registradas previamente en las nuevas "
 "conversaciones."
 
-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:204
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2232,170 +1543,115 @@ msgstr ""
 "Cuando se abre una nueva conversación este complemento introduce la última "
 "conversación en la conversación actual."
 
-#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+#, c-format
 msgid "Online"
 msgstr "Conectado"
 
-#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2082
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:155
-#: ../pidgin/gtkblist.c:3415 ../pidgin/gtkblist.c:3807
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1090
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3451
 msgid "Online Buddies"
 msgstr "Amigos conectados"
 
-#: ../finch/plugins/grouping.c:117
 msgid "Offline Buddies"
 msgstr "Amigos desconectados"
 
-#: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
 msgstr "Conectado/Desconectado"
 
-#: ../finch/plugins/grouping.c:168
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr "No agrupar"
 
-#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "Ofrece opciones adicionales para agrupar las listas de amigos."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Busca sub-cadenas en el registro pasado."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Complemento «Lastlog»."
 
-#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "cuentas"
 
-#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:204
-#: ../libpurple/protocols/silc/silc.c:473
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contraseña."
 
-#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduzca la contraseña para %s (%s)"
 
-#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "Introduzca la contraseña"
 
-#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "Guardar la contraseña"
 
-#: ../libpurple/account.c:1144 ../libpurple/connection.c:118
-#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"
 
-#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Error de conexión"
 
-#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1739
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseñas no coinciden."
 
-#: ../libpurple/account.c:1370
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: ../libpurple/account.c:1402
 msgid "Original password"
 msgstr "Contraseña original"
 
-#: ../libpurple/account.c:1410
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: ../libpurple/account.c:1418
 msgid "New password (again)"
 msgstr "Nueva contraseña (otra vez)"
 
-#: ../libpurple/account.c:1425
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseña de %s"
 
-#: ../libpurple/account.c:1433
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseña actual y la contraseña nueva."
 
-#: ../libpurple/account.c:1464
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la información del usuario %s"
 
-#: ../libpurple/account.c:1467 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Establecer su información de usuario"
 
-#: ../libpurple/account.c:1938 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:2078
-#: ../libpurple/protocols/jabber/buddy.c:2095
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3442 ../pidgin/gtkblist.c:6317
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Amigos"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(NO COINCIDE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 "%s ha presentado el certificado mostrado a continuación para este uso de una "
 "sola vez:"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2405,53 +1661,40 @@ msgstr ""
 "Huella (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Verificación de certificado de un solo uso"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Autoridades de certificación"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "Caché de servidores SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "¿Desea aceptar el certificado para %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "Verificación de certificado SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2460,7 +1703,6 @@ msgstr ""
 "El certificado presentado por «%s» es autofirmado. No puede comprobarse de "
 "forma automática."
 
-#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificados presentada por %s no es válida."
@@ -2470,16 +1712,13 @@ msgstr "La cadena de certificados presentada por %s no es válida."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"
 
-#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Cadena de certificado inválida"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2488,14 +1727,12 @@ msgstr ""
 "validar este certificado."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 "Pidgin no conoce el certificado raíz bajo el que este certificado dice "
 "haberse generado."
 
-#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2505,7 +1742,6 @@ msgstr ""
 "La cadena de certificado presentada por %s no tiene una firma digital válida "
 "de la Autoridad de Certificación de la que asegura tener la firma."
 
-#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "Firma de autoridad de certificación inválida"
 
@@ -2513,7 +1749,6 @@ msgstr "Firma de autoridad de certificación inválida"
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1434
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2524,7 +1759,6 @@ msgstr ""
 "piensa que se está conectado."
 
 #. Make messages
-#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2542,128 +1776,95 @@ msgstr ""
 "Fecha de expiración: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Información del certificado"
 
-#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Error de registro"
 
-#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Error de deregistro"
 
-#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se ha conectado"
 
-#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"
 
-#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2398
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:329
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "No se pudo enviar el mensaje: es demasiado grande."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "No se pudo enviar el mensaje a %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:296
-#: ../libpurple/protocols/bonjour/jabber.c:339
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
-#: ../libpurple/conversation.c:1231
 msgid "Send Message"
 msgstr "Enviar un mensaje"
 
-#: ../libpurple/conversation.c:1234
 msgid "_Send Message"
 msgstr "Enviar un _mensaje"
 
-#: ../libpurple/conversation.c:1640
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1643
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"
 
-#: ../libpurple/conversation.c:1773
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: ../libpurple/conversation.c:1848
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: ../libpurple/conversation.c:1851
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#: ../libpurple/dbus-server.c:586
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "No se pudo obtener la conexión: %s"
 
-#: ../libpurple/dbus-server.c:598
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "No se pudo obtener un nombre: %s"
 
-#: ../libpurple/dbus-server.c:612
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "No se pudo obtener el nombre del servidor: %s"
 
-#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 "El servidor D-BUS de Purple no está ejecutándose por la razón indicada a "
 "continuación"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "No se pudo crear un proceso nuevo de resolución\n"
 
-#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "No se pudo enviar una solicitud al proceso de resolución\n"
 
-#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2672,13 +1873,10 @@ msgstr ""
 "Error al resolver %s: \n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
-#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Error al resolver %s: %d"
 
-#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2687,20 +1885,17 @@ msgstr ""
 "Error al leer del proceso de resolución:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:599
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Fin de fichero mientras se leía del proceso de resolución"
 
-#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Falló en la creación de hilos: %s"
 
-#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2709,7 +1904,6 @@ msgstr ""
 "Error al leer %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2718,7 +1912,6 @@ msgstr ""
 "Error al escribir %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2727,39 +1920,31 @@ msgstr ""
 "Error al acceder a %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "No se puede escribir en el directorio."
 
-#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "No se puede enviar un archivo de 0 bytes."
 
-#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "No se puede enviar un directorio."
 
-#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s no es un archivo normal. No se sobreescribirá.\n"
 
-#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quiere enviarle %s (%s)"
 
-#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s quiere enviarle un fichero"
 
-#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "¿Aceptar solicitud de transferencia de archivo de %s?"
 
-#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2770,133 +1955,105 @@ msgstr ""
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s se ofrece a enviarle el archivo %s"
 
-#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s no es un nombre de archivo válido.\n"
 
-#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se ofrece enviar %s a %s"
 
-#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Comienza la transferencia de %s de %s"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"
 
-#: ../libpurple/ft.c:703
+#, c-format
 msgid "File transfer complete"
 msgstr "Transferencia de archivos completa"
 
-#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vd. canceló la transferencia de %s"
 
-#: ../libpurple/ft.c:1143
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivos cancelada"
 
-#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s canceló la transferencia de %s"
 
-#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s canceló la transferencia de archivos"
 
-#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Falló la transferencia del archivo a %s."
 
-#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Falló la transferencia del archivo de %s."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Ejecutar la orden en un terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «aim», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «gg», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «icq», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «irc», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «msnim», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «sip», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «xmpp», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "La orden para gestionar URLs «ymsgr», si se activan."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "El manejador para URLs «aim»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "El manejador para URLs «gg»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "El manejador para URLs «icq»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "El manejador para URLs «irc»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "El manejador para URLs «msnim»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "El manejador para URLs «sip»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "El manejador para URLs «xmpp»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "El manejador para URLs «ymsgr»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -2904,7 +2061,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«aim»."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -2912,7 +2068,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«gg»."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -2920,7 +2075,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«icq»."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -2928,7 +2082,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«irc»."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -2936,7 +2089,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«msnim»."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -2944,7 +2096,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«sip»."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -2952,7 +2103,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«xmpp»."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -2960,7 +2110,6 @@ msgstr ""
 "Cierto si la orden especificada en la tecla «command» debería gestionar URLs "
 "«ymsgr»."
 
-#: ../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."
@@ -2968,64 +2117,49 @@ msgstr ""
 "Cierto si la orden especifica para gestionar este tipo de URLs debería "
 "ejecutarse en un terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Si la orden debería gestionar URLs «aim»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Si la orden debería gestionar URLs «gg»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Si la orden debería gestionar URLs «icq»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Si la orden debería gestionar URLs «irc»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Si la orden debería gestionar URLs «msnim»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Si la orden debería gestionar URLs «sip»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Si la orden debería gestionar URLs «xmpp»"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Si la orden debería gestionar URLs «ymsgr»"
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">El registro no tiene función de lectura</font></b>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "En claro"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Formato antiguo plano"
 
-#: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversación."
 
-#: ../libpurple/log.c:1293
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1377
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -3034,7 +2168,6 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1379
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -3043,47 +2176,42 @@ msgstr ""
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>¡No se pudo encontrar la ruta del registro!</b></font>"
 
-#: ../libpurple/log.c:1449 ../libpurple/log.c:1579
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 
-#: ../libpurple/log.c:1511
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Está utilizando %s, pero este complemento requiere %s."
 
-#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "No se ha definido un identificador para este complemento."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 "No hubo coincidencia en el número mágico del complemento %d (necesitaba %d)"
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 "No hubo coincidencia en el número de versión ABI %d.%d.x (necesitaba %d.%d.x)"
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
-msgstr "El complemento no implementa todas las funciones necesarias"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"El complemento no implementa todas las funciones necesarias («list_icon», "
+"«login» y «close»)"
 
-#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -3092,89 +2220,63 @@ msgstr ""
 "No se encontró el complemento necesario %s. Por favor, instale este "
 "complemento e inténtelo de nuevo."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "No se pudo cargar el complemento"
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "No se pudo cargar el complemento necesario %s."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "No se pudo cargar su complemento."
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s necesita %s, pero no se pudo descargar."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Autoaceptar"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 "Autoaceptar las solicitud de transferencia de archivo de los usuarios "
 "seleccionados."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 "Se completó la solicitud autoaceptada de transferencia de archivo de «%s» "
 "enviado por «%s»."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Completada autoaceptada"
 
-#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Cuando llega una solicitud de transferencia de %s?"
 
-#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Configurar la autoaceptación"
 
-#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2338
-#: ../libpurple/protocols/oscar/oscar.c:6001
-#: ../libpurple/protocols/oscar/oscar.c:6056
-#: ../libpurple/protocols/oscar/oscar.c:6283
-#: ../libpurple/protocols/oscar/oscar.c:6353 ../libpurple/request.h:1401
-#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Preguntar"
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Autoaceptar"
 
-#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Rechazo automática"
 
-#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Autoaceptar transferencia de archivos..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3182,13 +2284,11 @@ msgstr ""
 "Ruta donde se guardarán los ficheros\n"
 "(Debe dar la ruta completa)"
 
-#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Rechazar automáticamente las transferencias de usuarios que no están en mi "
 "lista de amigos"
 
-#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3197,18 +2297,15 @@ msgstr ""
 "ficheros autoaceptada\n"
 "(sólo cuando no hay ya una conversación con el que la envía)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msn/msn.c:1860
-#: ../libpurple/protocols/msnp9/msn.c:1671
-#: ../libpurple/protocols/msnp9/msn.c:1701
+msgid "Create a new directory for each user"
+msgstr "Crear un directorio para cada usuario"
+
 msgid "Notes"
 msgstr "Notas"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Introduzca sus notas a continuación..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Editar las notas..."
 
@@ -3220,18 +2317,15 @@ msgstr "Editar las notas..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Notas de amigos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Guardar las notas de amigos concretos."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Añade la opción de guardar notas sobre los amigos en su lista de amigos."
@@ -3242,7 +2336,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Prueba de cifrado"
 
@@ -3250,7 +2343,6 @@ msgstr "Prueba de cifrado"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Prueba los cifrados que se incluyen en libpurple."
 
@@ -3260,7 +2352,6 @@ msgstr "Prueba los cifrados que se incluyen en libpurple."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Ejemplo DBus"
 
@@ -3268,8 +2359,6 @@ msgstr "Ejemplo DBus"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Ejemplo de complemento DBus"
 
@@ -3279,7 +2368,6 @@ msgstr "Ejemplo de complemento DBus"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Control de archivos"
 
@@ -3287,50 +2375,38 @@ msgstr "Control de archivos"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Permite controlar el programa introduciendo órdenes en un archivo."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "minutos"
 
 #. 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
 msgid "I'dle Mak'er"
 msgstr "Generador de ausencia"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Establecer tiempo de inactividad de la cuenta"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Guardar"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Ninguna de sus cuentas está inactiva."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Desactivar tiempo de inactividad de la cuenta"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Desactivar"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Fijar tiempo de inactividad para todas las cuentas"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Desactivar tiempo de inactividad para todas las cuentas inactivas"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Permite configurar manualmente cuánto tiempo ha estado inactivo"
 
@@ -3340,19 +2416,16 @@ msgstr "Permite configurar manualmente cuánto tiempo ha estado inactivo"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Cliente de prueba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Complemento de prueba con soporte IPC, como cliente."
 
 #. *  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."
@@ -3366,33 +2439,27 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Servidor de prueba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Complemento de soporte IPC de prueba, como servidor."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Complemento de soporte IPC de prueba, como servidor. Éste registra las "
 "órdenes IPC."
 
-#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "Configuración de la ocultación de Unir/Salir"
 
-#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "Tamaño mínimo de sala"
 
-#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tiempo de inactividad de usuario (en minutos)"
 
@@ -3402,19 +2469,16 @@ msgstr "Tiempo de inactividad de usuario (en minutos)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "Esconder Unir/Dejar"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "Oculta los mensajes de unir/salir ajenos"
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3426,34 +2490,25 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(TCU)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "El usuario no está conectado."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "_Enviar respuesta automática:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:84
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se ha desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Uno o más mensajes puede no haber llegado a destino."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Ha sido desconectado del servidor."
 
-#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3461,86 +2516,66 @@ msgstr ""
 "Actualmente está desconectado. No podrá recibir mensajes a menos que se "
 "conecte."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "No se pudo enviar el mensaje porque excede la longitud máxima permitida."
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "No se envió su mensaje."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2855
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2860
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2864
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2869
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2873
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2877
 msgid "Trillian"
 msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2881
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2837
 msgid "General Log Reading Configuration"
 msgstr "Configuración general de lectura del registro"
 
-#: ../libpurple/plugins/log_reader.c:2841
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../libpurple/plugins/log_reader.c:2845
 msgid "Use name heuristics"
 msgstr "Utilizar heurísticos de nombres"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2851
 msgid "Log Directory"
 msgstr "Directorio de registro"
 
@@ -3550,19 +2585,16 @@ msgstr "Directorio de registro"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2910
 msgid "Log Reader"
 msgstr "Lector de registro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2914
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2918
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3577,20 +2609,15 @@ msgstr ""
 "AVISO: Este complemento aún es código en «alpha» y puede bloquearse con "
 "frecuencia. ¡Uselo bajo su propia responsabilidad!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Cargador de complementos Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Cargar complementos .NET con Mono."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "Añadir una línea nueva en los MIs"
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr "Añadir una nueva línea en los chats"
 
@@ -3603,33 +2630,29 @@ msgstr "Añadir una nueva línea en los chats"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Nueva línea"
 
 # Antecede una línea al mensaje mostrado.
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "No se pudo enviar el mensaje."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
-msgstr "Añade una línea en blanco a los mensajes para que el resto del mensaje se muestre por debajo del nombre de usuario en la ventana de conversación."
+msgstr ""
+"Añade una línea en blanco a los mensajes para que el resto del mensaje se "
+"muestre por debajo del nombre de usuario en la ventana de conversación."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Emulación de mensaje de desconectado"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Guardar los mensajes enviados como un aviso."
 
-#: ../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."
@@ -3637,7 +2660,6 @@ msgstr ""
 "El resto de los mensajes se guardarán como un aviso. Puede editar y eliminar "
 "los avisos en el diálogo «Aviso de amigo»."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -3646,49 +2668,21 @@ msgstr ""
 "«%s» está actualmente desconectado. ¿Desea guardar el resto del mensaje como "
 "un aviso y enviarlo de forma automática cuando «%s» se vuelva a conectar?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mensaje desconectado"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Puede editar y borrar los avisos del diálogo «Avisos de amigo»"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Sí"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1930
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Guardar los mensajes de desconexión como un aviso"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "No preguntar. Siempre guardar como un aviso."
 
@@ -3698,26 +2692,21 @@ msgstr "No preguntar. Siempre guardar como un aviso."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Cargador de complementos Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Provee soporte para cargar complementos en perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Modo psíquico"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Modo psíquico para conversaciones entrantes"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -3726,23 +2715,18 @@ msgstr ""
 "enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, XMPP, Sametime y "
 "Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Sientes una perturbación en la fuerza..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Permitir sólo a los usuarios en mi lista de amigos"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Deshabilitar cuando ausente"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Muestra el mensaje de notificación en las conversaciones"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Activar conversaciones psíquicas"
 
@@ -3752,7 +2736,6 @@ msgstr "Activar conversaciones psíquicas"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Prueba de señales"
 
@@ -3760,8 +2743,6 @@ msgstr "Prueba de señales"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Probar para ver si todas las señales funcionan correctamente."
 
@@ -3771,7 +2752,6 @@ msgstr "Probar para ver si todas las señales funcionan correctamente."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Complemento sencillo"
 
@@ -3779,13 +2759,10 @@ msgstr "Complemento sencillo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Certificados X.509"
 
@@ -3795,7 +2772,6 @@ msgstr "Certificados X.509"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3803,8 +2779,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "Proporciona soporte SSL a través de GNUTLS."
 
@@ -3814,7 +2788,6 @@ msgstr "Proporciona soporte SSL a través de GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3822,8 +2795,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Proporciona soporte SSL a través del NSS de Mozilla."
 
@@ -3833,7 +2804,6 @@ msgstr "Proporciona soporte SSL a través del NSS de Mozilla."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3841,49 +2811,39 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 "Proporciona un recubrimiento a través de las bibliotecas de soporte de SSL."
 
-#: ../libpurple/plugins/statenotify.c:54
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ya no está ausente."
 
-#: ../libpurple/plugins/statenotify.c:56
 #, c-format
 msgid "%s has gone away."
 msgstr "%s se ha marchado."
 
-#: ../libpurple/plugins/statenotify.c:66
 #, c-format
 msgid "%s has become idle."
 msgstr "%s está ahora inactivo."
 
-#: ../libpurple/plugins/statenotify.c:68
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ya no está inactivo."
 
-#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s has signed on."
 msgstr "%s se ha conectado."
 
-#: ../libpurple/plugins/statenotify.c:95
 msgid "Notify When"
 msgstr "Notificar cuando"
 
-#: ../libpurple/plugins/statenotify.c:98
 msgid "Buddy Goes _Away"
 msgstr "El amigo se _ausenta"
 
-#: ../libpurple/plugins/statenotify.c:101
 msgid "Buddy Goes _Idle"
 msgstr "El amigo está _inactivo"
 
-#: ../libpurple/plugins/statenotify.c:104
 msgid "Buddy _Signs On/Off"
 msgstr "Un amigo _se conecta/desconecta"
 
@@ -3893,7 +2853,6 @@ msgstr "Un amigo _se conecta/desconecta"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:152
 msgid "Buddy State Notification"
 msgstr "Notificación de estado de amigos"
 
@@ -3901,8 +2860,6 @@ msgstr "Notificación de estado de amigos"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:155
-#: ../libpurple/plugins/statenotify.c:158
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -3910,15 +2867,12 @@ msgstr ""
 "Notifica en una ventana de conversación cuando un amigo se ausenta o vuelve "
 "o está inactivo."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Cargador de complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provee soporte para cargar complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3926,21 +2880,17 @@ msgstr ""
 "No se pudo detectar la instalación de ActiveTCL. Debe instalar ActiveTCL de "
 "http://www.activestate.com si desea utilizar los complementos TCL\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:102
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
 "No se encontró el conjunto de herramientas Apple Bonjour para Windows. Para "
-"más información consulte las preguntas frecuentas (FAQ) en http://developer."
-"pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
+"más información consulte las preguntas frecuentas (FAQ) en http://d.pidgin."
+"im/wiki/BonjourWindows."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:121
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -3948,40 +2898,18 @@ msgstr ""
 "arrancado?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:393
-#: ../libpurple/protocols/bonjour/bonjour.c:699
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "Nombre:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:395
-#: ../libpurple/protocols/bonjour/bonjour.c:702
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "Apellidos:"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:399
-#: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/jabber/buddy.c:1373
-#: ../libpurple/protocols/jabber/buddy.c:2267
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:402
-#: ../libpurple/protocols/bonjour/bonjour.c:708
 msgid "AIM Account"
 msgstr "Cuenta AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:405
-#: ../libpurple/protocols/bonjour/bonjour.c:711
 msgid "XMPP Account"
 msgstr "Cuenta XMPP"
 
@@ -3995,57 +2923,37 @@ msgstr "Cuenta XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:509
-#: ../libpurple/protocols/bonjour/bonjour.c:511
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:652
 msgid "Purple Person"
 msgstr "Persona morada"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:431
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversación."
 
-#: ../libpurple/protocols/bonjour/jabber.c:481
-#: ../libpurple/protocols/bonjour/jabber.c:546
-#: ../libpurple/protocols/bonjour/jabber.c:591
-#: ../libpurple/protocols/bonjour/jabber.c:768
-#: ../libpurple/protocols/bonjour/jabber.c:786
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
 
-#: ../libpurple/protocols/bonjour/jabber.c:685
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:695
-msgid "Error setting socket options"
-msgstr "Error al establecer las opciones del socket"
-
-#: ../libpurple/protocols/bonjour/jabber.c:721
 msgid "Could not bind socket to port"
 msgstr "No se pudo vincular el socket al puerto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:731
 msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"
 
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error comunicándose con el servicio «mDNSResponder» local."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1908
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4053,339 +2961,217 @@ msgstr ""
 "El nombre de servidor o el puerto especificados no son válidos para su tipo "
 "de proxy."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Error de token"
 
-#: ../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 "No se pudo obtener el token.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Guardar la lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 "No se escribió nada en el fichero ya que su lista de amigos esta vacía."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "¡Se guardó con éxito la lista de amigos!"
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "No se pudo escribir la lista de amigos de %s a %s"
 
-#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "No se pudo cargar la lista de amigos"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "¡Éxito en la carga de la lista de amigos!"
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Guardar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:382
+msgid "Load buddylist from file..."
+msgstr "Cargar la lista de amigos desde archivo..."
+
 msgid "Fill in the registration fields."
 msgstr "Rellene los campos de registro."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "No se pudo registrar la cuenta nueva. Se produjo un error.\n"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Se ha registrado una nueva cuenta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "¡Se completó el registro con éxito!"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Contraseña (escribir de nuevo)"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Introduzca el token actual"
 
-#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Por favor, rellene los siguientes campos"
 
-#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/oscar/oscar.c:3828
-#: ../libpurple/protocols/oscar/oscar.c:3841
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Año de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msnp9/msn.c:1600
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Hombre o mujer"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Hombre"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Mujer"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Solamente conectado"
 
-#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduzca a continuación su criterio de búsqueda"
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Rellene los campos."
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Su contraseña actual es diferente de la que ha especificado."
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "No se pudo cambiar la contraseña. Se produjo un error.\n"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar la contraseña de la cuenta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "¡Se cambió con éxito la contraseña!"
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduzca su contraseña actual y la contraseña nueva para UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambiar la contraseña Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para el amigo: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Añadir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2084
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1086
 msgid "Available"
 msgstr "Disponible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:358
-#: ../libpurple/protocols/jabber/buddy.c:2088
-#: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:734
-#: ../libpurple/protocols/oscar/oscar.c:5747
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3719
-#: ../libpurple/protocols/yahoo/yahoo.c:3793 ../libpurple/status.c:159
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2070
-#: ../pidgin/gtkstatusbox.c:1087
+#, c-format
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2755
-#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2261
-#: ../libpurple/protocols/jabber/buddy.c:2447
-#: ../libpurple/protocols/oscar/oscar.c:3749
-#: ../libpurple/protocols/silc/ops.c:1004
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
 
-#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Año de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3950
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la búsqueda."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Resultados de la búsqueda"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "No se encontraron usuarios que coincidan"
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "No hay usuarios que coincidan con sus criterios de búsqueda."
 
-#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Su lista de amigos fue descargada del servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos exportada"
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Su lista de amigos fue almacenada en el servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Falló la conexión."
 
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Error de chat"
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "No está conectado al servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Cambiar su contraseña..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Subir la lista de amigos al servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Descargar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Borrar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Guardar lista de amigos a archivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr "Cargar la lista de amigos desde archivo..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -4397,152 +3183,81 @@ msgstr "Cargar la lista de amigos desde archivo..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Mensajería instantánea polaca muy popular"
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1853
-#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:509
-#: ../libpurple/protocols/jabber/chat.c:596
-#: ../libpurple/protocols/silc/silc.c:1561
-#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "el tema actual es: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:513
-#: ../libpurple/protocols/jabber/chat.c:600
-#: ../libpurple/protocols/silc/silc.c:1565
-#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "No hay tema establecido"
 
-#: ../libpurple/protocols/irc/dcc_send.c:298
-#: ../libpurple/protocols/irc/dcc_send.c:339
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 msgid "File Transfer Failed"
 msgstr "Falló la transferencia de archivos"
 
-#: ../libpurple/protocols/irc/dcc_send.c:299
-#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "No se pudo abrir un puerto de escucha."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Error al mostrar el MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "No hay MOTD disponible"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "No hay MOTD asociado con esta conexión."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "Contra_seña:"
 
-#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1346
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:354
-#: ../libpurple/protocols/myspace/myspace.c:295
-#: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1335
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3778
-#: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:686
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:674
-#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:313
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2533
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3426
-#: ../libpurple/protocols/silc/chat.c:1404
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Tema"
 
@@ -4554,50 +3269,27 @@ msgstr "Tema"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:371
-#: ../libpurple/protocols/msn/msn.c:2357
-#: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6749
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5783
-#: ../libpurple/protocols/silc/ops.c:1262
-#: ../libpurple/protocols/silc/ops.c:1356
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2099
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6752
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5788
-#: ../libpurple/protocols/silc/silc.c:2143
-#: ../libpurple/protocols/silc10/silc.c:1867
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:365
-#: ../libpurple/protocols/silc/silc.c:1225
-#: ../libpurple/protocols/silc10/silc.c:926
+msgid "Auto-detect incoming UTF-8"
+msgstr "Detectar de forma automática caracteres UTF-8"
+
 msgid "Real name"
 msgstr "Nombre real"
 
@@ -4605,173 +3297,130 @@ msgstr "Nombre real"
 #. 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:985
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Bad mode"
 msgstr "Modo erróneo"
 
-#: ../libpurple/protocols/irc/msgs.c:214
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "Explusado %s por %s, hace %ld segundos"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Explusado de %s por %s, hace %s"
 
-#: ../libpurple/protocols/irc/msgs.c:217
 #, c-format
 msgid "Ban on %s"
 msgstr "Prohibir en %s"
 
-#: ../libpurple/protocols/irc/msgs.c:232
 msgid "End of ban list"
 msgstr "Fin de la lista de prohibiciones"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/irc/msgs.c:246
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ha sido expulsado de %s."
 
-#: ../libpurple/protocols/irc/msgs.c:247
 msgid "Banned"
 msgstr "Expulsado"
 
-#: ../libpurple/protocols/irc/msgs.c:264
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "No se puede expulsar a %s: la lista de expulsados está llena"
 
-#: ../libpurple/protocols/irc/msgs.c:349
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:350
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:351
-#: ../libpurple/protocols/oscar/oscar.c:3739
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apodo"
 
-#: ../libpurple/protocols/irc/msgs.c:377
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../libpurple/protocols/irc/msgs.c:382
 msgid "Idle for"
 msgstr "Inactivo durante"
 
-#: ../libpurple/protocols/irc/msgs.c:385
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "<b>Defining adjective:</b>"
 msgstr "<br><b>Adjetivo que lo define:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:473
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:475
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ha borrado el tema."
 
-#: ../libpurple/protocols/irc/msgs.c:483
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "El tema de %s es: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:501
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaje desconocido '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "Unknown message"
 msgstr "Mensaje desconocido"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "The IRC server received a message it did not understand."
 msgstr "El servidor IRC ha recibido un mensaje que no pudo entender."
 
-#: ../libpurple/protocols/irc/msgs.c:523
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Time Response"
 msgstr "Respuesta de hora"
 
-#: ../libpurple/protocols/irc/msgs.c:631
 msgid "The IRC server's local time is:"
 msgstr "La hora local del servidor de IRC es:"
 
-#: ../libpurple/protocols/irc/msgs.c:642
 msgid "No such channel"
 msgstr "No existe ese canal"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:653
 msgid "no such channel"
 msgstr "no existe el canal"
 
-#: ../libpurple/protocols/irc/msgs.c:656
 msgid "User is not logged in"
 msgstr "El usuario no está conectado"
 
-#: ../libpurple/protocols/irc/msgs.c:661
 msgid "No such nick or channel"
 msgstr "No existe el apodo o canal"
 
-#: ../libpurple/protocols/irc/msgs.c:681
 msgid "Could not send"
 msgstr "No se pudo enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:737
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s es necesaria una invitación."
 
-#: ../libpurple/protocols/irc/msgs.c:738
 msgid "Invitation only"
 msgstr "Sólo con invitación"
 
-#: ../libpurple/protocols/irc/msgs.c:854
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ha sido expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:859 ../libpurple/protocols/silc/ops.c:714
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:882
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:970 ../libpurple/protocols/irc/msgs.c:971
 msgid "Invalid nickname"
 msgstr "Apodo inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:972
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4779,7 +3428,6 @@ msgstr ""
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:977
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4787,53 +3435,40 @@ msgstr ""
 "El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
 "incluya caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Could not change nick"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/irc/msgs.c:1041
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ha abandonado el canal %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1085
 msgid "Error: invalid PONG from server"
 msgstr "Error: PONG inválido del servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1087
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Respuesta PING -- Retraso: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1178
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "No se pudo unir a %s: es necesario registrarse"
 
-#: ../libpurple/protocols/irc/msgs.c:1179
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "No se puede unir al canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1213
 msgid "Nick or channel is temporarily unavailable."
 msgstr "El apodo o el canal están temporalmente no disponibles."
 
-#: ../libpurple/protocols/irc/msgs.c:1225
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensajes globales de %s"
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acción a realizar&gt;: Realiza una acción."
 
-#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4841,11 +3476,12 @@ msgstr ""
 "away [mensaje]:  Fija el mensaje cuando se está ausente, o no utilizar un "
 "mensaje al dejar de estar ausente."
 
-#: ../libpurple/protocols/irc/parse.c:126
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <alias> <msj>: envía un mensaje ctcp al alias."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4853,7 +3489,6 @@ msgstr ""
 "deop &lt;apodo1&gt; [apodo2] ....: Quitarle a alguien el estado de operador "
 "de canal. Sólo un operador de canal puede hacerlo."
 
-#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -4863,7 +3498,6 @@ msgstr ""
 "hablar en el canal si éste está moderado (+m). Sólo lo puede hacer un "
 "operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -4871,7 +3505,6 @@ msgstr ""
 "invite %lt;apodo&gt; [sala]:  Invitar a alguien a unirse al canal "
 "especificado o al canal actual."
 
-#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4879,7 +3512,6 @@ msgstr ""
 "j &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o más "
 "canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4887,7 +3519,6 @@ msgstr ""
 "join &lt;sala1&gt;[,sala2][,...] [clave1[,clave2][,...]]:  Entrar en un o "
 "más canales utilizando, opcionalmente, una clave de canal si fuera necesario."
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -4895,7 +3526,6 @@ msgstr ""
 "kick &lt;apodo&gt; [mensaje]:  Echar a alguien del canal. Sólo lo pueden "
 "hacer los operadores de canal."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -4903,15 +3533,12 @@ msgstr ""
 "list:  Mostrar una lista de las salas de chat disponibles en la red. "
 "<i>Aviso: algunos servidores puede que le desconecten si hace ésto.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:134
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acción a realizar&gt;:  Realizar una acción."
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4919,7 +3546,6 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;apodo|canal&gt;:  Fija o elimina un modo "
 "de canal o de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:137
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4927,25 +3553,19 @@ msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [canal]:  Obtener la lista de los usuarios que están en el canal."
 
-#: ../libpurple/protocols/irc/parse.c:139
-#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
-#: ../libpurple/protocols/irc/parse.c:140
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Enviar un comando al servidor."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;objetivo&gt;: enviar un aviso a un usuario o a un canal."
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4953,7 +3573,6 @@ msgstr ""
 "op &lt;apodo1&gt; [apodo2] ...:  Dar estado de operador de canal a otra "
 "persona. Sólo lo puede hacer un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4961,11 +3580,9 @@ msgstr ""
 "operwall &lt;mensaje&gt;:  Si no sabe lo que es probablemente no puede "
 "utilizarlo."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid "operserv: Send a command to operserv"
 msgstr "openserv: Enviar un comando al servidor"
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4973,7 +3590,6 @@ msgstr ""
 "part [sala] [mensaje]:  Abandonar el canal actual, o un canal específico, "
 "con el mensaje opcional."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4981,7 +3597,6 @@ msgstr ""
 "ping [apodo]:  Pregunta cuanta latencia tiene un usuario (o el servidor si "
 "no se especifica un usuario)."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4989,17 +3604,14 @@ msgstr ""
 "query &lt;apodo&gt; &lt;mensaje&gt;:  Envía un mensaje privado a un usuario "
 "(lo opuesto a un canal)."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual indicando un mensaje "
 "(opcional)."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Enviar un comando en crudo al servidor."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5007,24 +3619,19 @@ msgstr ""
 "remove &lt;apodo&gt; [mensaje]:  Eliminar a alguien de una sala. Sólo puede "
 "hacerlo un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Muestra la hora local en el servidor IRC."
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuevo tema]:  Muestra o cambia el tema del canal."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece o elimina un modo de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [apodo]: envía una solicitud CTCP VERSION al usuario"
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5032,75 +3639,52 @@ msgstr ""
 "voice &lt;apodo1&gt; [apodo2] ...:  Dar la posibilidad de hablar en el canal "
 "a alguien. Sólo lo puede hacer un operador de canal."
 
-#: ../libpurple/protocols/irc/parse.c:156
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;mensaje&gt;:  Si no sabe lo que es probablemente no pueda usarlo."
 
-#: ../libpurple/protocols/irc/parse.c:157
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;apodo&gt;:  Obtiene información de un usuario."
 
-#: ../libpurple/protocols/irc/parse.c:158
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;apodo&gt;:  Obtiene información de un usuario que se ha "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:523
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tiempo de respuesta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "CTCP PING reply"
 msgstr "Respuesta a PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:636
-#: ../libpurple/protocols/irc/parse.c:643 ../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 "Desconectado."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:735
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Falló la orden ad-hoc"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "ejecutar"
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:60
 msgid "You require encryption, but no TLS/SSL support found."
 msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"
 
-#: ../libpurple/protocols/jabber/auth.c:328
-#: ../libpurple/protocols/jabber/auth.c:535
-#: ../libpurple/protocols/jabber/auth.c:729
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -5109,139 +3693,74 @@ msgstr ""
 "%s solicita autenticación en claro sobre un canal no cifrado. ¿Desea "
 "permitir ésto y continuar con el proceso de autenticación?"
 
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:331
-#: ../libpurple/protocols/jabber/auth.c:537
-#: ../libpurple/protocols/jabber/auth.c:538
-#: ../libpurple/protocols/jabber/auth.c:731
-#: ../libpurple/protocols/jabber/auth.c:732
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:662
-#: ../libpurple/protocols/jabber/auth.c:913
-#: ../libpurple/protocols/jabber/auth.c:1064
-#: ../libpurple/protocols/jabber/auth.c:1091
-#: ../libpurple/protocols/jabber/auth.c:1137
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."
 
-#: ../libpurple/protocols/jabber/auth.c:551
-#: ../libpurple/protocols/jabber/auth.c:745
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido"
 
-#: ../libpurple/protocols/jabber/auth.c:936
-#: ../libpurple/protocols/jabber/auth.c:961
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: ../libpurple/protocols/jabber/auth.c:1037
 msgid "SASL error"
 msgstr "Error de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:306
-#: ../libpurple/protocols/jabber/buddy.c:1257
-#: ../libpurple/protocols/sametime/sametime.c:4184
-#: ../libpurple/protocols/silc/ops.c:1000
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../libpurple/protocols/jabber/buddy.c:307
-#: ../libpurple/protocols/jabber/buddy.c:1269
-#: ../libpurple/protocols/silc/ops.c:1012
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1272
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: ../libpurple/protocols/jabber/buddy.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1320
 msgid "Street Address"
 msgstr "Calle"
 
-#: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1323
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1326
 msgid "Region"
 msgstr "Región"
 
-#: ../libpurple/protocols/jabber/buddy.c:315
-#: ../libpurple/protocols/jabber/buddy.c:1329
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1333
-#: ../libpurple/protocols/silc/silc.c:1231
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "País"
 
-#: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1344
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1388
 msgid "Organization Name"
 msgstr "Nombre de la organización"
 
-#: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1391
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1400
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1288
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1669
-#: ../libpurple/protocols/oscar/oscar.c:3788
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1403
-#: ../libpurple/protocols/jabber/chat.c:780
-#: ../libpurple/protocols/jabber/usermood.c:190 ../pidgin/gtkblist.c:3427
-#: ../pidgin/gtkplugin.c:582 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Descripción"
 
-#: ../libpurple/protocols/jabber/buddy.c:753
-#: ../libpurple/protocols/jabber/buddy.c:754
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard de XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:755
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5249,386 +3768,232 @@ msgstr ""
 "Todos los campos siguientes son opcionales. Introduzca sólo la información "
 "con la que se sienta cómodo."
 
-#: ../libpurple/protocols/jabber/buddy.c:826
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:830
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/jabber/buddy.c:1006
 msgid "Last Activity"
 msgstr "Última actividad"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
-#: ../libpurple/protocols/jabber/buddy.c:1008
 msgid "Service Discovery Info"
 msgstr "Información de descubrimiento de servicio"
 
-#: ../libpurple/protocols/jabber/buddy.c:850
-#: ../libpurple/protocols/jabber/buddy.c:1010
 msgid "Service Discovery Items"
 msgstr "Elementos de descubrimiento de servicio"
 
-#: ../libpurple/protocols/jabber/buddy.c:852
-#: ../libpurple/protocols/jabber/buddy.c:1012
 msgid "Extended Stanza Addressing"
 msgstr "Dirección de grupo extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:854
-#: ../libpurple/protocols/jabber/buddy.c:1014
 msgid "Multi-User Chat"
 msgstr "Chat multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1016
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Información de presencia extendida en chat multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:858
-#: ../libpurple/protocols/jabber/buddy.c:1018
 msgid "In-Band Bytestreams"
 msgstr "Flujos de bytes en banda"
 
-#: ../libpurple/protocols/jabber/buddy.c:860
-#: ../libpurple/protocols/jabber/buddy.c:1020
 msgid "Ad-Hoc Commands"
 msgstr "Órdenes ad-hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:862
-#: ../libpurple/protocols/jabber/buddy.c:1022
 msgid "PubSub Service"
 msgstr "Servicio PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:864
-#: ../libpurple/protocols/jabber/buddy.c:1024
 msgid "SOCKS5 Bytestreams"
 msgstr "Flujos de bytes SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:866
-#: ../libpurple/protocols/jabber/buddy.c:1026
 msgid "Out of Band Data"
 msgstr "Datos fuera de banda"
 
-#: ../libpurple/protocols/jabber/buddy.c:868
-#: ../libpurple/protocols/jabber/buddy.c:1028
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:870
-#: ../libpurple/protocols/jabber/buddy.c:1030
 msgid "In-Band Registration"
 msgstr "Registro en línea"
 
-#: ../libpurple/protocols/jabber/buddy.c:872
-#: ../libpurple/protocols/jabber/buddy.c:1032
 msgid "User Location"
 msgstr "Ubicación del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:874
-#: ../libpurple/protocols/jabber/buddy.c:1034
 msgid "User Avatar"
 msgstr "Avatar del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/jabber/buddy.c:1036
 msgid "Chat State Notifications"
 msgstr "Notificaciones de estado de chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:878
-#: ../libpurple/protocols/jabber/buddy.c:1038
 msgid "Software Version"
 msgstr "Versión del programa"
 
-#: ../libpurple/protocols/jabber/buddy.c:880
-#: ../libpurple/protocols/jabber/buddy.c:1040
 msgid "Stream Initiation"
 msgstr "Origen del flujo"
 
-#: ../libpurple/protocols/jabber/buddy.c:882
-#: ../libpurple/protocols/jabber/buddy.c:1042
-#: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "Transferencia de archivo"
 
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:1044
 msgid "User Mood"
 msgstr "Estado de ánimo del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
-#: ../libpurple/protocols/jabber/buddy.c:1046
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:888
-#: ../libpurple/protocols/jabber/buddy.c:1048
 msgid "Entity Capabilities"
 msgstr "Capacidades de la entidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:890
-#: ../libpurple/protocols/jabber/buddy.c:1050
 msgid "Encrypted Session Negotiations"
 msgstr "Negociaciones de sesiones cifradas"
 
-#: ../libpurple/protocols/jabber/buddy.c:892
-#: ../libpurple/protocols/jabber/buddy.c:1052
 msgid "User Tune"
 msgstr "Música del usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:894
-#: ../libpurple/protocols/jabber/buddy.c:1054
 msgid "Roster Item Exchange"
 msgstr "Intercambio de elementos de la lista"
 
-#: ../libpurple/protocols/jabber/buddy.c:896
-#: ../libpurple/protocols/jabber/buddy.c:1056
 msgid "Reachability Address"
 msgstr "Dirección alcanzable"
 
-#: ../libpurple/protocols/jabber/buddy.c:898
-#: ../libpurple/protocols/jabber/buddy.c:1058
 msgid "User Profile"
 msgstr "Perfil de usuario"
 
 # JFS: Jingle es un protocolo de transporte, no se traduce
-#: ../libpurple/protocols/jabber/buddy.c:900
-#: ../libpurple/protocols/jabber/buddy.c:1060
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:1062
 msgid "Jingle Audio"
 msgstr "Audio Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:904
-#: ../libpurple/protocols/jabber/buddy.c:1064
 msgid "User Nickname"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:906
-#: ../libpurple/protocols/jabber/buddy.c:1066
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:908
-#: ../libpurple/protocols/jabber/buddy.c:1068
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1070
 msgid "Jingle Raw UDP"
 msgstr "Jingle UDP en crudo"
 
-#: ../libpurple/protocols/jabber/buddy.c:912
-#: ../libpurple/protocols/jabber/buddy.c:1072
 msgid "Jingle Video"
 msgstr "Vídeo Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:914
-#: ../libpurple/protocols/jabber/buddy.c:1074
 msgid "Jingle DTMF"
 msgstr "DTMF Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:916
-#: ../libpurple/protocols/jabber/buddy.c:1076
 msgid "Message Receipts"
 msgstr "Recibos de mensajes"
 
-#: ../libpurple/protocols/jabber/buddy.c:918
-#: ../libpurple/protocols/jabber/buddy.c:1078
 msgid "Public Key Publishing"
 msgstr "Publicación de la clave pública"
 
-#: ../libpurple/protocols/jabber/buddy.c:920
-#: ../libpurple/protocols/jabber/buddy.c:1080
 msgid "User Chatting"
 msgstr "Chatear con usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:1082
 msgid "User Browsing"
 msgstr "Navegar usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:924
-#: ../libpurple/protocols/jabber/buddy.c:1084
 msgid "User Gaming"
 msgstr "Jugar con usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:926
-#: ../libpurple/protocols/jabber/buddy.c:1086
 msgid "User Viewing"
 msgstr "Ver usuarios"
 
-#: ../libpurple/protocols/jabber/buddy.c:928
-#: ../libpurple/protocols/jabber/buddy.c:1088
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:930
-#: ../libpurple/protocols/jabber/buddy.c:1090
 msgid "Stanza Encryption"
 msgstr "Cifrado de grupo"
 
-#: ../libpurple/protocols/jabber/buddy.c:932
-#: ../libpurple/protocols/jabber/buddy.c:1092
 msgid "Entity Time"
 msgstr "Tiempo de entidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:934
-#: ../libpurple/protocols/jabber/buddy.c:1094
 msgid "Delayed Delivery"
 msgstr "Envío con demora"
 
-#: ../libpurple/protocols/jabber/buddy.c:936
-#: ../libpurple/protocols/jabber/buddy.c:1096
 msgid "Collaborative Data Objects"
 msgstr "Objetods de datos colaborativos"
 
-#: ../libpurple/protocols/jabber/buddy.c:938
-#: ../libpurple/protocols/jabber/buddy.c:1098
 msgid "File Repository and Sharing"
 msgstr "Repositorio de archivos y compartición"
 
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:1100
 msgid "STUN Service Discovery for Jingle"
 msgstr "Servidor de descubrimiento STUN para Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:942
-#: ../libpurple/protocols/jabber/buddy.c:1102
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Negociación de sesión cifrada simplificada"
 
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/buddy.c:1104
 msgid "Hop Check"
 msgstr "Comprobación de saltos"
 
-#: ../libpurple/protocols/jabber/buddy.c:952
-#: ../libpurple/protocols/jabber/buddy.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2962
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libpurple/protocols/jabber/buddy.c:964
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1098
-msgid "Resource"
-msgstr "Recurso"
-
-#: ../libpurple/protocols/jabber/buddy.c:966
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1638
-#: ../libpurple/protocols/jabber/jabber.c:1652
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../libpurple/protocols/jabber/buddy.c:1275
-#: ../libpurple/protocols/silc/ops.c:1008
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Recurso"
+
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1308
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/oscar/oscar.c:3827
-#: ../libpurple/protocols/oscar/oscar.c:3840
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1044
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Dirección"
 
-#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1993
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1997
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:2005
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: ../libpurple/protocols/jabber/buddy.c:2012
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:2021
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../libpurple/protocols/jabber/buddy.c:2036
 msgid "Log In"
 msgstr "Conectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2040
 msgid "Log Out"
 msgstr "Desconectarse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2086
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../libpurple/protocols/jabber/buddy.c:2090
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2092
-#: ../libpurple/protocols/jabber/jabber.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5923
-#: ../libpurple/protocols/sametime/sametime.c:3349
+#, c-format
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2259
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2263
-#: ../libpurple/protocols/jabber/buddy.c:2452
-#: ../libpurple/protocols/oscar/oscar.c:3750
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid "The following are the results of your search"
 msgstr "Éstos son los resultados de su búsqueda"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2380
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5636,183 +4001,120 @@ msgstr ""
 "Encuentra un contacto al introducir los criterios de búsqueda en los campos "
 "proporcionados. Nota: puede hacer búsquedas con comodines (%) en cada campo."
 
-#: ../libpurple/protocols/jabber/buddy.c:2400
 msgid "Directory Query Failed"
 msgstr "Falló la consulta al directorio"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
 msgid "Could not query the directory server."
 msgstr "No se pudo consultar con el servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2435
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2442
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Rellene uno o más de los campos mostrados a continuación para buscar a un "
 "usuario XMPP cuyos datos coincidan."
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3753
-#: ../libpurple/protocols/oscar/oscar.c:3762
 msgid "Email Address"
 msgstr "Dirección de correo electrónico"
 
-#: ../libpurple/protocols/jabber/buddy.c:2471
-#: ../libpurple/protocols/jabber/buddy.c:2472
 msgid "Search for XMPP users"
 msgstr "Buscar un usuario XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2473
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:177
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5667
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2488
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:2506
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2509
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5403
-#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "S_ervidor:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Manipulador:"
 
-#: ../libpurple/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s no es un nombre de sala válido"
 
-#: ../libpurple/protocols/jabber/chat.c:227
 msgid "Invalid Room Name"
 msgstr "Nombre de sala inválido"
 
-#: ../libpurple/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s no es un nombre de servidor válido"
 
-#: ../libpurple/protocols/jabber/chat.c:233
-#: ../libpurple/protocols/jabber/chat.c:234
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s no es un indicador de sala válido"
 
-#: ../libpurple/protocols/jabber/chat.c:239
-#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Room Handle"
 msgstr "Indicador de sala inválido"
 
-#: ../libpurple/protocols/jabber/chat.c:401
 msgid "Configuration error"
 msgstr "Error de configuración"
 
-#: ../libpurple/protocols/jabber/chat.c:410
-#: ../libpurple/protocols/jabber/chat.c:553
 msgid "Unable to configure"
 msgstr "No se pudo configurar"
 
-#: ../libpurple/protocols/jabber/chat.c:425
 msgid "Room Configuration Error"
 msgstr "Error de configuración de sala"
 
-#: ../libpurple/protocols/jabber/chat.c:426
 msgid "This room is not capable of being configured"
 msgstr "Esta sala no es capaz de ser configurada"
 
-#: ../libpurple/protocols/jabber/chat.c:475
-#: ../libpurple/protocols/jabber/chat.c:544
 msgid "Registration error"
 msgstr "Error de registro"
 
-#: ../libpurple/protocols/jabber/chat.c:632
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "El cambio de apodo no está soportado en salas de chat no-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:683
-#: ../libpurple/protocols/jabber/chat.c:694
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error al obtener la lista de salas"
 
-#: ../libpurple/protocols/jabber/chat.c:742
 msgid "Invalid Server"
 msgstr "Nombre de servidor no válido"
 
-#: ../libpurple/protocols/jabber/chat.c:786
 msgid "Enter a Conference Server"
 msgstr "Introducir un servidor de conferencias"
 
-#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Select a conference server to query"
 msgstr "Selecciona un servidor de conferencias al que consultar"
 
-#: ../libpurple/protocols/jabber/chat.c:790
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Necesita cifrado, pero no está disponible esa opción en este servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: ../libpurple/protocols/jabber/jabber.c:401
 msgid "Ping timeout"
 msgstr "Tiempo de expiración del ping"
 
-#: ../libpurple/protocols/jabber/jabber.c:451
-#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:528
-#: ../libpurple/protocols/oscar/flap_connection.c:403
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
-#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5821,556 +4123,379 @@ msgstr ""
 "No se pudo establecer una conexión con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:635
-#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registro a %s efectuado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:737
-#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registro de %s efectuado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:758
-#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "Éxito en el deregistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "Falló el deregistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:934
-#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1022
-#: ../libpurple/protocols/oscar/oscar.c:3829
-#: ../libpurple/protocols/oscar/oscar.c:3842
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1030
-#: ../libpurple/protocols/silc/ops.c:1049
-#: ../libpurple/protocols/silc/silc.c:988
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "Fecha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "Deregistrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Por favor, rellene la información abajo indicada para cambiar su registro de "
 "cuenta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "Registrando cuenta nueva de XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Cambiar la cuenta de registro en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registrar una cuenta nueva en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "Cambiar registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:1180
-#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "Error al deregistrar la cuenta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1186
-#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "La cuenta se ha deregistrado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "Inicializando SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1359
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1462
-#: ../libpurple/protocols/jabber/jabber.c:1920
-#: ../libpurple/protocols/jabber/jabber.c:1963
-#: ../libpurple/protocols/jabber/jabber.c:2001
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5717
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ninguno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "Subscripción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
-#: ../libpurple/protocols/jabber/jabber.c:1654
-#: ../libpurple/protocols/jabber/jabber.c:1668
-#: ../libpurple/protocols/jabber/usermood.c:181
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1225
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Estado de ánimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/msn/msn.c:656
 msgid "Now Listening"
 msgstr "Escuchando ahora"
 
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/jabber.c:1641
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/jabber/jabber.c:1669
 msgid "Mood Text"
 msgstr "Texto de estado de ánimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Allow Buzz"
 msgstr "Permitir codazos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "Artista de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "Título de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "Album de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "Género de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "Comentario de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "Pista de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "Tiempo de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "Año de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "URL de música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "Contraseña modificada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
-#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1784
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "Cambiar contraseña XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: ../libpurple/protocols/jabber/jabber.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:6504
-#: ../libpurple/protocols/silc/silc.c:1309
-#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Establecer su información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:6515
-#: ../libpurple/protocols/silc/silc.c:1305
-#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Cambiar su contraseña..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "Se fue"
 
-#: ../libpurple/protocols/jabber/jabber.c:1910
-#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "ID de XMPP malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "Violación de la política"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "Condición no definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "Codificación no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "Versión no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación desconocida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No se pudo afiliar al usuario %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2159
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "No se pudo establecer el rol \"%s\" para el usuario: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "No puede hacer un ping al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2261
-#: ../libpurple/protocols/jabber/jabber.c:2272
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "No se pudo dar el codazo porque no se sabe nada del usuario %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2267
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 "No se pudo dar el codazo porque puede que el usuario %s esté desconectado."
 
-#: ../libpurple/protocols/jabber/jabber.c:2298
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
@@ -6378,49 +4503,35 @@ msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2318
-#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "Buzz"
 msgstr "Codazo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "¡%s le ha dado un codazo!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Dando un codazo a %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."
 
-#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: ../libpurple/protocols/jabber/jabber.c:2380
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [razón]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6428,7 +4539,6 @@ msgstr ""
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
 "la afiliación de un usuario a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2392
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6436,31 +4546,25 @@ msgstr ""
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2398
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2404
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;sala&gt; [contraseña]:  Unirse a una sala en el servidor indicado."
+msgstr ""
+"join: &lt;sala&gt; [contraseña]:  Unirse a una sala en el servidor indicado."
 
-#: ../libpurple/protocols/jabber/jabber.c:2410
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [razón]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2415
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;nick&gt; &lt;mensaje&gt;:  Enviar un mensaje en privado a un usuario."
 
-#: ../libpurple/protocols/jabber/jabber.c:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 "ping &lt;jid&gt;:       Hacer un ping a un usuario, componente o servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2426
-#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
 
@@ -6474,96 +4578,70 @@ msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Complemento de protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Requiere SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo (puerto 5323)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3475
-#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Puerto de conexión"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3472
-#: ../libpurple/protocols/silc/silc.c:2139
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:811
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "Pasarelas de transferencia de archivos"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s ha abandonado la conversación."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema es: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Falló el envío de mensaje a %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Mensaje de error de XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
-msgid " (Code %s)"
-msgstr " (Código %s)"
+msgid "(Code %s)"
+msgstr "(Código %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:453
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../libpurple/protocols/jabber/presence.c:534
-#: ../libpurple/protocols/jabber/presence.c:535
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../libpurple/protocols/jabber/presence.c:536
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6571,90 +4649,68 @@ msgstr ""
 "Va a crear una sala nueva. ¿Desea configurarla o aceptar los valores por "
 "omisión?"
 
-#: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:543
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#: ../libpurple/protocols/jabber/presence.c:585
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error en el chat %s"
-
-#: ../libpurple/protocols/jabber/presence.c:589
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:1013
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error en el chat %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el archivo a %s, el usuario no soporta transferencias de "
 "archivos"
 
-#: ../libpurple/protocols/jabber/si.c:1014
-#: ../libpurple/protocols/jabber/si.c:1015
-#: ../libpurple/protocols/jabber/si.c:1084
 msgid "File Send Failed"
 msgstr "Fallo en el envío del archivo"
 
-#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "No se pudo enviar el archivo a %s, JID inválido"
 
-#: ../libpurple/protocols/jabber/si.c:1079
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "No se pudo enviar el archivo a %s, el usuario no está conectado"
 
-#: ../libpurple/protocols/jabber/si.c:1081
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "No se pudo enviar el archivo a %s, no está suscrito a la presencia del "
 "usuario"
 
-#: ../libpurple/protocols/jabber/si.c:1096
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Elija el recurso de %s al que quiera enviar un archivo"
 
-#: ../libpurple/protocols/jabber/si.c:1112
 msgid "Select a Resource"
 msgstr "Seleccione un recurso"
 
-#: ../libpurple/protocols/jabber/usermood.c:194
-#: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
 msgstr "Editar estados de ánimo del usuario"
 
-#: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
 msgstr "Escoja un estado de ánimo de la lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:198
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Configurar"
 
-#: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
 msgstr "Fijar estado de ánimo..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Establecer apodo de usuario"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Introduzca su nuevo apodo."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -6662,30 +4718,22 @@ msgstr ""
 "Escoja algo apropiado, la información será visible a todos los contactos en "
 "su lista de contactos."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Establecer apodo..."
 
-#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../libpurple/protocols/jabber/xdata.c:383
 msgid "Select an action"
 msgstr "Seleccione una acción"
 
-#: ../libpurple/protocols/msn/contact.c:782
 msgid "Unable to retrieve MSN Address Book"
 msgstr "No se pudo obtener el libro de direcciones de MSN"
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronización de la lista de amigos en %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6694,8 +4742,6 @@ msgstr ""
 "%s está en la lista local dentro del grupo «%s» pero no está en la lista del "
 "servidor. ¿Desea añadir a este amigo?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6704,340 +4750,265 @@ msgstr ""
 "%s está en la lista local pero no está en la lista del servidor. ¿Desea "
 "añadir a este amigo?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Error de sintaxis (probablemente un error del cliente)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr "Dirección de correo electrónico inválida"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "El usuario no existe"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Falta un nombre de dominio totalmente cualificado"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Ya está conectado"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
+#, c-format
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Nombre de amigo no válido"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Lista llena"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Ya está en lista"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "No está en la lista"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:760
+#, c-format
 msgid "User is offline"
 msgstr "El usuario no está conectado"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Ya está en ese modo"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Ya está en la lista contraria"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "El usuario no está en el grupo"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Nombre de grupo demasiado largo"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "No se puede eliminar el grupo cero"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Intentó añadir un contacto a un grupo que no existe"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Falló el servidor Switchboard"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Falló la notificación de la transferencia"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Faltan campos obligatorios"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados de un FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:121
+#, c-format
 msgid "Not logged in"
 msgstr "No ha iniciado sesión"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servicio no disponible temporalmente"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Error del servidor de base de datos"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Orden deshabilitada"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Error de operación de archivos"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Error al asignar memoria"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL erróneo enviado al servidor"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Servidor no disponible"
 
 # «Peer» no tiene una traducción fácil, he elegido 'pares' (de par, o igual)
 # Acepto otras alternativas (pero no dejarlo igual) jfs.
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Servidor de notificación de pares caído"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Error de conexión con la base de datos"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "El servidor está apagándose (Sálvese quien pueda)"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Error al crear la conexión"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Los parámetros CVR no se conocen o no están permitidos"
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "No se pudo escribir"
 
 # En verdad traduje el error como figura en
 # "http://www.hypothetic.org/docs/msn/basics.php" -NL.
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Sobrecarga de sesión"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "El usuario está demasiado activo"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Demasiadas sesiones"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Pasaporte no verificado"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Fichero de amigos incorrecto"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "No se esperaba"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Los nombres de amigos cambian demasiado rápido"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1422
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
+#, c-format
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "No puede mandar mensajes fuera de línea"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "No se aceptan usuarios nuevos"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sin consentimiento paterno"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Cuenta Passport no verificada aún"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Ticket erróneo"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Código de error desconocido %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Codazo"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "¡Le ha dado un codazo %s!"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Dando un codazo a %s..."
 
-#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
+msgid "Email Address..."
+msgstr "Dirección de correo electrónico..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
 
-#: ../libpurple/protocols/msn/msn.c:297 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Éste es el nombre bajo el que otros amigos MSN le verán."
 
-#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Establezca el número de teléfono de su domicilio."
 
-#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Establezca el número de teléfono de su trabajo."
 
-#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Establezca su número de teléfono móvil."
 
-#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "¿Permitir los envíos de MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:365 ../libpurple/protocols/msnp9/msn.c:348
 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?"
@@ -7045,69 +5016,53 @@ msgstr ""
 "¿Quiere permitir o rechazar el envío de mensajes a través de MSN Mobile a su "
 "teléfono móvil (u otro dispositivo móvil) de la gente en su lista de amigos?"
 
-#: ../libpurple/protocols/msn/msn.c:371 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Rechazar"
 
-#: ../libpurple/protocols/msn/msn.c:388 ../libpurple/protocols/msnp9/msn.c:371
-msgid "This Hotmail account may not be active."
-msgstr "Puede que esta cuenta de Hotmail no esté activa."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Texto bloqueado para %s"
+
+msgid "No text is blocked for this account."
+msgstr "No hay texto bloqueado para esta cuenta."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"Los servidores MSN bloquean actualmente las siguientes expresiones regulares:"
+"<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Esta cuenta no tiene correo activado."
 
-#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Enviar un mensaje a un móvil."
 
-#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "Número de teléfono de casa"
 
-#: ../libpurple/protocols/msn/msn.c:683 ../libpurple/protocols/msnp9/msn.c:571
 msgid "Work Phone Number"
 msgstr "Número de teléfono del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msnp9/msn.c:575
 msgid "Mobile Phone Number"
 msgstr "Número de teléfono móvil"
 
-#: ../libpurple/protocols/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:594
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:598
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../libpurple/protocols/yahoo/yahoo.c:3842
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3148
-#: ../libpurple/protocols/yahoo/yahoo.c:3848
 msgid "Out to Lunch"
 msgstr "Salí a comer"
 
@@ -7117,341 +5072,191 @@ msgstr "Salí a comer"
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:745
-#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Artista"
 
-#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Establecer su nombre de amigo..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Establecer el número de teléfono de su domicilio..."
 
-#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Establecer el número de teléfono de su trabajo..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer su número de teléfono móvil..."
 
-#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Permitir/Rechazar dispositivos móviles..."
 
-#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rechazar páginas Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
+msgid "View Blocked Text..."
+msgstr "Mostrar mensaje bloqueado..."
+
 msgid "Open Hotmail Inbox"
 msgstr "Abrir bandeja de entrada de Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"
 
-#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
-#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
 
-#: ../libpurple/protocols/msn/msn.c:871 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
-#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
-#: ../libpurple/protocols/msnp9/msn.c:1526
-#: ../libpurple/protocols/msnp9/msn.c:1869
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1751
-#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msnp9/msn.c:1599
-#: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
 msgid "Age"
 msgstr "Edad"
 
-#: ../libpurple/protocols/msn/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1601
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../libpurple/protocols/msn/msn.c:1761
-#: ../libpurple/protocols/msnp9/msn.c:1602
-#: ../libpurple/protocols/myspace/user.c:133
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
-#: ../libpurple/protocols/zephyr/zephyr.c:802
-#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
-#: ../libpurple/protocols/msnp9/msn.c:1607
-#: ../libpurple/protocols/msnp9/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1812
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
-#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
-#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msnp9/msn.c:1613
-#: ../libpurple/protocols/msnp9/msn.c:1733
-#: ../libpurple/protocols/msnp9/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1754
-#: ../libpurple/protocols/msnp9/msn.c:1761
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1791
-#: ../libpurple/protocols/msnp9/msn.c:1632
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1792
-#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "Aficiones"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "Ciudad donde vive"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "Lugares donde he vivido"
 
-#: ../libpurple/protocols/msn/msn.c:1796
-#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msn/msn.c:1986
-#: ../libpurple/protocols/msnp9/msn.c:1640
-#: ../libpurple/protocols/msnp9/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Contact Info"
 msgstr "Información del contacto"
 
-#: ../libpurple/protocols/msn/msn.c:1817
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1820
-#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "Otra persona importante"
 
-#: ../libpurple/protocols/msn/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "Teléfono de casa (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1664
-#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "Móvil personal"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "Fax personal"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal Email"
 msgstr "Correo-e personal"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "Trabajo"
 
 # Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
-#: ../libpurple/protocols/msn/msn.c:1847
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/silc/ops.c:1024
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1848
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Company"
 msgstr "Compañía"
 
-#: ../libpurple/protocols/msn/msn.c:1849
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1850
-#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../libpurple/protocols/msn/msn.c:1851
-#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "Teléfono del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1852
-#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "Teléfono del trabajo (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1853
-#: ../libpurple/protocols/msnp9/msn.c:1694
-#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Work Address"
 msgstr "Dirección del trabajo"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../libpurple/protocols/msn/msn.c:1854
-#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "Móvil del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1855
-#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "Buscapersonas del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1856
-#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "Fax del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1857
-#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Email"
 msgstr "Correo-e del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "MI del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1859
-#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: ../libpurple/protocols/msn/msn.c:1994
-#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "Actualizado por última vez"
 
-#: ../libpurple/protocols/msn/msn.c:2005
-#: ../libpurple/protocols/msnp9/msn.c:1846
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1040
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../libpurple/protocols/msn/msn.c:2029
-#: ../libpurple/protocols/msnp9/msn.c:1870
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:2030
-#: ../libpurple/protocols/msnp9/msn.c:1871
 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 "
@@ -7461,8 +5266,6 @@ msgstr ""
 "que o bien el usuario no existe o que el usuario existe pero no ha creado un "
 "perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:2034
-#: ../libpurple/protocols/msnp9/msn.c:1875
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7470,9 +5273,6 @@ msgstr ""
 "No se pudo encontrar información en el perfil de usuario. Es probable que el "
 "usuario no exista."
 
-#: ../libpurple/protocols/msn/msn.c:2042
-#: ../libpurple/protocols/msnp9/msn.c:1883
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "URL del perfil"
 
@@ -7486,130 +5286,81 @@ msgstr "URL del perfil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2366
-#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2371
-#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "Servidor de método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2376
-#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#: ../libpurple/protocols/msn/msn.c:2384
-#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atención"
 
-#: ../libpurple/protocols/msn/nexus.c:71
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Autenticación Windows Live ID: No fue posible conectarse"
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:124
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Autenticación Windows Live ID: no se encontró el token de autenticación en "
-"la respuesta del servidor"
-
-#: ../libpurple/protocols/msn/nexus.c:171
-msgid "Windows Live ID authentication Failed"
-msgstr "¡Falló la autenticación Windows Live!"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Autenticación Windows Live ID: Respuestas inválida"
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s no es un nombre de grupo válido."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:935
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:513
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "¡%s le acaba de dar un codazo!"
 
-#: ../libpurple/protocols/msn/notification.c:840
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Error desconocido (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:841
-#: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "No puede añadir al usuario"
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "No se pudo añadir al usuario a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "No puede expulsar al usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:909
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "No se pudo invitar al usuario a %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:917
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "No se pudo añadir a %s porque su lista de amigos está llena."
 
-#: ../libpurple/protocols/msn/notification.c:926
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s no es un nombre de cuenta «passport» válida."
 
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Servicio no disponible temporalmente."
 
-#: ../libpurple/protocols/msn/notification.c:1336
-#: ../libpurple/protocols/msnp9/notification.c:898
+msgid "Mobile message was not sent because it was too long."
+msgstr "No se pudo enviar el mensaje al móvil porque es demasiado largo."
+
 msgid "Unable to rename group"
 msgstr "No se pudo cambiar el nombre del grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1391
-#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "No se pudo borrar el grupo"
 
-#: ../libpurple/protocols/msn/notification.c:2008
-#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7640,40 +5391,34 @@ msgstr[1] ""
 "Después de que se hayan realizado las tareas de mantenimiento debería poder "
 "conectarse con éxito de nuevo."
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"No se pudo enviar el mensaje porque el sistema no está disponible. Esto "
+"sucede normalmente cuando el usuario está bloqueado o no existe."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+"No se pudo enviar el mensaje porque se están enviando demasiado rápido."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"No se pudo enviar el mensaje porque se produjo un error de codificación "
+"desconocida."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
+
 msgid "Unable to connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Error de escritura"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7682,125 +5427,77 @@ msgstr ""
 "Error de conexión del servidor %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "El servidor no soporta nuestro protocolo."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Error en el análisis HTTP."
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicación."
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."
 
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "No se pudo autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Negociación"
 
-#: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Empezando la autenticación"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Obteniendo una cookie"
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Al teléfono"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Salí a comer"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente no se pudo enviar el mensaje porque expiró la conexión:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "No se pudo enviar el mensaje, no está permitido mientras sea invisible:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:423
 msgid "Message could not be sent because the user is offline:"
 msgstr "No se pudo enviar el mensaje porque el usuario no está conectado:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:427
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error en la conexión:"
 
-#: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "No se pudo enviar el mensaje porque estamos enviando demasiado rápido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:435
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7809,26 +5506,18 @@ msgstr ""
 "servidor. Es posible que se trate de un error del servidor, vuelva a "
 "intentarlo en unos minutos."
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:442
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "No se pudo enviar el mensaje porque se produjo un error con el «switchboard»:"
 
-#: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:450
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "El usuario %s lo ha añadido a su lista de amigos."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "El usuario %s lo ha quitado de su lista de amigos."
@@ -7836,18 +5525,16 @@ msgstr "El usuario %s lo ha quitado de su lista de amigos."
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:713
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo añadir a \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:716
-#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The username specified is invalid."
 msgstr "El nombre de usuario especificado no es válido."
 
-#: ../libpurple/protocols/msnp9/msn.c:546
+msgid "This Hotmail account may not be active."
+msgstr "Puede que esta cuenta de Hotmail no esté activa."
+
 msgid "Has you"
 msgstr "Le tiene"
 
@@ -7861,20 +5548,15 @@ msgstr "Le tiene"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2170
-#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Falta un mecanismo de cifrado"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "No se puede encontrar el mecanismo de cifrado RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -7882,76 +5564,63 @@ msgstr ""
 "Actualice a una versión de libpurple con soporte de RC4 (>= 2.0.1). No se "
 "cargará el complemento de MySpaceIM."
 
-#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "Leyendo el desafío"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "Longitud de desafío inesperada recibida del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Accediendo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+"Se perdió la conexión con el servidor (no se recibió ningún dato en %d "
+"segundo)"
+msgstr[1] ""
 "Se perdió la conexión con el servidor (no se recibió ningún dato en %d "
 "segundos)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1374
 msgid "New mail messages"
 msgstr "Mensajes de correo nuevos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1375
 msgid "New blog comments"
 msgstr "Nuevos comentarios de bitácora"
 
-#: ../libpurple/protocols/myspace/myspace.c:1376
 msgid "New profile comments"
 msgstr "Nuevos comentarios de perfil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New friend requests!"
 msgstr "¡Nuevas solicitudes de amigos!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New picture comments"
 msgstr "Nuevos comentarios de fotos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1408
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1594
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - No se ha configurado un nombre de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:1595
 msgid "You appear to have no MySpace username."
 msgstr "Parece que no tiene un nombre de usuario MySpace."
 
-#: ../libpurple/protocols/myspace/myspace.c:1596
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "¿Desería configurar uno ahora? (Aviso: ¡NO PODRÁ CAMBIARLO!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1620
-#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/myspace/myspace.c:1855
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Error de prótocolo, código %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1877
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7964,191 +5633,146 @@ msgstr ""
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword» "
 "e inténtelo de nuevo."
 
-#: ../libpurple/protocols/myspace/myspace.c:1900
 msgid "MySpaceIM Error"
 msgstr "Error MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
-#: ../libpurple/protocols/myspace/myspace.c:2112
 msgid "Failed to add buddy"
 msgstr "No se pudo añadir al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
 msgid "'addbuddy' command failed."
 msgstr "Falló la orden 'addbudy'."
 
-#: ../libpurple/protocols/myspace/myspace.c:2112
-#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "persist command failed"
 msgstr "Falló la orden 'persist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2217
 #, c-format
 msgid "No such user: %s"
 msgstr "No existe el usuario: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2219
 msgid "User lookup"
 msgstr "Búsqueda de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2357
-#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "Failed to remove buddy"
 msgstr "No se pudo eliminar al amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
 msgid "'delbuddy' command failed"
 msgstr "Falló la orden 'delbuddy'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "blocklist command failed"
 msgstr "Falló la orden 'blocklist'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2493
 msgid "Invalid input condition"
 msgstr "Condición de entrada inválida"
 
-#: ../libpurple/protocols/myspace/myspace.c:2548
 msgid "Read buffer full (2)"
 msgstr "Cola de lectura llena (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2591
 msgid "Unparseable message"
 msgstr "No se pudo interpretar el mensaje"
 
-#: ../libpurple/protocols/myspace/myspace.c:2662
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "No se pudo conectar al servidor: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2840
 msgid "IM Friends"
 msgstr "Amigos MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2940
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
-"Se añadiero o actualizaron %d amigos del servidor (incluyendo a los amigos "
+msgstr[0] ""
+"Se añadió o actualizó %d amigo del servidor (incluyendo a los amigos que ya "
+"estaban en la lista del lado del servidor)"
+msgstr[1] ""
+"Se añadieron o actualizaron %d amigos del servidor (incluyendo a los amigos "
 "que ya estaban en la lista del lado del servidor)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2941
 msgid "Add contacts from server"
 msgstr "Añadir contactos del servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:2993
-#: ../libpurple/protocols/myspace/myspace.c:3057
 msgid "Add friends from MySpace.com"
 msgstr "Añadir amigos de MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2994
 msgid "Importing friends failed"
 msgstr "Falló la carga de los amigos"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Find people..."
 msgstr "Encontrar gente... "
 
-#: ../libpurple/protocols/myspace/myspace.c:3053
 msgid "Change IM name..."
 msgstr "Cambiar mi nombre MI..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3354
 msgid "myim URL handler"
 msgstr "gestor de URL myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3355
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 "No se encontró una cuenta de MySpaceIM que pueda utilizarse para abrir esta "
 "URL myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3356
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Activar la cuenta apropiada de MySpaceIM y volver a intentarlo."
 
-#: ../libpurple/protocols/myspace/myspace.c:3479
 msgid "Show display name in status text"
 msgstr "Mostrar el nombre visible en el texto de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3482
 msgid "Show headline in status text"
 msgstr "Mostrar titulares en los textos de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3487
 msgid "Send emoticons"
 msgstr "Enviar emoticonos"
 
-#: ../libpurple/protocols/myspace/myspace.c:3492
 msgid "Screen resolution (dots per inch)"
 msgstr "Resolución de pantalla (puntos por pulgada)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3495
 msgid "Base font size (points)"
 msgstr "Tamaño de tipografía base (puntos)"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:790
-#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Usuario"
 
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "Titular"
 
-#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Canción"
 
-#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Amigos en total"
 
-#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Versión del cliente"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:570
 msgid "No username set"
 msgstr "No se ha configurado un nombre de usuario"
 
-#: ../libpurple/protocols/myspace/user.c:577
-#: ../libpurple/protocols/myspace/user.c:671
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Introduzca un nombre de usuario"
 
-#: ../libpurple/protocols/myspace/user.c:578
 msgid "Please enter a username to check its availability:"
 msgstr "Defina un nombre de usuario para comprobar si está disponible:"
 
-#: ../libpurple/protocols/myspace/user.c:658
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nombre de usuario disponible"
 
-#: ../libpurple/protocols/myspace/user.c:659
 msgid "This username is available. Would you like to set it?"
 msgstr "Este nombre de usuario está disponible, ¿quiere utilizarlo?"
 
-#: ../libpurple/protocols/myspace/user.c:660
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "¡NO PODRÁ MODIFICARLO UNA VEZ FIJADO!"
 
-#: ../libpurple/protocols/myspace/user.c:672
 msgid "This username is unavailable."
 msgstr "Este nombre de usuario no está disponible."
 
-#: ../libpurple/protocols/myspace/user.c:673
 msgid "Please try another username:"
 msgstr "Introduzca otro nombre de usuario:"
 
@@ -8158,32 +5782,25 @@ msgstr "Introduzca otro nombre de usuario:"
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:48
-#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Zapear"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "¡%s le ha zapeado!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Zapeando a %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Golpear"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "¡%s le ha golpeado!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Golpeando a %s..."
@@ -8191,76 +5808,61 @@ msgstr "Golpeando a %s..."
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Encender"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "¡%s le ha encendido!"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Encendiendo a %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Besar"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "¡%s le ha besado!"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Besando a %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Abrazar"
 
-#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "¡%s le ha abrazado!"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Abrazando a %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Abofetear"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "¡%s le ha abofeteado!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Abofeteando a %s..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Pellizcar el trasero"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "¡%s le ha pellizcado el trasero!"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Pellizcando el trasero de %s..."
@@ -8268,16 +5870,13 @@ msgstr "Pellizcando el trasero de %s..."
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "Chocar los cinco"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "¡%s le ha chocado los cinco!"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Chocando los cinco con %s..."
@@ -8285,16 +5884,13 @@ msgstr "Chocando los cinco con %s..."
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Tomar el pelo"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "¡%s le ha tomado el pelo!"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Tomando el pelo a %s..."
@@ -8306,101 +5902,77 @@ msgstr "Tomando el pelo a %s..."
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Pedorreta"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "¡%s le ha hecho una pedorreta!"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Haciendo una pedorreta a %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "No se han recibido los parámetros requeridos"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "No se pudo escribir en la red"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "No se pudo leer de la red"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Error comunicándose con el servidor"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Conferencia no encontrada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "La conferencia no existe"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "No soportado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "La contraseña ha expirado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "La cuenta ha sido deshabilitada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "El servidor no pudo acceder al directorio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Esta opción ha sido deshabilitada por su administrado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "El servidor no está disponible, inténtelo de nuevo más tarde"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "No se puede añadir un contacto a la misma carpeta dos veces"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "No se puede añadir uno mismo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "El archivo maestro no está bien configurado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the username you entered"
 msgstr "No se reconoció el servidor del nombre de usuario que introdujo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -8408,31 +5980,24 @@ msgstr ""
 "Su cuenta ha sido deshabilitada porque se han introducido demasiadas "
 "contraseña inválidas"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "No puede añadir la misma persona dos veces a una conversación"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Alcanzó el límite del número de contactos permitidos"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect username"
 msgstr "El nombre de usuario que ha introducido no es válido"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Se produjo un error al actualizar el directorio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Versión de protocolo incompatible"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "El usuario le ha bloqueado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8440,56 +6005,45 @@ msgstr ""
 "Esta versión de evaluación no permite la conexión simultánea de más de diez "
 "usuarios"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "El usuario no está conectado o vd. está siendo bloqueado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Fallo en la conexión (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "No se pudo enviar el mensaje. No se pudieron obtener los detalles del "
 "usuario (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Incapaz de añadir «%s» a su lista de amigos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "No se pudo enviar el mensaje (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "No se pudo invitar al usuario (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "No se pudo enviar un mensaje a %s. No se pudo crear la conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "No se pudo enviar el mensaje. No se pudo crear la conferencia (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8498,7 +6052,6 @@ msgstr ""
 "No se pudo mover al usuario %s a la carpeta %s en la lista del servidor. Se "
 "produjo un error al crear la carpeta (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8507,62 +6060,46 @@ msgstr ""
 "No se pudo añadir en su lista de amigos a %s. Se produjo un error al crear "
 "la carpeta en la lista del servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "No se pudieron obtener los detalles del usuario %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "No se pudo añadir al usuario a su lista de privacidad (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "No se pudo añadir «%s» a su lista de rechazados (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "No se pudo añadir «%s» a su lista de permitidos (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "No se pudo eliminar «%s» de su lista de privacidad (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "No se pudieron cambiar las opciones de privacidad del servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "No se pudo crear la conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Error comunicándose con el servidor. Se cerrará la conexión."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Título"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Buzón de correo"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4178
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -8572,37 +6109,29 @@ msgstr "ID de usuario"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Se ha invitado a %s a esta conversación."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Invitación a una conversación"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8613,16 +6142,13 @@ msgstr ""
 "\n"
 "Enviada: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "¿Desea unirse a la conversación?"
 
-#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
 
-#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8630,7 +6156,6 @@ msgstr ""
 "No parece que %s esté conectado y no ha recibido el mensaje que acaba de "
 "enviar."
 
-#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8638,11 +6163,10 @@ msgstr ""
 "No se pudo contactar con el servidor. Por favor, indique la dirección del "
 "servidor con el que desea conectarse."
 
-#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Error. El soporte de SSL no está instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2522
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 
@@ -8656,41 +6180,24 @@ msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3536
-#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensajería de Grupos de Novell"
 
-#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:62
 msgid "Could not join chat room"
 msgstr "No se pudo conectar a la sala de chat"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Invalid chat room name"
 msgstr "Nombre de sala de chat inválida"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2505
-#: ../libpurple/protocols/yahoo/yahoo.c:2673
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
-#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
-#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
 msgid "Server closed the connection."
 msgstr "El servidor ha cerrado la conexión."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
-#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
-#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8699,10 +6206,6 @@ msgstr ""
 "Se perdió la conexión con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:401
-#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
-#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
-#: ../libpurple/proxy.c:1554
 msgid "Received invalid data on connection with server."
 msgstr "Se recibieron datos inválidos al conectarse al servidor."
 
@@ -8716,8 +6219,6 @@ msgstr "Se recibieron datos inválidos al conectarse al servidor."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Complemento de protocolo AIM"
 
@@ -8731,43 +6232,31 @@ msgstr "Complemento de protocolo AIM"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Complemento de protocolo ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4456
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Codificación"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "El usuario remoto ha cerrado la conexión."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "El usuario remoto ha rechazado su solicitud."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Se perdió la conexión con el usuario remoto:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Se recibieron datos inválidos en la conexión con el usuario remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "No se pudo establecer una conexión con el usuario remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "MI directo establecido"
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
@@ -8777,108 +6266,82 @@ msgstr ""
 "s a través de conexión MI directa. Inténtelo de nuevo utilizando la función "
 "de transferencia de archivos.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fichero %s es %s, que es más grande que el tamaño máximo de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Error inválido"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Tasa de mensajes al servidor"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Tasa de mensajes al cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Servicio no definido"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "No soportado por el servidor"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "No soportado por el cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Rechazado por el cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Respuesta demasiado grande"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "Respuestas perdidas"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "Solicitud denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Derechos insuficientes"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "En la lista local de autorizar/negar"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (sender)"
-msgstr "Demasiado malvado (remitente)"
+msgid "Warning level too high (sender)"
+msgstr "Nivel de aviso demasiado alto (emisor)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
-msgid "Too evil (receiver)"
-msgstr "Demasiado malvado (destinatario)"
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de aviso demasiado alto (receptor)"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "Usuario temporalmente no disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "No hubo coincidencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "Desbordamiento de la lista"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Solicitud ambigua"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Cola llena"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:349
 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 "
@@ -8890,7 +6353,6 @@ msgstr ""
 "Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
 "ICQ si sabe que codificación está utilizando.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8901,135 +6363,101 @@ msgstr ""
 "defectuosa.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2446
-#: ../pidgin/gtkutils.c:2476
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
-#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "Juegos"
 
-#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"
 
-#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5895
+msgid "Screen Sharing"
+msgstr "Compartiendo pantalla"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#, c-format
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5916
+#, c-format
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:736
+#, c-format
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1089
+#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3746
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1210
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:846
-#: ../libpurple/protocols/oscar/oscar.c:2947
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -9038,7 +6466,6 @@ msgstr ""
 "No se pudo conectar al servidor de autenticación:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -9047,20 +6474,16 @@ msgstr ""
 "No se pudo conectar al servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1044
 msgid "Username sent"
 msgstr "Nombre de usuario enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:1306
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the username is invalid.  "
@@ -9073,33 +6496,23 @@ msgstr ""
 "espacios, o contener sólo números."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1392
-#: ../libpurple/protocols/yahoo/yahoo.c:2127
 msgid "Invalid username."
 msgstr "Nombre de usuario no válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1398
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1410
-#: ../libpurple/protocols/oscar/oscar.c:1419
 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."
@@ -9108,46 +6521,33 @@ msgstr ""
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "Se recibió la autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es válida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1493
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2337
-#: ../libpurple/protocols/oscar/oscar.c:6000
-#: ../libpurple/protocols/oscar/oscar.c:6282 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9156,54 +6556,38 @@ msgstr ""
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "No se pudo obtener un «hash» de conexión a AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1578
-#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "No se pudo un «hash» de conexión válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1710
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:2258
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2288
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2328
-#: ../libpurple/protocols/oscar/oscar.c:2336
-#: ../libpurple/protocols/oscar/oscar.c:2463
-#: ../libpurple/protocols/oscar/oscar.c:5372
-#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
-#: ../libpurple/protocols/oscar/oscar.c:2335
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2463
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9214,18 +6598,15 @@ msgstr ""
 "la siguiente razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2464
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2471
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petición de añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2479
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9238,7 +6619,6 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9251,7 +6631,6 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9264,38 +6643,31 @@ msgstr ""
 "El mensaje es:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2516
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2522
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "¿Desea añadir este amigo a su lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2527 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2528
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2652
 #, 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] "Usted perdió %hu mensaje de %s porque no era válido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran válidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2661
 #, 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] "Se perdió %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2670
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9305,21 +6677,27 @@ msgstr[0] "Se perdió %hu mensaje de %s porque fue mandado demasiado rápido."
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2679
 #, 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] "Se perdió %hu mensaje de %s porque el/ella es muy malvado/a."
-msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Se perdió %hu mensaje de %s porque el nivel de aviso de él o ella es "
+"demasiado elevado."
+msgstr[1] ""
+"Se perdieron %hu mensajes de %s porque su nivel de aviso de él o ella es "
+"demasiado elevado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2688
 #, 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] "Se perdió %hu mensaje de %s porque usted es muy malvado/a."
-msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Se perdió %hu mensaje de %s porque su nivel de aviso es muy elevado."
+msgstr[1] ""
+"Se perdieron %hu mensajes de %s porque su nivel de aviso es muy elevado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2697
 #, 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."
@@ -9327,47 +6705,31 @@ msgstr[0] "Se perdió %hu mensaje de %s por motivos desconocidos."
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2852
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Unknown reason."
 msgstr "Razón desconocida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
-#: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2921
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario de no disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2992
-msgid "Available Message"
-msgstr "Mensajes disponibles"
-
-#: ../libpurple/protocols/oscar/oscar.c:3096
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3284
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9375,7 +6737,6 @@ msgstr ""
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3448
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9384,74 +6745,56 @@ msgstr ""
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3533
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3768
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
-#: ../libpurple/protocols/oscar/oscar.c:3843
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
+msgid "Work Information"
+msgstr "Información de trabajo"
+
 msgid "Division"
 msgstr "Sección"
 
-#: ../libpurple/protocols/oscar/oscar.c:3855
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3857
 msgid "Web Page"
 msgstr "Página web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3860
-msgid "Work Information"
-msgstr "Información de trabajo"
-
-#: ../libpurple/protocols/oscar/oscar.c:3916
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "El siguiente nombre de usuario está asociado a %s"
 msgstr[1] "Los nombres de usuarios siguientes están asociados a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
@@ -9460,14 +6803,12 @@ msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque no es "
 "válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
@@ -9476,7 +6817,6 @@ msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -9485,7 +6825,6 @@ msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -9494,7 +6833,6 @@ msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada ya tiene demasiados nombres de usuarios asociados."
 
-#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -9503,36 +6841,29 @@ msgstr ""
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada es inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4057
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la información de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "La dirección de correo electrónico para %s es %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4065
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
 "imágenes IM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4523
 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 "
@@ -9542,7 +6873,6 @@ msgstr ""
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4537
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9555,11 +6885,9 @@ msgstr[0] ""
 msgstr[1] ""
 "Se ha excedido el tamaño máximo de perfil de %d bytes. Se ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4542
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4586
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9574,11 +6902,9 @@ msgstr[1] ""
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia. Se "
 "ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4591
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../libpurple/protocols/oscar/oscar.c:4664
 #, c-format
 msgid ""
 "Could not add the buddy %s because the username is invalid.  Usernames must "
@@ -9589,17 +6915,12 @@ msgstr ""
 "nombres de usuario deben ser direcciones de correo válidas o empezar con una "
 "letra y contener sólo letras, números y espacios, o contener sólo números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4666
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5156
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4785
 msgid "Unable To Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4786
 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 minutes."
@@ -9608,15 +6929,9 @@ msgstr ""
 "perdido la lista de amigos, seguramente volverá a estar disponible en unos "
 "minutos."
 
-#: ../libpurple/protocols/oscar/oscar.c:4982
-#: ../libpurple/protocols/oscar/oscar.c:4984
-#: ../libpurple/protocols/oscar/oscar.c:5223
-#: ../libpurple/protocols/oscar/oscar.c:5224
-#: ../libpurple/protocols/oscar/oscar.c:5229
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9625,40 +6940,34 @@ msgstr ""
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
-#: ../libpurple/protocols/oscar/oscar.c:5154
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "No se pudo añadir al amigo %s por motivos desconocidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5287
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
-msgstr "El usuario %s le ha dado a usted permiso para añadirle a su lista de amigos. ¿Desea añadirle?"
+msgstr ""
+"El usuario %s le ha dado a usted permiso para añadirle a su lista de amigos. "
+"¿Desea añadirle?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5295
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5368
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5369
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5372
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9669,48 +6978,30 @@ msgstr ""
 "la siguiente razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5373
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "Away Message"
-msgstr "Mensajes de ausencia"
-
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(obteniendo)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5889
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5997
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6045
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:6049
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9718,67 +7009,51 @@ msgstr ""
 "Puede considerarse como un riesgo a su privacidad  ya que hacer ésto revela "
 "su dirección IP. ¿Quiere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6055
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onectar"
 
 # TBD - comprobar si esto afecta al botón en pantalla
-#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:6096
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:6117
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid "Require authorization"
 msgstr "Solicitar autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6201
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidad web (¡si activa esto hará que recibe SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6206
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6226
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6227
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6280
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6326
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6330
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9786,66 +7061,51 @@ msgstr ""
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Find Buddy by Email"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6348
 msgid "Search for a buddy by email address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6352
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6510
 msgid "Set User Info (web)..."
 msgstr "Establecer su información de usuario (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Change Password (web)"
 msgstr "Cambiar su contraseña (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6525
 msgid "Configure IM Forwarding (web)"
 msgstr "Configurar reenvío de MI (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6535
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6542
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6546
 msgid "Display Currently Registered Email Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Change Currently Registered Email Address..."
 msgstr "Cambiar la dirección de correo registrada actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6557
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6563
 msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un amigo por correo electrónico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6568
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#: ../libpurple/protocols/oscar/oscar.c:6756
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9855,27 +7115,26 @@ msgstr ""
 "para transferencias de ficheros y conexiones MI\n"
 "(lento, pero no descubre su dirección IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
+msgid "Allow multiple simultaneous logins"
+msgstr "Permitir múltiples conexiones simultáneas"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Solicitando a %s que se conecte con nosotros en %s:%hu para MI directo."
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Intentando conectarse a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Intentando la conexión a través de un servidor proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s pide conectarse directamente a %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1039
 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 "
@@ -9885,168 +7144,126 @@ msgstr ""
 "para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
 "esto como un riesgo a su privacidad."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Información principal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Introducción personal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Número QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "País/Región"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provincia/Estado"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Símbolo del horóscopo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Signo zodiacal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Grupo sanguíneo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Universidad"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Número de móvil"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Acuario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Piscis"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Aries"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Tauro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Géminis"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Cáncer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Leo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Virgo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Libra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Escorpio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Sagitario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Capricornio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Rata"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Buey"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigre"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Conejo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Dragón"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Serpiente"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Caballo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Cabra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Mono"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Gallo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Perro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Cerdo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Otro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Modificar mi información"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Actualizar mi información"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Se ha modificado su información."
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -10054,219 +7271,154 @@ msgid ""
 msgstr ""
 "No se puede fijar una cara a medida. Por favor, escoja una imagen de %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Cara QQ inválida"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Ha rechazado la solicitud de %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Introduzca sus motivos:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Rechazar solicitud"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Lo siento, no eres mi tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Fallo al añadir un amigo con solicitud de autenticación"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Ha eliminado un amigo con éxito"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Se ha borrado con éxito de la lista de amigos de su amigo"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "El usuario %d necesita autenticación"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Introduzca su solicitud a continuación"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "¿Quieres ser mi amigo?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "Ha añadido %d a su lista de amigos"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Error QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid inválido"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID de grupo:"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Creador"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Descripción del grupo"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Autorizar"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Indique su ID de grupo externo"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Sólo puede buscar grupos QQ permanentes\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "El usuario %d solicitó entrar en el grupo %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Razón: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:281
-#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "Opciones QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprobar"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
 "Su solicitud de unirse al grupo %d ha sido rechazada por el administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
 "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Vd. [%d] ha salido del grupo «%d»"
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Se ha añadido este grupo a su lista de amigos."
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "No soy miembro"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Soy miembro"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "He solicitado unirme"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Soy el administrador"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Estado desconocido"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Este grupo no permite que otros se unan"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Ha salido con éxito del grupo"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autenticación grupo QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "El servidor QQ ha aceptado su operación de autorización"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr ""
 "Ha introducido un identificador de grupo que está fuera del rango permitido"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "¿Está seguro que quiere dejar este Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -10274,160 +7426,122 @@ msgstr ""
 "Tenga en cuenta que si vd. lo ha creado\n"
 "esta operación eliminará este Qun eventualmente."
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Código [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr "Error de operación de grupo"
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:99
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "¿Desea aprobar esta solicitud?"
 
-#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Introduzca sus motivos:"
 
-#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Ha modificado el miembro Qun con éxito"
 
-#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Ha modificado la información Qun con éxito"
 
-#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Ha creado un Qun con éxito"
 
-#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "¿Desea establecer los detalles de Qun ahora?"
 
-#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Configurar"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Mensaje del sistema"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "No se pudo enviar MI."
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-msgid "Keep alive error"
-msgstr "Error de comprobación de conexión"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Desconocido-%d"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
-msgstr "Error al solicitar un testigo de conexión"
+msgid "Level"
+msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/login_logout.c:490
-msgid "Unable to login. Check debug log."
-msgstr "No pudo conectarse, compruebe el registro de depuración."
+msgid "Member"
+msgstr "Miembro"
 
-#: ../libpurple/protocols/qq/login_logout.c:493
-msgid "Unable to login"
-msgstr "No pudo conectarse"
+msgid " VIP"
+msgstr " VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "No se pudo conectar."
+msgid " TCP"
+msgstr " TCP"
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
-msgstr "Desconocido-%d"
+msgid " FromMobile"
+msgstr " DeMóvil"
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "Dirección TCP"
+msgid " BindMobile"
+msgstr " BindMóvil"
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "Dirección UDP"
+msgid " Video"
+msgstr " Vídeo"
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
-msgstr "Nivel"
+msgid " Space"
+msgstr " Space"
+
+msgid "Flag"
+msgstr "Marca"
+
+msgid "Ver"
+msgstr "Ver"
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Nombre inválido"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Conectados actualmente</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Última actualización</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Servidor</b>: %s: %d<br>\n"
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modo de conexión</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP del servidor</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Nombre real</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<B>Mi IP pública</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de conexión</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Última IP de conexión</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Último hora de conexión</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Información de conexión"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Fijar mi información"
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Mostrar la información de conexión"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Salir de este Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Bloquear a este amigo"
 
@@ -10441,225 +7555,252 @@ msgstr "Bloquear a este amigo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Complemento de protocolo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Conectando utilizando TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr "intervalo/s de reenvío"
+
+msgid "Keep alive interval(s)"
+msgstr "Intervalo/s de comprobación de conexión"
+
+msgid "Update interval(s)"
+msgstr "Intervalo/s de actualización"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Longitud de token no válida, %d"
+
+msgid "Keep alive error"
+msgstr "Error de comprobación de conexión"
+
+msgid "Failed to connect server"
+msgstr "Fallo al conectar con el servidor."
+
 msgid "Socket error"
 msgstr "Error de socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Se perdió la conexión con el servidor:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "No se pudo leer del socket"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr "Error de escritura"
+
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
+msgid "Couldn't resolve host"
+msgstr "No se pudo resolver el nombre"
+
+msgid "hostname is NULL or port is 0"
+msgstr "el nombre de equipo es NULL o el puerto es 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Conectando al servidor %s, %d reintentos"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "No se pudo conectar."
+
+msgid "Could not resolve hostname"
+msgstr "No se pudo resolver el nombre de sistema"
+
+msgid "Unable to login. Check debug log."
+msgstr "No pudo conectarse, compruebe el registro de depuración."
+
+msgid "Unable to login"
+msgstr "No pudo conectarse"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Fallo en la conexión, no ha habido respuesta"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Código de respuesta token inválido, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d ha rechazado el archivo %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Archivo enviado"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d canceló la transferencia de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Conexión perdida"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Fallo en la conexión, no ha habido respuesta"
-
-#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "¿Desea añadir este amigo?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Ha sido añadido por %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "¿Desea añadirle?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "El usuario %s lo ha añadido [%s] a su lista de amigos."
 
-#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "El usuario %s rechazó su solicitud"
 
-#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "El usuario %s ha aprobado su solicitud"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s quiere añadirle [%s] como amigo"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s no está en su lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:420
+#, c-format
+msgid "Notice from: %s"
+msgstr "Nota de: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Conexión cerrada (escribiendo)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título de grupo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Identificador de grupo «Notes»:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 #, c-format
 msgid "Info for Group %s"
 msgstr "Información sobre el grupo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1299
 msgid "Notes Address Book Information"
 msgstr "Información de la libreta de direcciones «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1331
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo a la conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1341
 msgid "Get Notes Address Book Info"
 msgstr "Obtener la información de la libreta de direcciones «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1508
 msgid "Sending Handshake"
 msgstr "Enviando negociación"
 
-#: ../libpurple/protocols/sametime/sametime.c:1513
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a la aceptación del saludo inicial"
 
-#: ../libpurple/protocols/sametime/sametime.c:1518
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Se aceptó el saludo inicial. Enviando la identificación"
 
-#: ../libpurple/protocols/sametime/sametime.c:1523
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a la aceptación de la identificación"
 
-#: ../libpurple/protocols/sametime/sametime.c:1528
 msgid "Login Redirected"
 msgstr "Identificación redirigida"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Forcing Login"
 msgstr "Forzando la identificación"
 
-#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Login Acknowledged"
 msgstr "Identificación aceptada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Starting Services"
 msgstr "Arrancando servicios"
 
-#: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
-"Un administrador de «Sametime» ha enviado el siguiente anuncio en el "
-"servidor %s"
+"Un administrador de «Sametime» ha enviado el siguiente anuncio en el servidor "
+"%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1685
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador «Sametime»"
 
-#: ../libpurple/protocols/sametime/sametime.c:1738
 msgid "Connection reset"
 msgstr "Conexión rehusada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1750
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Error al leer del socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1775
-#: ../libpurple/protocols/sametime/sametime.c:3782
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:1816
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1990
 msgid "Conference Closed"
 msgstr "Conferencia cerrada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2455
 msgid "Unable to send message: "
 msgstr "No se pudo enviar el mensaje:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3011
 msgid "Place Closed"
 msgstr "Lugar cerrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Microphone"
 msgstr "Micrófono"
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../libpurple/protocols/sametime/sametime.c:3283
 msgid "Video Camera"
 msgstr "Vídeo cámara"
 
-#: ../libpurple/protocols/sametime/sametime.c:3321
-#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "Supports"
 msgstr "Soporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3326
-#: ../libpurple/protocols/sametime/sametime.c:4175
 msgid "External User"
 msgstr "Usuario externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:3433
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10668,27 +7809,21 @@ msgstr ""
 "Por favor ingrese tema para la nueva conferencia, y un mensaje de invitación "
 "que se enviará a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
 msgstr "Nueva conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3439
 msgid "Create"
 msgstr "Crear"
 
-#: ../libpurple/protocols/sametime/sametime.c:3504
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3510
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3517
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3518
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10699,27 +7834,21 @@ msgstr ""
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario también."
 
-#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
 msgstr "Invitar a conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3619
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../libpurple/protocols/sametime/sametime.c:3638 ../pidgin/gtkconv.c:4524
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3666
 msgid "No Sametime Community Server specified"
 msgstr "No se ha especificado el servidor de comunidad «Sametime»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3691
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10728,42 +7857,31 @@ msgstr ""
 "No se ha configurado ninguna dirección IP o nombre de equipo para la cuenta "
 "«Meanwhile» %s. Introduzca uno más abajo para continuar el registro."
 
-#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración de la conexión «Meanwhile»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad «Sametime»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
 msgstr "Último cliente conocido:"
 
-#: ../libpurple/protocols/sametime/sametime.c:4357
-#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4360
-#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4384
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4385
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10773,15 +7891,12 @@ msgstr ""
 "usuarios. Por favor seleccione el usuario de la lista mostrada para añadirlo "
 "a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
 msgid "Unable to add user: user not found"
 msgstr "No se pudo añadir al usuario: el usuario no se ha encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4476
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10790,7 +7905,6 @@ msgstr ""
 "El identificador «%s» no coincide con ningún usuario en la comunidad "
 "«Sametime». Se ha eliminado esta entrada de la lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5067
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10799,84 +7913,66 @@ msgstr ""
 "Error al leer el archivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5207
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"
 
 # Usar empotrable? (jfs)
-#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5271
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar la lista «Sametime» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista «Sametime» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5365
 msgid "Unable to add group: group exists"
 msgstr "No se pudo añadir el grupo: el grupo ya existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grupo llamado '%s' ya existe en su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5369
-#: ../libpurple/protocols/sametime/sametime.c:5499
 msgid "Unable to add group"
 msgstr "No se pudo añadir el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5428
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Notes Address Book group results"
 msgstr ""
 "Resultados de las notas de los grupos de la libreta de direcciones «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5445
 #, 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 ""
-"Es posible que el identificador «%s» se refiera a cualquiera de los grupos "
-"de la libreta de direcciones «Notes». Escoja el grupo más apropiado de la "
-"lista que se muestra abajo para añadirlo a su lista de amigos."
+"Es posible que el identificador «%s» se refiera a cualquiera de los grupos de "
+"la libreta de direcciones «Notes». Escoja el grupo más apropiado de la lista "
+"que se muestra abajo para añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group not found"
 msgstr "No se pudo añadir el grupo: no se ha encontrado el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10885,11 +7981,9 @@ msgstr ""
 "El identificador «%s» no coincide con ninguno de los grupos de la libreta de "
 "direcciones «Notes» en su comunidad «Sametime»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5536
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5537
 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."
@@ -10898,12 +7992,10 @@ msgstr ""
 "campo a continuación para añadir al grupo y a sus miembros en su lista de "
 "amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la búsqueda '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10914,30 +8006,24 @@ msgstr ""
 "a continuación. Puede añadir estos usuarios a su lista de amigos o enviarles "
 "mensajes con los botones de acciones mostrados abajo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5594 ../pidgin/gtknotify.c:794
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
-#: ../libpurple/protocols/sametime/sametime.c:5619
 msgid "No matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"El identificador «%s» no coincide con ninguno de los usuarios en su "
-"comunidad «Sametime»."
+"El identificador «%s» no coincide con ninguno de los usuarios en su comunidad "
+"«Sametime»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "No Matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid "Search for a user"
 msgstr "Buscar un usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5662
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10945,115 +8031,59 @@ msgstr ""
 "Introduzca el nombre o identificador parcial en el campo mostrado a "
 "continuación para buscar usuarios coincidentes en su comunidad «Sametime»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "User Search"
 msgstr "Búsqueda de usuarios"
 
-#: ../libpurple/protocols/sametime/sametime.c:5678
 msgid "Import Sametime List..."
 msgstr "Importar la lista «Sametime»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Export Sametime List..."
 msgstr "Exportar la lista «Sametime»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Add Notes Address Book Group..."
 msgstr "Añadir a la libreta de direcciones de grupos «Notes»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "User Search..."
 msgstr "Búsqueda de los usuarios..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexión (ignorar redirecciones del servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5806
 msgid "Hide client identity"
 msgstr "Ocultar identidad de cliente"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "El usuario %s no está disponible en la red"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "No se pudo establecer el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Se produjo un error durante el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Falló el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Expiró el tiempo durante el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Se interrumpió el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Ya se ha iniciado el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "No puede comenzar el acuerdo de claves consigo mismo"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "El usuario remoto ya no está activo dentro de la red"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -11062,8 +8092,6 @@ msgstr ""
 "Se ha recibido una solicitud de acuerdo de claves de %s. ¿Desea realizar el "
 "intercambio de claves?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -11074,99 +8102,40 @@ msgstr ""
 "Servidor remoto: %s\n"
 "Puerto remoto: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Solicitud de acuerdo de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "MI con contraseña"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "No se pudo establecer la clave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Establecer contraseña MI"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc/ops.c:1527
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obtener clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1517
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "No se pudo obtener la clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Mostrar clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "No se pudo cargar la clave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1066
-#: ../libpurple/protocols/silc/ops.c:1181
-#: ../libpurple/protocols/silc/ops.c:1303
-#: ../libpurple/protocols/silc/ops.c:1304
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Información de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1182
-#: ../libpurple/protocols/silc/ops.c:1323
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "No se pudo obtener la información del usuario %s"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "No se confía en el amigo %s"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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."
@@ -11175,19 +8144,13 @@ msgstr ""
 "pública. Puede utilizar la orden \"Obtener clave pública\" para importarla."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "No se encuentra al amigo %s en la red"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -11195,18 +8158,12 @@ msgstr ""
 "Para añadir al amigo debe importar su clave pública. Pulse «Importar» para "
 "importar una clave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Seleccione el usuario correcto"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
 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."
@@ -11214,8 +8171,6 @@ msgstr ""
 "Se ha encontrado más de un usuario con la misma clave pública. Seleccione el "
 "usuario que desea añadir a su lista de amigos de la lista mostrada."
 
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -11223,312 +8178,154 @@ msgstr ""
 "Se ha encontrado más de un usuario con el mismo nombre. Seleccione el "
 "usuario que desea añadir a su lista de amigos de la listas mostrada."
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Desligado"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indispuesto"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Despiértame"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiper-activo"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:963
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:666
-#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:967
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:969
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:973
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Dormido"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:975
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:676
-#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:977
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:678
-#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:979
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:680
-#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1220
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1237
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1242
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Idioma preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1252
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:728
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Zona horaria"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1257
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localización"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Borrar la clave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de claves"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "MI con contraseña"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Obtener clave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1625
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:1000
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Escribir en la pizarra"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "Contra_seña:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "No existe el canal %s en la red"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:176
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Información de canal"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "No se pudo cambiar la información del canal"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nombre del canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuarios:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador del canal</b>: %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifrado del canal:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC de canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema del canal:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos del canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Huella dactilar del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Huella Babble del fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Añadir clave pública del canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:305
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Contraseña del canal"
 
-#: ../libpurple/protocols/silc/chat.c:431
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de claves públicas del canal"
 
-#: ../libpurple/protocols/silc/chat.c:436
-#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11542,451 +8339,251 @@ msgstr ""
 "conectarse los usuarios que estén en la lista de claves públicas si se "
 "utilizan claves públicas para el acceso."
 
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:934
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autenticación de canal"
 
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Añadir / Quitar"
 
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nombre de grupo"
 
-#: ../libpurple/protocols/silc/chat.c:604
-#: ../libpurple/protocols/silc/ops.c:1830
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Por favor, indique el nombre del grupo de canales privados %s y una "
 "contraseña."
 
-#: ../libpurple/protocols/silc/chat.c:617
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Añadir grupo de canales privados"
 
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Límite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fijar un limite de usuarios en el canal. Poner a cero para quitar el límite "
 "de usuarios."
 
-#: ../libpurple/protocols/silc/chat.c:914
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../libpurple/protocols/silc/chat.c:919
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de expulsados"
 
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Añadir grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:940
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../libpurple/protocols/silc/chat.c:945
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Fijar permanente"
 
-#: ../libpurple/protocols/silc/chat.c:953
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Establecer límite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:959
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Quitar restricciones de temas"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Establecer restricciones de tema"
 
-#: ../libpurple/protocols/silc/chat.c:971
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Limpiar canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Establecer canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:983
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Limpiar canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:988
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Establecer canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Tiene que unirse al canal %s antes de poder unirse al grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1051
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1052
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "No se pudo unir a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1433
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Orden de llamada"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1434
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "No se pudo llamar la orden"
 
-#: ../libpurple/protocols/silc/chat.c:1249
-#: ../libpurple/protocols/silc/silc.c:1435
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Orden desconocida"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transferencia segura de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Se produjo un error durante la transferencia de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Se ha desconectado el remoto"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Falló el acuerdo de claves"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Falló la creación de la conexión"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "La sesión de transferencia de archivos no existe"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "No hay ninguna sesión de transferencia de archivos activa"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Ya se ha iniciado la transferencia de archivos"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 "No se pudo realizar el acuerdo de claves para realizar la transferencia de "
 "archivos."
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "No se pudo comenzar la transferencia de archivos."
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "No se puede enviar el archivo."
 
-#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "Se produjo un error"
 
-#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
-#: ../libpurple/protocols/silc/ops.c:566
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha cambiado el tema a de <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:632
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del canal <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:636
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del canal <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:669
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> fijo los modos del usuario <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:677
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> quitó todos los modos del usuario <I>%s<I>"
 
-#: ../libpurple/protocols/silc/ops.c:706
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Ha sido expulsado de <I>%s</I> por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
-#: ../libpurple/protocols/silc/ops.c:743
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Ha sido expulsado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
-#: ../libpurple/protocols/silc/ops.c:774
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:811
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Desconectado por el servidor"
 
-#: ../libpurple/protocols/silc/ops.c:997
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libpurple/protocols/silc/ops.c:1020
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Cumpleaños"
 
-#: ../libpurple/protocols/silc/ops.c:1028
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../libpurple/protocols/silc/ops.c:1032
-#: ../libpurple/protocols/silc/silc.c:1229
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organización"
 
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidad"
 
-#: ../libpurple/protocols/silc/ops.c:1060
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a un chat"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/silc/ops.c:1140
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Vd. es fundador del canal en <I>%s</I>."
 
-#: ../libpurple/protocols/silc/ops.c:1144
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "El fundador del canal en <I>%s</I> es <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1203
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "Nombre real"
 
-#: ../libpurple/protocols/silc/ops.c:1231
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1367
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Huella digital de la clave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1368
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Huella babble de la clave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Más..."
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc/silc.c:1293
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Desligar del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "No se puede desligar"
 
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "No se puede cambiar el tema"
 
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "No se pudo cambiar el alias"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "No se pudo obtener la lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1485
 msgid "Network is empty"
 msgstr "La red está vacía"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "No se ha recibido una clave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc/ops.c:1554
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "No se pudo obtener la información del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estadísticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1566
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "No se pudieron obtener las estadísticas del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1573
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12021,59 +8618,36 @@ msgstr ""
 "Operadores de servidor en total: %d\n"
 "Operadores de encaminadores en total: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estadísticas de red"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falló el ping"
 
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Se recibió una respuesta al ping del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1626
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "No se pudo expulsar al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "WATCH"
 msgstr "AÑADIR"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "Cannot watch user"
 msgstr "No se puede añadir al usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1741
-#: ../libpurple/protocols/silc/ops.c:1792
-#: ../libpurple/protocols/silc/silc.c:394
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Reanudando la sesión"
 
-#: ../libpurple/protocols/silc/ops.c:1743
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Autenticando la conexión"
 
-#: ../libpurple/protocols/silc/ops.c:1794
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Comprobando la clave pública del servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1831
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Se necesita una contraseña"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -12082,12 +8656,10 @@ msgstr ""
 "Se recibió la clave pública de %s. Su copia local no coincide con esta "
 "clave. ¿Desea aceptar la clave pública de todas formas?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Se recibió la clave pública de %s. ¿Desea aceptar esta clave pública?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12100,104 +8672,69 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar la clave pública"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo de clave pública no soportada"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Se produjo un error durante la conexión al servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Falló el intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Se produjo un fallo al retomar la sesión desligada. Pulse «Reconectar» para "
 "crear una nueva conexión."
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: ../libpurple/protocols/silc/silc.c:397
-#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:449
-#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "No se pudo crear la conexión"
 
-#: ../libpurple/protocols/silc/silc.c:492
-#: ../libpurple/protocols/silc/silc.c:508
-#: ../libpurple/protocols/silc/silc.c:537
-#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "No se pudo cargar la clave pública SILC"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:522
-#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:568
-#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#: ../libpurple/protocols/silc/silc.c:619
-#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:632
-#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Error al cargar el par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:955
-#: ../libpurple/protocols/silc10/silc.c:656
+#, c-format
+msgid "Download %s: %s"
+msgstr "Descarga %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Su estado de ánimo actual"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1795
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:971
-#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Enamorado"
 
-#: ../libpurple/protocols/silc/silc.c:982
-#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12205,63 +8742,36 @@ msgstr ""
 "\n"
 "Sus métodos de contacto preferidos"
 
-#: ../libpurple/protocols/silc/silc.c:990
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:992
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:994
-#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Su estado actual"
 
-#: ../libpurple/protocols/silc/silc.c:1006
-#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Servicios en línea"
 
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "Permitir que otros consulten qué servicios está utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "Permitir que otros consulten qué ordenador está utilizando"
 
-#: ../libpurple/protocols/silc/silc.c:1022
-#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Su archivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:1028
 msgid "Timezone (UTC)"
 msgstr "Zona horaria (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:1032
-#: ../libpurple/protocols/silc/silc.c:1033
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Atributos del estado del usuario en línea"
 
-#: ../libpurple/protocols/silc/silc.c:1034
-#: ../libpurple/protocols/silc10/silc.c:737
 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 "
@@ -12271,217 +8781,128 @@ msgstr ""
 "línea así como su información personal. Por favor, rellene la información "
 "que desea que otros usuarios vean de vd."
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc/silc.c:1702
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:784
-#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Mensaje del día"
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "No hay disponible un mensaje del día"
 
-#: ../libpurple/protocols/silc/silc.c:1076
-#: ../libpurple/protocols/silc/silc.c:1697
-#: ../libpurple/protocols/silc10/silc.c:779
-#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "No hay un mensaje del día asociado con esta conexión"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc/silc.c:1244
-#: ../libpurple/protocols/silc/silc.c:1245
-#: ../libpurple/protocols/silc10/silc.c:830
-#: ../libpurple/protocols/silc10/silc.c:874
-#: ../libpurple/protocols/silc10/silc.c:945
-#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Crear nuevo par de claves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Las contraseñas no coinciden."
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Falló la generación de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1212
-#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Longitud de clave"
 
-#: ../libpurple/protocols/silc/silc.c:1214
-#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Fichero de clave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1239
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Contraseña (escribir de nuevo)"
 
-#: ../libpurple/protocols/silc/silc.c:1246
-#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Generar par de claves"
 
-#: ../libpurple/protocols/silc/silc.c:1289
-#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Estado en línea"
 
-#: ../libpurple/protocols/silc/silc.c:1297
-#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Mostrar mensaje del día"
 
-#: ../libpurple/protocols/silc/silc.c:1301
-#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1393
-#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "El usuario <I>%s</I> no está en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1573
-#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Tema demasiado largo"
 
-#: ../libpurple/protocols/silc/silc.c:1654
-#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Debe especificar un apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "no se ha encontrado el canal %s"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "los modos del canal de %s son: %s"
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/silc/silc.c:1763
-#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no se han definido modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1776
-#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "No se pudieron fijar los modos de canal para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1806
-#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Orden desconocida: %s, (puede ser un error del cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1869
-#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1873
-#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Abandonar un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuevo tema&gt;]:  Ver o cambiar el tema"
 
-#: ../libpurple/protocols/silc/silc.c:1882
-#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;contraseña&gt;:  Unirse a un chat en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1886
-#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar los canales en esta red"
 
-#: ../libpurple/protocols/silc/silc.c:1890
-#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1894
-#: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;apodo&gt; &lt;mensaje&gt;:  Enviar un mensaje privado a un usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1898
-#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;apodo&gt; [&lt;mensaje&gt;]:  Enviar un mensaje privado al usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1902
-#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar el mensaje del día del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1906
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesión"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaje]:  Desconecta del servidor actual opcionalmente indicando un "
 "mensaje"
 
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;orden&gt;:  Ejecutar una orden cualquiera del cliente SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|%lt;razón%gt;]:  Matar un alias"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1928
-#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;apodo&gt;:  Mostrar información del apodo"
 
-#: ../libpurple/protocols/silc/silc.c:1932
-#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12489,8 +8910,6 @@ msgstr ""
 "cmode &lt;canal&gt; [+|&lt;modos-&gt;] [argumentos]:  Cambia o muestra los "
 "modos del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1936
-#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12498,18 +8917,12 @@ msgstr ""
 "cumode &lt;canal&gt; +|-&lt;modos&gt &lt;apodo&gt;:  Cambia los modos del "
 "usuario o del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1940
-#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos_usuario&gt;:  Establecer sus modos en la red"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Establece privilegios de operador"
 
-#: ../libpurple/protocols/silc/silc.c:1948
-#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12517,47 +8930,31 @@ msgstr ""
 "invite &lt;canal&gt; [-|+]&lt;apodo&gt;:   invita a un apodo o añade/elimina "
 "el apodo de la lista de invitados para el canal"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &lt;apodo&gt; [comentario]:  Echar a un cliente del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1956
-#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos del servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;apodo&gt;]:  Expulsar a un cliente del canal"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;apodo|servidor&gt;:  Obtiene la clave pública del servidor o del "
 "cliente"
 
-#: ../libpurple/protocols/silc/silc.c:1968
-#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Muestra las estadísticas del servidor y de la red"
 
-#: ../libpurple/protocols/silc/silc.c:1972
-#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING al servidor al que está conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1977
-#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;canal&gt;:  Obtiene la lista de los usuarios que están en el canal"
 
-#: ../libpurple/protocols/silc/silc.c:1981
-#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12574,142 +8971,92 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2092
-#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2094
-#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:2135
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2150
 msgid "Network"
 msgstr "Red"
 
-#: ../libpurple/protocols/silc/silc.c:2146
-#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Fichero de clave pública"
 
-#: ../libpurple/protocols/silc/silc.c:2150
-#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Fichero de clave privada"
 
-#: ../libpurple/protocols/silc/silc.c:2160
-#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: ../libpurple/protocols/silc/silc.c:2170
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
 #
-#: ../libpurple/protocols/silc/silc.c:2173
 msgid "Use Perfect Forward Secrecy"
 msgstr "Utilizar «Confidencialidad directa perfecta»"
 
-#: ../libpurple/protocols/silc/silc.c:2177
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Autenticación de clave pública"
 
-#: ../libpurple/protocols/silc/silc.c:2180
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que no hagan un intercambio de claves"
 
-#: ../libpurple/protocols/silc/silc.c:2183
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensajes a la pizarra"
 
-#: ../libpurple/protocols/silc/silc.c:2186
-#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Abrir la pizarra automáticamente"
 
-#: ../libpurple/protocols/silc/silc.c:2189
-#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Firmar digitalmente todos los mensajes instantáneos"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves SILC..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "No se pudo crear el par de claves SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:363
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nombre real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nombre de usuario: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "Correo electrónico:     %s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nombre de servidor: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:371
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organización: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:373
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo:      %s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Longitud de clave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:377
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versión: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12720,8 +9067,6 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12730,44 +9075,28 @@ msgstr ""
 "Huella babble de la clave pública:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Información de clave pública"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Video conferencia"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Ordenador"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s envió un mensaje a la pizarra. ¿Quiere abrir la pizarra?"
 
-#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12775,99 +9104,77 @@ msgid ""
 msgstr ""
 "%s envió un mensaje a la pizarra del canal %s. ¿Quiere abrir la pizarra?"
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Pizarra"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "No se disponen de estadísticas del servidor"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Fallo: Existe una diferencia en las versiones, por favor, actualice su "
 "cliente"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: El servidor remoto no soporta/confía en su clave pública"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: El servidor remoto no soporta el grupo de IC propuesto"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fallo: El servidor remoto no soporta los sistemas de cifrado propuestos"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: El servidor remoto no soporta los PKCS propuestos"
 
-#: ../libpurple/protocols/silc10/ops.c:1952
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: El servidor remoto no soporta la función de hash propuesta"
 
-#: ../libpurple/protocols/silc10/ops.c:1955
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: El servidor remoto no soporta el HMAC propuesto"
 
-#: ../libpurple/protocols/silc10/ops.c:1957
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Firma incorrecta"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Fallo: Cookie inválida"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"
 
-#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexión del cliente SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Pepe sin nombre"
 
-#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "No se pudo cargar la clave pública SILC: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "No se pudo escribir"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Respuesta desconocida del servidor."
 
-#: ../libpurple/protocols/simple/simple.c:1749
-#: ../libpurple/protocols/simple/simple.c:1795
-#: ../libpurple/protocols/simple/simple.c:1810
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "No se pudo crear el socket de escucha"
 
-#: ../libpurple/protocols/simple/simple.c:1774
-msgid "Couldn't resolve host"
-msgstr "No se pudo resolver el nombre"
-
-#: ../libpurple/protocols/simple/simple.c:1875
-msgid "Could not resolve hostname"
-msgstr "No se pudo resolver el nombre de sistema"
-
-#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "Los nombres de usuario SIP no pueden tener espacios en blanco ni el símbolo @"
@@ -12880,159 +9187,138 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El complemento de protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estatus público (nota: todos podrán verlo)"
 
-#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Utilizar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Buscando %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Falló la conexión a %s"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "No se pudo escribir el archivo %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "No se pudo leer el archivo %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensaje demasiado largo, los últimos %s bytes fueron borrados."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s no está conectado ahora."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "No se permiten advertencias de %s."
 
-#: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "El mensaje ha sido descartado, usted esta excediendo el límite de velocidad "
 "del servidor."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "No está disponible el chat en %s."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Esta enviando mensajes demasiado rápido a %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Usted perdió un MI de %s porque era demasiado largo."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Usted perdió un MI de %s porque fue mandado demasiado rápido."
 
-#: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Fallo."
 
-#: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
-#: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Necesito más calificadores."
 
-#: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Servicio de directorio temporalmente no disponible."
 
-#: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "Email lookup restricted."
 msgstr "Búsqueda de direcciones de correo electrónico restringida."
 
-#: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Palabra clave ignorada."
 
-#: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Sin palabras clave."
 
-#: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "El usuario no tiene información en el directorio."
 
-#: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "País no soportado."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo desconocido: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrecta."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Servicio temporalmente no disponible."
 
-#: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Su nivel de advertencias es demasiado alto para conectarse."
 
-#: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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."
@@ -13041,81 +9327,63 @@ msgstr ""
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ha ocurrido un error desconocido al conectarse: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Un error desconocido, %d, ha ocurrido. Info: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Nombre de grupo inválido"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Conexión cerrada"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Esperando respuesta..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC ha terminado su pausa. Ya puede volver a mandar mensajes."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "La contraseña se ha cambiado con éxito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6847
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Obtener información del directorio"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Guardar información del directorio"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "¡No se pudo abrir %s para escritura!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Se produjo un fallo en la transferencia del archivo; posiblemente fue "
 "cancelado por el otro extremo."
 
-#: ../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 "No se pudo conectar para realizar la transferencia."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "No se pudo escribir la cabecera de archivo.  El archivo no será transferido."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s solicita %s para aceptar %d archivo: %s (%.2f %s)%s%s"
 msgstr[1] "%s solicita %s para aceptar %d archivos: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s le solicita que le mande un archivo"
@@ -13130,31 +9398,25 @@ msgstr "%s le solicita que le mande un archivo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s le ha enviado una invitación para utilizar la webcam, algo aún no "
 "soportado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -13163,18 +9425,15 @@ msgstr ""
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
 "forma retroactiva)."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13185,11 +9444,9 @@ msgstr ""
 "desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s "
 "para ver si existe una actualización."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13198,53 +9455,38 @@ msgstr ""
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2718
-#: ../libpurple/protocols/yahoo/yahoo.c:2906
-#: ../libpurple/protocols/yahoo/yahoo.c:3011
-#: ../libpurple/protocols/yahoo/yahoo.c:3022
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Error de conexión"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13253,7 +9495,6 @@ msgstr ""
 "Se perdió la conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13262,103 +9503,72 @@ msgstr ""
 "No se pudo establecer una conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/protocols/yahoo/yahoo.c:3833
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3140
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3839
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3146
-#: ../libpurple/protocols/yahoo/yahoo.c:3845
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3150
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
-#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "Usar configuración del entorno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "Comenzar una sesión de Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3561
 msgid "Activate which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3572
 msgid "Join whom in chat?"
 msgstr "¿Con quién quiere juntarse en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3588
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3593
 msgid "Open Inbox"
 msgstr "Abrir bandeja de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4182
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
 
@@ -13372,92 +9582,64 @@ msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4441
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4444
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4447
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4450
 msgid "Chat room locale"
 msgstr "Localización de la sala de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4453
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4461
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4464
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4467
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Enviar petición Doodle."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1111
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1515
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1410
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s se ofrece a enviarle un conjunto de %d archivos.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Error de escritura"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! Japón"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Perfil Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -13465,61 +9647,46 @@ msgstr ""
 "Lo siento, los perfiles con contenido sólo para adultos no están soportados "
 "aún."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 "Si desea ver este perfil, deberá visitar este enlace con su navegador web:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "Aficiones"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "Últimas noticias"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "Página personal"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "Enlace interesante 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "Enlace interesante 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "Enlace interesante 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "Última actualización"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Información de usuario de %s no disponible"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 "Lo siento, este perfil parece estar en un idioma o formato aún no soportado."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13527,7 +9694,6 @@ msgstr ""
 "No se pudo obtener el perfil del usuario. Esto es habitualmente un problema "
 "temporal en el lado del servidor. Por favor, pruebe de nuevo más tarde."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 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 "
@@ -13538,39 +9704,31 @@ msgstr ""
 "de usuario. Si está seguro de que el usuario existe inténtelo de nuevo más "
 "tarde."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Invitación rechazada"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "No se pudo unir al chat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Sala desconocida"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Quizás la sala está llena"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13579,46 +9737,34 @@ msgstr ""
 "antes de poder volver a unirse a la sala del chat."
 
 # Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Ahora está chateando en %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "No se pudo unir al amigo al chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "¿Quizás no están en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "No se pudo obtener la lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Voces"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Cámaras web"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "No se pudo obtener la lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Se produjo un problema al conectarse con el servidor YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13627,7 +9773,6 @@ msgstr ""
 "Se ha perdido la conexión con el servidor\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13635,77 +9780,58 @@ msgstr ""
 "(Hubo un error convirtiendo este mensaje.\\t Verifique la opción "
 "«Codificación» en el Editor de cuentas)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:795
-#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Oculto o no conectado"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1510
-#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Falló el intento de suscripción a %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;apodo&gt;: Localiza un usuario"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;apodo&gt;: Localiza un usuario"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2725
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fijar la instancia a utilizar en esta clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Unirse a un nuevo chat"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2736
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar un mensaje a &lt;mensaje,<i>instancia</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2742
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13713,7 +9839,6 @@ msgstr ""
 "zci &lt;clase&gt; &lt;instancia&gt;: Enviar un mensaje a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2748
 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;"
@@ -13721,7 +9846,6 @@ msgstr ""
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a "
 "&lt;<i>clase</i>,<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13729,15 +9853,12 @@ msgstr ""
 "zir &lt;instancia&gt; &lt;receptor&gt;: Enviar un mensaje a &lt;MENSAJE,"
 "<i>instancia</i>,<i>receptor</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2759
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar un mensaje a &lt;<i>clase</i>,PERSONAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "Obtener las suscripciones del servidor"
 
@@ -13751,45 +9872,33 @@ msgstr "Obtener las suscripciones del servidor"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2931
-#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "Use tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "orden tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Exposición"
 
-#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
-#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13798,77 +9907,62 @@ msgstr ""
 "No se pudo crear el socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:687
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
-#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexión en el proxy HTTP %d"
 
-#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d."
 
-#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"
 
-#: ../libpurple/proxy.c:1793
 msgid "Could not resolve host name"
 msgstr "No se pudo resolver el nombre de equipo"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Solicitando la atención de %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "¡%s ha solicitado su atención!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "_Sí"
 
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "_Aceptar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "No estoy aquí ahora"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "Estadísticas guardadas"
 
-#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: ../libpurple/server.c:356
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "Solicitando la atención de %s..."
-
-#: ../libpurple/server.c:401
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "¡%s ha solicitado su atención!"
-
-#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13877,99 +9971,97 @@ msgstr ""
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitado a %s a la sala de chat %s\n"
 
-#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+msgid "Shortcut"
+msgstr "Atajo de teclado"
+
+msgid "The text-shortcut for the smiley"
+msgstr "El atajo de teclado para el emoticono"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Imagen almacenada"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Imagen almacenada (esto tendrá que ser suficiente por ahora)"
+
 msgid "SSL Connection Failed"
 msgstr "Falló la conexión SSL"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Se produjo un fallo en la negociación SSL"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "El servidor SSL presentó un certificado inválido"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Error SSL desconocido"
 
-#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Desactivado"
 
-#: ../libpurple/status.c:157 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1088
 msgid "Do not disturb"
 msgstr "No molestar"
 
-#: ../libpurple/status.c:160
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../libpurple/status.c:162
 msgid "Listening to music"
 msgstr "Escuchando música"
 
-#: ../libpurple/status.c:611
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "el estado de %s (%s) cambió de %s a %s"
 
-#: ../libpurple/status.c:622
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) es ahora %s"
 
-#: ../libpurple/status.c:628
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ya no está %s"
 
-#: ../libpurple/status.c:1243
 #, c-format
 msgid "%s became idle"
 msgstr "%s ahora está inactivo"
 
-#: ../libpurple/status.c:1263
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ahora está activo"
 
-#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ahora está inactivo"
 
-#: ../libpurple/status.c:1331
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ahora está activo"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13978,67 +10070,56 @@ msgstr ""
 "Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
 "antiguo se ha renombrado a %s~."
 
-#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "No se pudo abrir %s: se produjeron demasiadas redirecciones"
 
-#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"
 
-#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -14047,137 +10128,116 @@ msgstr ""
 "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es "
 "posible que el servidor web esté intentando algo con malas intenciones."
 
-#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"
 
-#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"
 
-#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
 
-#: ../libpurple/util.c:4696
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4702
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:322
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Otro programa en su ordenador ha interrumpido la conexión."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:325
+#, c-format
 msgid "Remote host closed connection."
 msgstr "El servidor remoto ha cerrado la conexión."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:328
+#, c-format
 msgid "Connection timed out."
 msgstr "Expiró la conexión."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:331
+#, c-format
 msgid "Connection refused."
 msgstr "Conexión rechazada."
 
-#: ../pidgin.desktop.in.h:1
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "La dirección ya se está utilizando."
+
 msgid "Internet Messenger"
 msgstr "Cliente de mensajería de Internet"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Cliente de mensajería de Internet Pidgin"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Cliente de mensajería instantánea multiprotocolo"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientación"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "La orientación en el área de notificación."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Opciones de conexión"
 
-#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:411 ../pidgin/gtkaccount.c:1039
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../pidgin/gtkaccount.c:501
 msgid "Remember pass_word"
 msgstr "Recordar _contraseña"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:555
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: ../pidgin/gtkaccount.c:568
 msgid "_Local alias:"
 msgstr "Apodo _local:"
 
-#: ../pidgin/gtkaccount.c:572
 msgid "New _mail notifications"
 msgstr "Notificaciones de _correo nuevo"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:577
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizar este _icono de amigo para esta cuenta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:705
 #, c-format
 msgid "%s Options"
 msgstr "Opciones de %s"
 
-#: ../pidgin/gtkaccount.c:910
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuración del proxy de GNOME"
 
-#: ../pidgin/gtkaccount.c:911
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuración global del proxy"
 
-#: ../pidgin/gtkaccount.c:917
 msgid "No Proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkaccount.c:923
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:929
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:935
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:941 ../pidgin/gtkprefs.c:1340
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"
 
@@ -14186,69 +10246,52 @@ msgstr "Usar configuración del entorno"
 #. 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:980
 msgid "If you look real closely"
 msgstr "Si miras de cerca"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:983
 msgid "you can see the butterflies mating"
 msgstr "puedes ver a las mariposas apareándose"
 
-#: ../pidgin/gtkaccount.c:1004
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1334
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1027 ../pidgin/gtkprefs.c:1355
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:1373
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1410
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
-#: ../pidgin/gtkaccount.c:1171
 msgid "Unable to save new account"
 msgstr "No se pudo guardar la nueva cuenta"
 
-#: ../pidgin/gtkaccount.c:1172
 msgid "An account already exists with the specified criteria."
 msgstr "Ya existe una cuenta con los criterios especificados."
 
-#: ../pidgin/gtkaccount.c:1449
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: ../pidgin/gtkaccount.c:1466
 msgid "_Basic"
 msgstr "_Básica"
 
-#: ../pidgin/gtkaccount.c:1473
-msgid "Create this new account on the server"
-msgstr "Crear esta nueva cuenta en el servidor"
+msgid "Create _this new account on the server"
+msgstr "Crear es_ta nueva cuenta en el servidor"
 
-#: ../pidgin/gtkaccount.c:1487
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtkplugin.c:753
-#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../pidgin/gtkaccount.c:1936
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2139
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14268,7 +10311,6 @@ msgstr ""
 "cuenta. Si quiere que %s se conecte a múltiples cuentas de MI, deberá pulsar "
 "<b>Añadir</b> otra vez para configurarlas todas."
 
-#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -14276,7 +10318,6 @@ msgid_plural ""
 msgstr[0] "Tiene %d contacto llamado %s. ¿Desearía fusionarlo?"
 msgstr[1] "Tiene %d contactos llamados %s. ¿Desearía fusionarlos?"
 
-#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
@@ -14286,126 +10327,96 @@ msgstr ""
 "amigos y utilizarán sólo una ventana de conversación. Puede separarlos más "
 "adelante seleccionando «Expandir» del menú contextual de contactos."
 
-#: ../pidgin/gtkblist.c:683
 msgid "Please update the necessary fields."
 msgstr "Por favor, actualice los campos necesarios."
 
-#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkblist.c:6794
 msgid "Room _List"
 msgstr "_Lista de salas"
 
-#: ../pidgin/gtkblist.c:1058
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
-#: ../pidgin/gtkblist.c:1070 ../pidgin/gtkblist.c:6829
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkprivacy.c:549
-#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1349
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1392
 msgid "Move to"
 msgstr "Mover a"
 
-#: ../pidgin/gtkblist.c:1432
 msgid "Get _Info"
 msgstr "Obtener _información"
 
-#: ../pidgin/gtkblist.c:1435 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1441
 msgid "_Send File..."
 msgstr "_Enviar archivo..."
 
-#: ../pidgin/gtkblist.c:1448
 msgid "Add Buddy _Pounce..."
 msgstr "Añadir _aviso de amigo..."
 
-#: ../pidgin/gtkblist.c:1453 ../pidgin/gtkblist.c:1457
-#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1602
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Hide when offline"
 msgstr "Ocultar cuando se esté desconectado"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Show when offline"
 msgstr "Mostrar cuando se esté desconectado"
 
-#: ../pidgin/gtkblist.c:1477 ../pidgin/gtkblist.c:1486
-#: ../pidgin/gtkblist.c:1587 ../pidgin/gtkblist.c:1608
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkblist.c:1488
-#: ../pidgin/gtkblist.c:1589 ../pidgin/gtkblist.c:1610
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../pidgin/gtkblist.c:1538
+msgid "Set Custom Icon"
+msgstr "Configurar icono personalizado"
+
+msgid "Remove Custom Icon"
+msgstr "Eliminar icono personalizado"
+
 msgid "Add _Buddy..."
 msgstr "Añadir _amigo..."
 
-#: ../pidgin/gtkblist.c:1541
 msgid "Add C_hat..."
 msgstr "Añadir c_hat..."
 
-#: ../pidgin/gtkblist.c:1544
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkblist.c:1546
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1573
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: ../pidgin/gtkblist.c:1575
 msgid "Persistent"
 msgstr "Persistente"
 
-#: ../pidgin/gtkblist.c:1585
 msgid "_Edit Settings..."
 msgstr "_Editar configuración..."
 
-#: ../pidgin/gtkblist.c:1615 ../pidgin/gtkblist.c:1638
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1643
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1894 ../pidgin/gtkblist.c:1906
-#: ../pidgin/gtkblist.c:5493 ../pidgin/gtkblist.c:5506
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../pidgin/gtkblist.c:2366 ../pidgin/gtkconv.c:4926
-#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
@@ -14413,155 +10424,124 @@ msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2717
 msgid "Unknown node type"
 msgstr "Tipo de nodo desconocido"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3153
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../pidgin/gtkblist.c:3154
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo..."
 
-#: ../pidgin/gtkblist.c:3155
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../pidgin/gtkblist.c:3156
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."
 
-#: ../pidgin/gtkblist.c:3157
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../pidgin/gtkblist.c:3159
 msgid "/Buddies/Sh_ow"
 msgstr "/Amigos/M_ostrar"
 
-#: ../pidgin/gtkblist.c:3160
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desc_onectados"
 
-#: ../pidgin/gtkblist.c:3161
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos _vacíos"
 
-#: ../pidgin/gtkblist.c:3162
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Amigos/Mostrar/_Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:3163
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Amigos/Mostrar/_Tiempo de inactividad"
 
-#: ../pidgin/gtkblist.c:3164
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de _protocolo"
 
-#: ../pidgin/gtkblist.c:3165
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"
 
-#: ../pidgin/gtkblist.c:3167
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: ../pidgin/gtkblist.c:3168
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: ../pidgin/gtkblist.c:3169
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: ../pidgin/gtkblist.c:3171
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3174
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: ../pidgin/gtkblist.c:3175 ../pidgin/gtkblist.c:7514
-msgid "/Accounts/Manage"
-msgstr "/Cuentas/Gestionar"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Cuentas/Gestionar cuentas"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3178
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: ../pidgin/gtkblist.c:3179
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../pidgin/gtkblist.c:3180
 msgid "/Tools/_Certificates"
 msgstr "/Herramientas/_Certificados"
 
-#: ../pidgin/gtkblist.c:3181
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../pidgin/gtkblist.c:3182
 msgid "/Tools/Pr_eferences"
-msgstr "/Herramientas/Pr_eferencias"
+msgstr "/Herramientas/_Preferencias"
 
-#: ../pidgin/gtkblist.c:3183
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../pidgin/gtkblist.c:3185
+msgid "/Tools/Smile_y"
+msgstr "/Herramientas/_Emoticonos"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../pidgin/gtkblist.c:3186
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:3187
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/_Registro del sistema"
 
-#: ../pidgin/gtkblist.c:3189
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../pidgin/gtkblist.c:3191
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../pidgin/gtkblist.c:3192
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#: ../pidgin/gtkblist.c:3193
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#: ../pidgin/gtkblist.c:3195 ../pidgin/gtkblist.c:3197
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:3228
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Cuenta:</b> %s"
 
-#: ../pidgin/gtkblist.c:3247
 #, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
-msgstr "\n<b>Ocupantes:</b> %d"
+msgstr ""
+"\n"
+"<b>Ocupantes:</b> %d"
 
-#: ../pidgin/gtkblist.c:3252
 #, c-format
 msgid ""
 "\n"
@@ -14570,128 +10550,98 @@ msgstr ""
 "\n"
 "<b>Tema:</b> %s"
 
-#: ../pidgin/gtkblist.c:3252
 msgid "(no topic set)"
 msgstr "(no hay tema establecido)"
 
-#: ../pidgin/gtkblist.c:3331
 msgid "Buddy Alias"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkblist.c:3360
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3406
 msgid "Last Seen"
 msgstr "Visto por última vez"
 
-#: ../pidgin/gtkblist.c:3427
 msgid "Spooky"
 msgstr "Asustadizo"
 
-#: ../pidgin/gtkblist.c:3429
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3431
 msgid "Rockin'"
 msgstr "Rock'n'roleando"
 
-#: ../pidgin/gtkblist.c:3462
 msgid "Total Buddies"
 msgstr "Amigos en total"
 
-#: ../pidgin/gtkblist.c:3824
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3826
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3828
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3982
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantáneo..."
 
-#: ../pidgin/gtkblist.c:3983 ../pidgin/gtkblist.c:4016
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../pidgin/gtkblist.c:3984
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener información del usuario..."
 
-#: ../pidgin/gtkblist.c:3985
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Añadir un amigo..."
 
-#: ../pidgin/gtkblist.c:3986 ../pidgin/gtkblist.c:4019
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Añadir un chat..."
 
-#: ../pidgin/gtkblist.c:3987
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Añadir un grupo..."
 
-#: ../pidgin/gtkblist.c:4022
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../pidgin/gtkblist.c:4025
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:4157 ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaje sin leer de %s\n"
 msgstr[1] "%d mensajes sin leer de %s\n"
 
-#: ../pidgin/gtkblist.c:4320
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:4323
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:4324
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
-#: ../pidgin/gtkblist.c:4662
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../pidgin/gtkblist.c:4664
 #, c-format
 msgid "%s disabled"
 msgstr "%s deshabilitado"
 
-#: ../pidgin/gtkblist.c:4668
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../pidgin/gtkblist.c:4668 ../pidgin/gtkblist.c:4787
 msgid "Re-enable"
 msgstr "Reactivar"
 
-#: ../pidgin/gtkblist.c:4785
 msgid "Welcome back!"
 msgstr "¡Bienvenido!"
 
-#: ../pidgin/gtkblist.c:4821
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14701,82 +10651,67 @@ msgstr[0] ""
 msgstr[1] ""
 "se deshabilitaron %d cuentas porque se ha conectado desde otra ubicación."
 
-#: ../pidgin/gtkblist.c:5100
 msgid "<b>Username:</b>"
 msgstr "<b>Nombre de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:5107
 msgid "<b>Password:</b>"
 msgstr "<b>Contraseña:</b>"
 
-#: ../pidgin/gtkblist.c:5118
 msgid "_Login"
 msgstr "_Entrada"
 
-#: ../pidgin/gtkblist.c:5202
 msgid "/Accounts"
 msgstr "/Cuentas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5216
 #, 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</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'>¡Bienvenido a %s!</span>\n"
 "\n"
 "No tiene ninguna cuenta activa. Puede activar sus cuentas de MI en la "
-"ventana de <b>Cuentas</b> en <b>Cuentas->Gestionar</b>. Podrá conectarse, "
-"fijar su estado y hablar con sus amigos una vez active sus cuentas."
+"ventana de <b>Cuentas</b> en <b>Cuentas->Gestionar cuentas</b>. Podrá "
+"conectarse, fijar su estado y hablar con sus amigos una vez active sus "
+"cuentas."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5487
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Amigos/Mostrar/Amigos desconectados"
 
-#: ../pidgin/gtkblist.c:5490
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Amigos/Mostrar/Grupos vacíos"
 
-#: ../pidgin/gtkblist.c:5496
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Amigos/Mostrar/Detalles de amigo"
 
-#: ../pidgin/gtkblist.c:5499
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Amigos/Mostrar/Tiempos de inactividad"
 
-#: ../pidgin/gtkblist.c:5502
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Amigos/Mostrar/Iconos de protocolo"
 
-#: ../pidgin/gtkblist.c:6455
 msgid "Add a buddy.\n"
 msgstr "Añadir un amigo.\n"
 
-#: ../pidgin/gtkblist.c:6470
 msgid "Buddy's _username:"
 msgstr "Nombre de _usuario del amigo:"
 
-#: ../pidgin/gtkblist.c:6492
 msgid "(Optional) A_lias:"
 msgstr "(Opcional) A_podo:"
 
-#: ../pidgin/gtkblist.c:6510
 msgid "Add buddy to _group:"
 msgstr "Añadir el amigo a un _grupo:"
 
-#: ../pidgin/gtkblist.c:6759
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."
 
-#: ../pidgin/gtkblist.c:6775
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14784,7 +10719,6 @@ msgstr ""
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../pidgin/gtkblist.c:6819
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14792,79 +10726,61 @@ msgstr ""
 "Introduzca el apodo, y la información que crea conveniente del chat que "
 "desearía añadir en la lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:6842
 msgid "A_lias:"
 msgstr "_Apodo:"
 
-#: ../pidgin/gtkblist.c:6849
 msgid "Auto_join when account becomes online."
 msgstr "Reconec_tarse cuando la cuenta se pone en línea."
 
-#: ../pidgin/gtkblist.c:6850
 msgid "_Hide chat when the window is closed."
 msgstr "_Ocultar el chat cuando se cierra la ventana."
 
-#: ../pidgin/gtkblist.c:6876
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: ../pidgin/gtkblist.c:7534
+msgid "Enable Account"
+msgstr "Habilitar cuenta"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Cuentas/Activar cuenta"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Cuentas/"
 
-#: ../pidgin/gtkblist.c:7558
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../pidgin/gtkblist.c:7571 ../pidgin/gtkconv.c:3220
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: ../pidgin/gtkblist.c:7579
 msgid "_Disable"
 msgstr "_Deshabilitar"
 
-#: ../pidgin/gtkblist.c:7591
-msgid "Enable Account"
-msgstr "Habilitar cuenta"
-
-#: ../pidgin/gtkblist.c:7597
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Cuentas/Activar cuenta"
-
-#: ../pidgin/gtkblist.c:7646
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../pidgin/gtkblist.c:7716
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "Servidores SSL"
 
-#: ../pidgin/gtkconv.c:487
 msgid "Unknown command."
 msgstr "Orden desconocida."
 
-#: ../pidgin/gtkconv.c:771 ../pidgin/gtkconv.c:798
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
 
-#: ../pidgin/gtkconv.c:792
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "No está conectado con ninguna cuenta con la que pueda invitar a ese amigo."
 
-#: ../pidgin/gtkconv.c:846
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:876
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14872,187 +10788,138 @@ msgstr ""
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."
 
-#: ../pidgin/gtkconv.c:897
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:910 ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../pidgin/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1011
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
-#: ../pidgin/gtkconv.c:1157 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1183 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "Término a _buscar:"
 
-#: ../pidgin/gtkconv.c:1684
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../pidgin/gtkconv.c:1687
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1707
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../pidgin/gtkconv.c:1730
 msgid "Last said"
 msgstr "Dicho la última vez"
 
-#: ../pidgin/gtkconv.c:2715
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../pidgin/gtkconv.c:2793
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../pidgin/gtkconv.c:2851
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2856
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../pidgin/gtkconv.c:2859
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: ../pidgin/gtkconv.c:2863
 msgid "Set Custom Icon..."
 msgstr "Configurar icono personalizado..."
 
-#: ../pidgin/gtkconv.c:2867
 msgid "Change Size"
 msgstr "Cambiar tamaño"
 
-#: ../pidgin/gtkconv.c:2880
-msgid "Remove Custom Icon"
-msgstr "Eliminar icono personalizado"
-
-#: ../pidgin/gtkconv.c:3005
 msgid "Show All"
 msgstr "Mostrar todo"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:3024
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: ../pidgin/gtkconv.c:3026
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#: ../pidgin/gtkconv.c:3031
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: ../pidgin/gtkconv.c:3033
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"
 
-#: ../pidgin/gtkconv.c:3034
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."
 
-#: ../pidgin/gtkconv.c:3036
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/Limpia_r deslizable"
 
-#: ../pidgin/gtkconv.c:3040
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/_Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3043
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
 
-#: ../pidgin/gtkconv.c:3045
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: ../pidgin/gtkconv.c:3047
 msgid "/Conversation/M_ore"
 msgstr "/Conversación/_Más"
 
-#: ../pidgin/gtkconv.c:3051
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
 
-#: ../pidgin/gtkconv.c:3053
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:3055
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversación/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3057
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."
 
-#: ../pidgin/gtkconv.c:3059
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."
 
-#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Insertar en_lace..."
 
-#: ../pidgin/gtkconv.c:3066
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Insertar imag_en..."
 
-#: ../pidgin/gtkconv.c:3072
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"
 
 #. Options
-#: ../pidgin/gtkconv.c:3076
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../pidgin/gtkconv.c:3077
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3078
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3080
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../pidgin/gtkconv.c:3081
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/More"
 msgstr "/Conversación/Más"
 
-#: ../pidgin/gtkconv.c:3264
 msgid "/Options"
 msgstr "/Opciones"
 
@@ -15061,79 +10928,60 @@ msgstr "/Opciones"
 #. 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:3299 ../pidgin/gtkconv.c:3331
 msgid "/Conversation"
 msgstr "/Conversación"
 
-#: ../pidgin/gtkconv.c:3339
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#: ../pidgin/gtkconv.c:3345
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:3349
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3355
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"
 
-#: ../pidgin/gtkconv.c:3359
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: ../pidgin/gtkconv.c:3365
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."
 
-#: ../pidgin/gtkconv.c:3369
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3373
 msgid "/Conversation/Unblock..."
 msgstr "/Conversación/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3377
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: ../pidgin/gtkconv.c:3381
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3387
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: ../pidgin/gtkconv.c:3391
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: ../pidgin/gtkconv.c:3397
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3400
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3413
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../pidgin/gtkconv.c:3416
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3494
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: ../pidgin/gtkconv.c:3568
 #, c-format
 msgid ""
 "\n"
@@ -15143,527 +10991,378 @@ msgstr ""
 "%s ha dejado de escribir"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3748 ../pidgin/gtkconv.c:8472
 msgid "S_end To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4431 ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4590
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#: ../pidgin/gtkconv.c:5932 ../pidgin/gtkconv.c:6053
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-#: ../pidgin/gtkconv.c:6687 ../pidgin/gtkstatusbox.c:684
 msgid "Typing"
 msgstr "Tecleando"
 
-#: ../pidgin/gtkconv.c:6691
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkconv.c:6694
 msgid "Nick Said"
 msgstr "Apodo dijo"
 
-#: ../pidgin/gtkconv.c:6697 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: ../pidgin/gtkconv.c:6703
 msgid "New Event"
 msgstr "Nuevo acontecimiento"
 
-#: ../pidgin/gtkconv.c:7944
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: limpia todos los históricos de las ventanas de conversación."
 
-#: ../pidgin/gtkconv.c:8148
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../pidgin/gtkconv.c:8180
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Tiene mensajes sin leer. ¿Está seguro que quiere cerrar la ventana?"
 
-#: ../pidgin/gtkconv.c:8813
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"
 
-#: ../pidgin/gtkconv.c:8819
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"
 
-#: ../pidgin/gtkconv.c:8827
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"
 
-#: ../pidgin/gtkconv.c:8833
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"
 
-#: ../pidgin/gtkconv.c:9355
 msgid "Close conversation"
 msgstr "Cerrar conversación"
 
-#: ../pidgin/gtkconv.c:9959
 msgid "Last created window"
 msgstr "Última ventana creada"
 
-#: ../pidgin/gtkconv.c:9961
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../pidgin/gtkconv.c:9963 ../pidgin/gtkprefs.c:1576
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../pidgin/gtkconv.c:9965
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9967
 msgid "By account"
 msgstr "Por cuenta"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Guardar registro de depuración"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Invertir"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Resaltar coincidencias"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Sólo _icono"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Sólo _texto"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Tanto iconos como texto"
 
-#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Pulsar el botón derecho para más opciones."
 
-#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Nivel "
 
-#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Seleccione el nivel del filtro de depuración."
 
-#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Todos"
 
-#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Misceláneo"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Error "
 
-#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:120
-msgid "lead developer"
-msgstr "desarrollador principal"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../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:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "desarrollador"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "soporte"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "soporte/QA"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:115
 msgid "developer & webmaster"
 msgstr "desarrollador y webmaster"
 
-#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "Contribuyente senior/QA"
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../pidgin/gtkdialogs.c:112 ../pidgin/gtkdialogs.c:113
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../pidgin/gtkdialogs.c:114
 msgid "libfaim maintainer"
 msgstr "mantenedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:117
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseñador de controladores [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:118
 msgid "XMPP developer"
 msgstr "desarrollador XMPP"
 
-#: ../pidgin/gtkdialogs.c:119
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:135
+msgid "lead developer"
+msgstr "desarrollador principal"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:231
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../pidgin/gtkdialogs.c:137
 msgid "Belarusian Latin"
 msgstr "Latín bieloruso"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:232
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../pidgin/gtkdialogs.c:144
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalán"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
 msgid "Czech"
 msgstr "Checo"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
 msgid "Danish"
 msgstr "Danés"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:237
 msgid "German"
 msgstr "Alemán"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:155
 msgid "Dzongkha"
 msgstr "Butaní"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Greek"
 msgstr "Griego"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "Spanish"
 msgstr "Español"
 
-#: ../pidgin/gtkdialogs.c:163
 msgid "Estonian"
 msgstr "Estonio"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Euskera(Basque)"
 msgstr "Eusquera(Vasco)"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:168
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:244
-#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247
 msgid "French"
 msgstr "Francés"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:248
 msgid "Galician"
 msgstr "Gallego"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Gujarati Language Team"
 msgstr "Grupo de traducción al Gujarati"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:249
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:250
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:178
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:255
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductores al georgiano de Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada Translation team"
 msgstr "Grupo de traducción al kannada"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
-#: ../pidgin/gtkdialogs.c:186
 msgid "Kurdish"
 msgstr "Kurdo"
 
-#: ../pidgin/gtkdialogs.c:187
 msgid "Lao"
 msgstr "Laosiano"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:260
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Nepali"
 msgstr "Nepalés"
 
-#: ../pidgin/gtkdialogs.c:194
 msgid "Dutch, Flemish"
 msgstr "Danés, Flamenco"
 
-#: ../pidgin/gtkdialogs.c:195
 msgid "Norwegian Nynorsk"
 msgstr "Noruego Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:196
+msgid "Occitan"
+msgstr "Occitano"
+
 msgid "Punjabi"
 msgstr "Punjabí"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:263
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"
 
-#: ../pidgin/gtkdialogs.c:202
 msgid "Pashto"
 msgstr "Afgano"
 
-#: ../pidgin/gtkdialogs.c:203
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
-#: ../pidgin/gtkdialogs.c:268
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:269
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:208
 msgid "Albanian"
 msgstr "Albanés"
 
-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:270 ../pidgin/gtkdialogs.c:271
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:272
-#: ../pidgin/gtkdialogs.c:273
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:214
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:274
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:217
 msgid "Urdu"
 msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:218
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:218
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:275
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:222
 msgid "Hong Kong Chinese"
 msgstr "Chino de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:276
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:230
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:361
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:397
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15687,57 +11386,43 @@ msgstr ""
 "completa de personas que han contribuido. Este programa se distribuye sin "
 "ninguna garantía.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:415
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin en irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:420
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../pidgin/gtkdialogs.c:435
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:450
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../pidgin/gtkdialogs.c:465
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"
 
-#: ../pidgin/gtkdialogs.c:480
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:495
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../pidgin/gtkdialogs.c:515
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../pidgin/gtkdialogs.c:533
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:888
-#: ../pidgin/gtkdialogs.c:969
 msgid "_Name"
 msgstr "_Nombre"
 
-#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
-#: ../pidgin/gtkdialogs.c:974
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: ../pidgin/gtkdialogs.c:901
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../pidgin/gtkdialogs.c:903
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
@@ -15745,36 +11430,28 @@ msgstr ""
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información."
 
-#: ../pidgin/gtkdialogs.c:993
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../pidgin/gtkdialogs.c:1015
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../pidgin/gtkdialogs.c:1016
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../pidgin/gtkdialogs.c:1038
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:1040
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkdialogs.c:1061
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../pidgin/gtkdialogs.c:1062
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15789,15 +11466,12 @@ msgstr[1] ""
 "Está a punto de borrar los contactos que contiene a %s y a otros %d amigos "
 "de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1109
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1112
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1143
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15806,15 +11480,12 @@ msgstr ""
 "Está a punto de fusionar el grupo llamado %s con el grupo llamado %s. ¿Desea "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1150
 msgid "Merge Groups"
 msgstr "Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1153
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1203
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15823,29 +11494,23 @@ msgstr ""
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1206
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1209
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1242
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1245
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1248
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1269
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15853,224 +11518,189 @@ msgid ""
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1272
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../pidgin/gtkdialogs.c:1275
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Pulse el botón derecho para ver más mensajes sin leer...\n"
 
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr "Cambiar estado:"
+msgid "_Change Status"
+msgstr "_Cambiar estado"
+
+msgid "Show Buddy _List"
+msgstr "Mostrar la _lista de amigos"
 
-#: ../pidgin/gtkdocklet.c:681
-msgid "Show Buddy List"
-msgstr "Mostrar la lista de amigos"
+msgid "_Unread Messages"
+msgstr "Mensajes _no leídos"
 
-#: ../pidgin/gtkdocklet.c:707
-msgid "New Message..."
+msgid "New _Message..."
 msgstr "Mensaje nuevo..."
 
-#: ../pidgin/gtkdocklet.c:722
-msgid "Mute Sounds"
-msgstr "Sin sonido"
+msgid "_Accounts"
+msgstr "Cuent_as"
+
+msgid "Plu_gins"
+msgstr "Co_mplementos"
+
+msgid "Pr_eferences"
+msgstr "Pr_eferencias"
+
+msgid "Mute _Sounds"
+msgstr "Sin s_onidos"
 
-#: ../pidgin/gtkdocklet.c:729
-msgid "Blink on New Message"
-msgstr "Parpadear con nuevo mensaje"
+msgid "_Blink on New Message"
+msgstr "_Parpadear con nuevo mensaje"
 
-#: ../pidgin/gtkdocklet.c:739
-msgid "Quit"
-msgstr "Salir"
+msgid "_Quit"
+msgstr "_Salir"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibiendo como:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibiendo de:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "No se ha configurado ninguna aplicación para abrir este tipo de archivo."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Se produjo un error al abrir el archivo."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Error al lanzar %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Error al ejecutar %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "El proceso devolvió el código de error %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Archivo local:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Tiempo transcurrido:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Tiempo restante:"
 
-#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias _terminen"
 
-#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Limpiar transferencias terminadas"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "_Detalles de la transferencia de archivos"
 
 #. Pause button
-#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:842
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"
 
-#: ../pidgin/gtkimhtml.c:867
 msgid "Disable _smileys in selected text"
 msgstr "Deshabilitar los emoticono_s en el texto seleccionado"
 
-#: ../pidgin/gtkimhtml.c:1430
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/gtkimhtml.c:1431
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../pidgin/gtkimhtml.c:1434
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../pidgin/gtkimhtml.c:1435
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratón esté encima."
 
-#: ../pidgin/gtkimhtml.c:1438 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Enviar color en mensajes con nombre"
 
-#: ../pidgin/gtkimhtml.c:1439
 msgid "Color to draw the name of a message you sent."
 msgstr "Color para dibujar el nombre en un mensaje que envíe."
 
-#: ../pidgin/gtkimhtml.c:1442 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Color en mensajes recibidos con nombre"
 
-#: ../pidgin/gtkimhtml.c:1443
 msgid "Color to draw the name of a message you received."
 msgstr "Color para dibujar el nombre de un mensaje que reciba."
 
-#: ../pidgin/gtkimhtml.c:1446
 msgid "\"Attention\" Name Color"
 msgstr "Color en nombre «atención»"
 
-#: ../pidgin/gtkimhtml.c:1447
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
 "Color con el que dibujar el nombre de un mensaje que haya recibido y que "
 "contenga su nombre."
 
-#: ../pidgin/gtkimhtml.c:1450 ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr "Color para mensajes de acciones con nombre"
 
-#: ../pidgin/gtkimhtml.c:1451
 msgid "Color to draw the name of an action message."
 msgstr "Color con el que dibujar el nombre de un mensaje de acción."
 
-#: ../pidgin/gtkimhtml.c:1460
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Nombre de color de mensajes de accción para mensajes susurrados"
+
+msgid "Whisper Message Name Color"
+msgstr "Susurrar nombre de color de mensajes"
+
 msgid "Typing notification color"
 msgstr "Color de notificación de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1461
 msgid "The color to use for the typing notification font"
 msgstr "Color a utilizar para la tipografía de notificación de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1464
 msgid "Typing notification font"
 msgstr "Tipografía de notificación de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1465
 msgid "The font to use for the typing notification"
 msgstr "Tipografía a utilizar para la notificación de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1468 ../pidgin/gtkimhtml.c:1469
 msgid "Enable typing notification"
 msgstr "Activar la notificación de tecleo"
 
-#: ../pidgin/gtkimhtml.c:1688
 msgid "_Copy Email Address"
 msgstr "_Copiar dirección de correo electrónico"
 
-#: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../pidgin/gtkimhtml.c:1710
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../pidgin/gtkimhtml.c:3482
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16080,7 +11710,6 @@ msgstr ""
 "\n"
 "Tomando PNG por omisión."
 
-#: ../pidgin/gtkimhtml.c:3485
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16090,7 +11719,6 @@ msgstr ""
 "\n"
 "Tomando PNG por omisión."
 
-#: ../pidgin/gtkimhtml.c:3514
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16102,7 +11730,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3517
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16113,35 +11740,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3598 ../pidgin/gtkimhtml.c:3610
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../pidgin/gtkimhtml.c:3638
+#, c-format
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:164
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Añadir emoticonos a medida..."
+
 msgid "Select Font"
 msgstr "Seleccionar tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Descripción"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -16149,164 +11773,137 @@ msgstr ""
 "Introduzca el URL y la descripción del enlace que quiere insertar. La "
 "descripción es opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1264
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No se pudo almacenar la imagen: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:712
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Se ha deshabilitado este emoticono porque hay un emoticono definido para "
+"este atajo de teclado:\\n\n"
+" %s"
+
 msgid "Smile!"
 msgstr "¡Sonría!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:763
+msgid "_Manage custom smileys"
+msgstr "_Gestionar emoticonos a medida"
+
 msgid "This theme has no available smileys."
 msgstr "Este tema no tiene emoticonos disponibles."
 
-#: ../pidgin/gtkimhtmltoolbar.c:847 ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Font"
 msgstr "_Tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Group Items"
 msgstr "Elementos de grupo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Ungroup Items"
 msgstr "Desagrupar items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
 msgid "Strikethrough"
 msgstr "Tachado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Increase Font Size"
 msgstr "Incrementa tamaño de tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Decrease Font Size"
 msgstr "Reducir tamaño de tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Font Face"
 msgstr "Estilo de tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Foreground Color"
 msgstr "Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Reset Formatting"
 msgstr "Limpiar formato"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert IM Image"
 msgstr "Insertar imagen MI"
 
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
-#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<b>_Bold</b>"
 msgstr "<b> Negrita</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<u>_Underline</u>"
 msgstr "<u>S_ubrayado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Tachado</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size=\"larger\">Más _grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>Más _pequeño</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "_Font face"
 msgstr "_Estilo de tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Foreground _color"
 msgstr "_Color del primer plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Bac_kground color"
 msgstr "Color del _fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1284
 msgid "_Horizontal rule"
 msgstr "Regla _horizontal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1306
 msgid "_Smile!"
 msgstr "¡_Sonría!"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Falló el borrado del registro"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Compruebe los permisos e inténtelo de nuevo."
 
-#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -16315,7 +11912,6 @@ msgstr ""
 "¿Está seguro que desea borrar de forma permanente el registro de la "
 "conversación con %s que empezó en %s?"
 
-#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -16324,7 +11920,6 @@ msgstr ""
 "¿Está seguro que desea borrar de forma permanente el registro de la "
 "conversación en %s que empezó en %s?"
 
-#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -16333,35 +11928,28 @@ msgstr ""
 "¿Está seguro que desea borrar de forma permanente el registro del sistema "
 "que comezó en %s?"
 
-#: ../pidgin/gtklog.c:323
 msgid "Delete Log?"
 msgstr "¿Borrar el registro?"
 
-#: ../pidgin/gtklog.c:334
 msgid "Delete Log..."
 msgstr "Borrar el registro..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span weight='bold' size='larger'>Conversación en %s de %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight='bold' size='larger'>Conversación con %s de %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Acceder a la carpeta de registros"
 
-#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Intente `%s -h' para más información.\n"
 
-#: ../pidgin/gtkmain.c:389
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16395,7 +11983,6 @@ msgstr ""
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#: ../pidgin/gtkmain.c:402
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16428,7 +12015,6 @@ msgstr ""
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#: ../pidgin/gtkmain.c:532
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16469,71 +12055,56 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:726 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:360
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
-#: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
 
-#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tiene %d mensaje nuevo."
 msgstr[1] "%s tiene %d nuevos mensajes."
 
-#: ../pidgin/gtknotify.c:599
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Tiene %d nuevo correo.</b>"
 msgstr[1] "<b>Tiene %d nuevos correos.</b>"
 
-#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador «%s» no es válida."
 
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1047
-#: ../pidgin/gtknotify.c:1060 ../pidgin/gtknotify.c:1197
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../pidgin/gtknotify.c:1045 ../pidgin/gtknotify.c:1058
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar «%s»: %s"
 
-#: ../pidgin/gtknotify.c:1198
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Se ha definido un navegador «Manual», pero no se ha definido ningún comando "
 "para ejecutarlo."
 
-#: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
 
-#: ../pidgin/gtkplugin.c:297
 msgid "Multiple plugins will be unloaded."
 msgstr "Se desactivarán múltiples complementos."
 
-#: ../pidgin/gtkplugin.c:301
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../pidgin/gtkplugin.c:318
 msgid "Could not unload plugin"
 msgstr "No se pudo descargar el complemente"
 
-#: ../pidgin/gtkplugin.c:319
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -16541,7 +12112,6 @@ msgstr ""
 "No se pudo descargar el complemento, se deshabilitará la próxima vez que "
 "arranque el programa."
 
-#: ../pidgin/gtkplugin.c:454
 #, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
@@ -16550,138 +12120,105 @@ msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\\n\n"
 "Compruebe el sitio web del complemento para obtener una actualización.</span>"
 
-#: ../pidgin/gtkplugin.c:583
 msgid "Author"
 msgstr "Autor"
 
-#: ../pidgin/gtkplugin.c:661
 msgid "<b>Written by:</b>"
 msgstr "<b>Escrito por:</b>"
 
-#: ../pidgin/gtkplugin.c:685
 msgid "<b>Web site:</b>"
 msgstr "<b>Sitio web:</b>"
 
-#: ../pidgin/gtkplugin.c:694
 msgid "<b>Filename:</b>"
 msgstr "<b>Nombre del fichero:</b>"
 
-#: ../pidgin/gtkplugin.c:720
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
 
-#: ../pidgin/gtkplugin.c:788
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles del complemento</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "A quién avisar"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "Se _conecta"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "Se _desconecta"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Se _ausenta"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_Deja de estar ausente"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Está _inactivo"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Ya no está i_nactivo."
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Empieza a _escribir"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Se _pausa mientras escribe"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Envía un _mensaje"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "_Notificación con una ventana emergente"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Re_producir un sonido"
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "Sólo _avisar cuando mi estado no sea Disponible"
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Recurrente"
 
-#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
-#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Falló el desempaque de tema de emoticonos"
 
-#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Instalar tema"
 
-#: ../pidgin/gtkprefs.c:646
 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."
@@ -16689,148 +12226,112 @@ msgstr ""
 "Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
 "instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."
 
-#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Icono"
 
-#: ../pidgin/gtkprefs.c:894
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: ../pidgin/gtkprefs.c:914
 msgid "Cl_ose conversations with the Escape key"
 msgstr "C_errrar las conversaciones con la tecla Esc"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "System Tray Icon"
 msgstr "Icono del área de notificación del sistema"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "_Show system tray icon:"
 msgstr "_Mostrar icono del área de notificación del sistema:"
 
-#: ../pidgin/gtkprefs.c:947
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
 
-#: ../pidgin/gtkprefs.c:953
 msgid "Conversation Window Hiding"
 msgstr "Ocultar ventana de conversación"
 
-#: ../pidgin/gtkprefs.c:954
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
 
-#: ../pidgin/gtkprefs.c:957 ../pidgin/gtkprefs.c:2075
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:965
 msgid "Tabs"
 msgstr "Solapas"
 
-#: ../pidgin/gtkprefs.c:967
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar MIs y chats en ventanas con _solapas"
 
-#: ../pidgin/gtkprefs.c:981
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botones de _cierre en las solapas"
 
-#: ../pidgin/gtkprefs.c:984
 msgid "_Placement:"
 msgstr "_Colocación:"
 
-#: ../pidgin/gtkprefs.c:986
 msgid "Top"
 msgstr "Arriba"
 
-#: ../pidgin/gtkprefs.c:987
 msgid "Bottom"
 msgstr "Abajo"
 
-#: ../pidgin/gtkprefs.c:988
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../pidgin/gtkprefs.c:989
 msgid "Right"
 msgstr "Derecha"
 
-#: ../pidgin/gtkprefs.c:991
 msgid "Left Vertical"
 msgstr "Vertical a la izquierda"
 
-#: ../pidgin/gtkprefs.c:992
 msgid "Right Vertical"
 msgstr "Vertical a la derecha"
 
-#: ../pidgin/gtkprefs.c:999
 msgid "N_ew conversations:"
 msgstr "_Nuevas conversaciones:"
 
-#: ../pidgin/gtkprefs.c:1048
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
-#: ../pidgin/gtkprefs.c:1050
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Cerrar MIs inmediatamente cuando se cierra la pestaña"
 
-#: ../pidgin/gtkprefs.c:1053
 msgid "Show _detailed information"
 msgstr "Mostrar información _detallada"
 
-#: ../pidgin/gtkprefs.c:1055
 msgid "Enable buddy ic_on animation"
 msgstr "Habilitar animaciones en los i_conos de amigos"
 
-#: ../pidgin/gtkprefs.c:1062
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar a los amigos cuando les esté escribiendo"
 
-#: ../pidgin/gtkprefs.c:1065
 msgid "Highlight _misspelled words"
 msgstr "_Resaltar las faltas de ortografía"
 
-#: ../pidgin/gtkprefs.c:1069
 msgid "Use smooth-scrolling"
 msgstr "Utilizar paginado suave"
 
-#: ../pidgin/gtkprefs.c:1072
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"
 
-#: ../pidgin/gtkprefs.c:1074
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar las nuevas ventana de conversación"
 
-#: ../pidgin/gtkprefs.c:1078
 msgid "Minimum input area height in lines:"
 msgstr "Altura mínima del área de entrada en líneas:"
 
-#: ../pidgin/gtkprefs.c:1084
 msgid "Font"
 msgstr "Tipografía"
 
-#: ../pidgin/gtkprefs.c:1086
 msgid "Use document font from _theme"
 msgstr "Utilizar la tipografía de documento del _tema"
 
-#: ../pidgin/gtkprefs.c:1088
 msgid "Use font from _theme"
 msgstr "Utilizar la tipografía del _tema"
 
-#: ../pidgin/gtkprefs.c:1094
 msgid "Conversation _font:"
 msgstr "Tipografía para las conversaciones:"
 
-#: ../pidgin/gtkprefs.c:1101
 msgid "Default Formatting"
 msgstr "Formato por omisión"
 
-#: ../pidgin/gtkprefs.c:1120
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16838,63 +12339,48 @@ msgstr ""
 "Así se verá el texto de los mensajes que envíe cuando utilice protocolos que "
 "soportan el formateo."
 
-#: ../pidgin/gtkprefs.c:1180
 msgid "Cannot start proxy configuration program."
 msgstr "No se pudo iniciar el programa de configuración de proxy."
 
-#: ../pidgin/gtkprefs.c:1192
 msgid "Cannot start browser configuration program."
 msgstr "No se pudo iniciar el programa de configuración del navegador."
 
-#: ../pidgin/gtkprefs.c:1212
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1224
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1228
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la dirección IP"
 
-#: ../pidgin/gtkprefs.c:1237
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../pidgin/gtkprefs.c:1268
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../pidgin/gtkprefs.c:1271
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activar reenvío de puertos automático"
 
-#: ../pidgin/gtkprefs.c:1274
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
 
-#: ../pidgin/gtkprefs.c:1277
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1284
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../pidgin/gtkprefs.c:1292
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy y navegador"
 
-#: ../pidgin/gtkprefs.c:1300
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>No se encontró el programa de configuración del proxy.</b>"
 
-#: ../pidgin/gtkprefs.c:1308
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>No se encontró el programa de configuración del navegador.</b>"
 
-#: ../pidgin/gtkprefs.c:1313
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16902,99 +12388,75 @@ msgstr ""
 "Puede configurar las preferencias del proxy y del navegador\n"
 "en las preferencias de GNOME."
 
-#: ../pidgin/gtkprefs.c:1320
 msgid "Configure _Proxy"
 msgstr "Configurar _proxy"
 
-#: ../pidgin/gtkprefs.c:1325
 msgid "Configure _Browser"
 msgstr "Configurar _navegador"
 
-#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1336
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkprefs.c:1392
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1480
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1481
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1482
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1483
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1484
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1485
 msgid "Desktop Default"
 msgstr "Valores por omisión del escritorio"
 
-#: ../pidgin/gtkprefs.c:1486
 msgid "GNOME Default"
 msgstr "Valores por omisión de Gnome"
 
-#: ../pidgin/gtkprefs.c:1487
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1488
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1489
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1490
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1499
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1560
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../pidgin/gtkprefs.c:1564
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1572
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../pidgin/gtkprefs.c:1574
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: ../pidgin/gtkprefs.c:1575
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../pidgin/gtkprefs.c:1577
 msgid "New tab"
 msgstr "Nueva solapa"
 
-#: ../pidgin/gtkprefs.c:1594
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -17003,63 +12465,54 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1620
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../pidgin/gtkprefs.c:1625
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantáneos"
 
-#: ../pidgin/gtkprefs.c:1627
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../pidgin/gtkprefs.c:1629
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../pidgin/gtkprefs.c:1779
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
-#: ../pidgin/gtkprefs.c:1789
+#, c-format
 msgid "Quietest"
 msgstr "El más silencioso"
 
-#: ../pidgin/gtkprefs.c:1791
+#, c-format
 msgid "Quieter"
 msgstr "Más silencioso"
 
-#: ../pidgin/gtkprefs.c:1793
+#, c-format
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../pidgin/gtkprefs.c:1797
+#, c-format
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1799
+#, c-format
 msgid "Louder"
 msgstr "Más ruidoso"
 
-#: ../pidgin/gtkprefs.c:1801
+#, c-format
 msgid "Loudest"
 msgstr "El más ruidoso"
 
-#: ../pidgin/gtkprefs.c:1864
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1866
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../pidgin/gtkprefs.c:1873
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../pidgin/gtkprefs.c:1886
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17068,280 +12521,265 @@ msgstr ""
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../pidgin/gtkprefs.c:1895
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversación obtiene el _foco"
 
-#: ../pidgin/gtkprefs.c:1897
 msgid "Enable sounds:"
 msgstr "Habilitar sonidos:"
 
-#: ../pidgin/gtkprefs.c:1914
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: ../pidgin/gtkprefs.c:1981
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:2058
+# Examinar puede ser también válido, comprobar, jfs.
+msgid "_Browse..."
+msgstr "_Navegar..."
+
+msgid "_Reset"
+msgstr "_Restablecer"
+
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../pidgin/gtkprefs.c:2063
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratón"
 
-#: ../pidgin/gtkprefs.c:2072
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
 
-#: ../pidgin/gtkprefs.c:2076
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2082
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:2084
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando esté _inactivo"
 
-#: ../pidgin/gtkprefs.c:2088
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"
 
-#: ../pidgin/gtkprefs.c:2095
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2108
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../pidgin/gtkprefs.c:2110
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi última _salida al empezar"
 
-#: ../pidgin/gtkprefs.c:2117
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../pidgin/gtkprefs.c:2146
 msgid "Interface"
 msgstr "Interfaz"
 
-#: ../pidgin/gtkprefs.c:2148
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../pidgin/gtkprefs.c:2155
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2159
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Permitir sólo a los usuarios en mi lista de amigos"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Permitir sólo a los siguientes usuarios"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Bloquear todos los usuarios"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Bloquear sólo los siguientes usuarios"
 
-#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Los cambios a la configuración de privacidad tienen efecto inmediatamente."
 
-#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Establecer privacidad para:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
 msgstr "Quitar to_do"
 
-#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Permitir al usuario"
 
-#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario al que le permita contactar con vd."
 
-#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Introduzca el nombre de usuario al que quiere permitir que contacte con vd."
 
-#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "¿Permitir a %s contactar con vd.?"
 
-#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "¿Está seguro que quiere permitir que %s le contacte?"
 
-#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Bloquear al usuario"
 
-#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Escriba un usuario a bloquear."
 
-#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduzca el nombre del grupo a bloquear."
 
-#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "¿Está seguro de que quiere bloquear a %s?"
 
-#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Obtener la lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Añadir chat"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "¿Está seguro que desea borrar los estados guardados y seleccionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Ya se está utilizando ese título. Debe elegir un título único."
 
-#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Diferente"
 
-#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunas cuentas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"
 
-#: ../pidgin/gtkstatusbox.c:688
+# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
+msgid "Custom Smiley"
+msgstr "Emoticono a medida"
+
+msgid "Duplicate Shortcut"
+msgstr "Atajo duplicado"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Ya existe un emoticono a medida para el atajo de teclado seleccionado. "
+"Especifique un atajo distinto."
+
+msgid "More Data needed"
+msgstr "Son necesarios más datos"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Indique un atajo para asociarlo al emoticono."
+
+msgid "Please select an image for the smiley."
+msgstr "Escoja una imagen para el emoticono."
+
+# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
+msgid "Edit Smiley"
+msgstr "Editar emoticono"
+
+msgid "Add Smiley"
+msgstr "Añadir emoticono"
+
+msgid "Smiley _Image"
+msgstr "Imagen de emoticono"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Ata_jos de emoticonos"
+
+msgid "Smiley"
+msgstr "Emoticono"
+
+msgid "Custom Smiley Manager"
+msgstr "Gestor de emoticonos a medida"
+
 msgid "Waiting for network connection"
 msgstr "Esperando la conexión a la red"
 
-#: ../pidgin/gtkstatusbox.c:1101
 msgid "New status..."
 msgstr "Nuevo estado..."
 
-#: ../pidgin/gtkstatusbox.c:1102
 msgid "Saved statuses..."
 msgstr "Estados guardados..."
 
-#: ../pidgin/gtkstatusbox.c:1737
 msgid "Status Selector"
 msgstr "Selector de estado"
 
-#: ../pidgin/gtkutils.c:685
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1475
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Se ha producido el siguiente error al cargar %s: %s"
 
-#: ../pidgin/gtkutils.c:1455 ../pidgin/gtkutils.c:1477
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../pidgin/gtkutils.c:1551
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1552
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -17350,12 +12788,9 @@ msgstr ""
 "%s no puede transferir una carpeta. Tendrá que enviar los archivos que "
 "contiene individualmente."
 
-#: ../pidgin/gtkutils.c:1586 ../pidgin/gtkutils.c:1598
-#: ../pidgin/gtkutils.c:1605
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: ../pidgin/gtkutils.c:1587
 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."
@@ -17363,23 +12798,18 @@ msgstr ""
 "Puede enviar esta imagen como una transferencia de archivo, introducirla en "
 "el mensaje, o usarla como icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1613
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: ../pidgin/gtkutils.c:1594 ../pidgin/gtkutils.c:1614
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: ../pidgin/gtkutils.c:1595 ../pidgin/gtkutils.c:1614
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"
 
-#: ../pidgin/gtkutils.c:1599
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "¿Desea establecerla como el icono de amigo para este usuario?"
 
-#: ../pidgin/gtkutils.c:1606
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -17387,7 +12817,6 @@ msgstr ""
 "Puede enviar esta imagen como una transferencia de archivo, o usarla como "
 "icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1607
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17400,11 +12829,9 @@ msgstr ""
 #. * 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:1666
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: ../pidgin/gtkutils.c:1666
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -17412,7 +12839,6 @@ msgstr ""
 "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
 "a lo que apunta el lanzador más que el lanzador en sí."
 
-#: ../pidgin/gtkutils.c:2404
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17423,111 +12849,86 @@ msgstr ""
 "<b>Tamaño de archivo:</b> %s\n"
 "<b>Tamaño de imagen:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2706
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "El fichero «%s» es demasiado grande para %s. Intente utilizar una imagen más "
 "pequeña.\n"
 
-#: ../pidgin/gtkutils.c:2708
 msgid "Icon Error"
 msgstr "Error en icono"
 
-#: ../pidgin/gtkutils.c:2709
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"
 
-#: ../pidgin/gtkutils.c:2809
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo «%s»: %s"
 
-#: ../pidgin/gtkutils.c:2858
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Se produjo un fallo al cargar la imagen «%s»: razón desconocida, "
-"posiblemente se trata de un archivo de imagen dañado"
+"Se produjo un fallo al cargar la imagen «%s»: razón desconocida, posiblemente "
+"se trata de un archivo de imagen dañado"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Guardar archivo"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Seleccionar el color"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Apodo:"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Cerrar _solapas"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "Obtener _información"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Invitar"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Abrir correo"
 
-#: ../pidgin/pidgintooltip.c:100
 msgid "Pidgin Tooltip"
 msgstr "Consejos de Pidgin"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Emoticonos de Pidgin"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Pinguinos bonitos"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Si selecciona esta opción deshabilitará los emoticonos gráficos."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "ninguno"
 
-#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Probabilidad de respuesta"
 
-#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Configuración de estadísticas"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Tiempo de espera máximo para respuestas:"
 
-#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
-#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Diferencia máxima de «visto por última vez»:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Umbral:"
 
@@ -17537,47 +12938,37 @@ msgstr "Umbral:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "Predicción de disponibilidad de contactos"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predicción de disponibilidad de contactos."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Muestra información estadística de la disponibilidad de sus amigos"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "El amigo está inactivo"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "El amigo está ausente"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "El amigo está en ausencia «extendida»"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "El amigo está móvil"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "El amigo está desconectado"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Valores a utilizar cuando..."
 
-#: ../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"
@@ -17585,11 +12976,9 @@ msgstr ""
 "El amigo con el <i>mayor marcador</i> es el que tendrá prioridad en el "
 "contacto.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Usar el último amigo cuando los marcadores sean iguales"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Valores a utilizar para la cuenta..."
 
@@ -17599,14 +12988,12 @@ msgstr "Valores a utilizar para la cuenta..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioridad del contacto"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -17614,7 +13001,6 @@ msgstr ""
 "amigos."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -17622,61 +13008,47 @@ msgstr ""
 "Permite cambiar los puntos asignados a los estados inactivo/ausente/no "
 "disponible para los amigos en cálculos de prioridades de contacto."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Colores de conversación"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Personaliza los colores de la ventana de conversación"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Mensajes de error"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Mensajes resaltados"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Mensaje del sistema"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Mensajes enviados"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Mensajes recibidos"
 
-#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar el color para %s"
 
-#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Ignorar formato entrante"
 
-#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Aplicar en los chats"
 
-#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Aplicar en los MIs"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Por número de conversaciones"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Localización de la conversación"
 
 #. 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\"."
@@ -17684,11 +13056,9 @@ msgstr ""
 "Nota: La opción para «Nuevas conversaciones» debe fijarse «Por número de "
 "conversaciones»."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Número de conversaciones por ventana"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separar ventanas de MIs y chats cuando se ubican por número"
 
@@ -17698,19 +13068,16 @@ msgstr "Separar ventanas de MIs y chats cuando se ubican por número"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "_UbicaciónExt"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Opciones adicionales de ubicación de conversaciones."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -17719,20 +13086,16 @@ msgstr ""
 "utilizar ventanas distintas para MIs y Chats"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configuración de los gestos con el ratón"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Botón central del ratón"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Botón derecho del ratón"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "Mostrar gestos _visuales"
 
@@ -17742,19 +13105,16 @@ msgstr "Mostrar gestos _visuales"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Gestos con el ratón"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Proporciona soporte para gestos con el ratón"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -17763,41 +13123,33 @@ msgid ""
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "Añade soporte de gestos del ratón en las ventanas de conversación.\n"
-"Arrastre con el botón central del ratón para realizar las siguientes acciones:\n"
+"Arrastre con el botón central del ratón para realizar las siguientes "
+"acciones:\n"
 " • Abajo y después a la derecha para cerrar una ventana de conversación.\n"
 " • Arriba y después a la izquierda para cambiar a la conversación anterior.\n"
 " • Arriba y después a la derecha para cambiar a la siguiente conversación."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Mensajería Instantáneos"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccione una persona de su agenda mostrada abajo, o añada una nueva "
 "persona."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Nueva persona"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -17806,43 +13158,33 @@ msgstr ""
 "nueva persona."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalles del usuario"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Asociar amigo"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:242
-#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send email"
 msgstr "No se pudo enviar el correo electrónico"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "No se encontró el ejecutable de Evolution en la ruta."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An email address was not found for this buddy."
 msgstr "No se ha encontrado una dirección de correo para este amigo."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Añadir a la agenda"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send Email"
 msgstr "Enviar correo electrónico"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Configuración de la integración con Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleccione todas las cuentas a los que los amigos se añadirán de forma "
@@ -17854,7 +13196,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Integración con Evolution"
 
@@ -17862,37 +13203,30 @@ msgstr "Integración con Evolution"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Introduzca la información de la persona a continuación."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's username and account type below."
-msgstr "Introduzca a continuación el nombre de usuario de su amigo y el tipo de cuenta."
+msgstr ""
+"Introduzca a continuación el nombre de usuario de su amigo y el tipo de "
+"cuenta."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo de cuenta:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "Información opcional:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "Nombre:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "Apellidos:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "Email:"
 msgstr "Correo electrónico:"
 
@@ -17902,7 +13236,6 @@ msgstr "Correo electrónico:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Prueba de señales GTK"
 
@@ -17910,14 +13243,11 @@ msgstr "Prueba de señales GTK"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 "Probar para ver si todas las señales de la interfaz de usuario funcionan "
 "correctamente."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17926,7 +13256,6 @@ msgstr ""
 "\n"
 "<b>Nota de amigo:</b> %s"
 
-#: ../pidgin/plugins/history.c:201
 msgid "History"
 msgstr "Histórico"
 
@@ -17937,7 +13266,6 @@ msgstr "Histórico"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Iconizar en ausencia"
 
@@ -17945,51 +13273,40 @@ msgstr "Iconizar en ausencia"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
 "Iconiza la lista de amigos y de conversaciones cuando usted está ausente."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Comprobador de correo"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Comprueba si hay correo local nuevo."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Añade una pequeña caja a la lista de amigos que muestra si tiene nuevo "
 "correo."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Subrayado"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr ""
 "Dibuja una línea para indicar que hay nuevos mensajes en una conversación."
 
-#: ../pidgin/plugins/markerline.c:240
 msgid "Jump to markerline"
 msgstr "Saltar al subrayado"
 
-#: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "Dibujar línea de marcador en "
 
-#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "Ventanas de M_I"
 
-#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "Ventanas de _chat"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -17997,36 +13314,28 @@ msgstr ""
 "Se ha solicitado una sesión de mensajería musical. Por favor, seleccione el "
 "icono de MM para aceptarla."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Se ha confirmado la sesión de mensajería musical."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Mensajería musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Se ha producido un conflicto al ejecutar la orden:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Error al ejecutar el editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Ha ocurrido el siguiente error:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configuración de Mensajes de música"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Ruta del editor de partituras"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -18038,12 +13347,10 @@ msgstr "_Aplicar"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Complemento de mensajería musical para composición colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 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."
@@ -18053,79 +13360,63 @@ msgstr ""
 "tiempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:689
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: ../pidgin/plugins/notify.c:708
 msgid "\t_Only when someone says your username"
 msgstr "\t_Sólo si alguien menciona su nombre de usuario"
 
-#: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
 msgstr "Ventanas _enfocadas"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:726
 msgid "Notification Methods"
 msgstr "Métodos de notificación"
 
-#: ../pidgin/plugins/notify.c:733
 msgid "Prepend _string into window title:"
 msgstr "Prefijar la _cadena en el título de la ventana:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:752
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar el _número de mensajes nuevos en el título de la ventana"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:761
 msgid "Insert count of new message into _X property"
 msgstr "Insertar el número de mensajes nuevos en la propiedad _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:769
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista «_URGENTE» del gestor de ventanas"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
 msgstr "_Subir la ventana de conversación"
 
 #. Present conversation method button
-#: ../pidgin/plugins/notify.c:786
 msgid "_Present conversation window"
 msgstr "_Mostrar la ventana de conversación"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:794
 msgid "Notification Removal"
 msgstr "Eliminación de la notificación"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:799
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cuando la ventana de la conversación obtiene el _foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:806
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversación _recibe una pulsación"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:814
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _escriba en la ventana de la conversación"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:822
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cuando se envíe un _mensaje"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:831
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar al cambiar de _solapa de conversación"
 
@@ -18135,7 +13426,6 @@ msgstr "Eliminar al cambiar de _solapa de conversación"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:924
 msgid "Message Notification"
 msgstr "Notificación de mensajes"
 
@@ -18143,7 +13433,6 @@ msgstr "Notificación de mensajes"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:927 ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -18154,19 +13443,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Complemento de demostración de Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un ejemplo de complemento que hace cosas - consulte la descripción."
 
 #. *  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"
@@ -18179,56 +13465,44 @@ msgstr ""
 "- Envía un mensaje a las personas en su lista inmediatamente cuando se "
 "conectan"
 
-#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Color del puntero"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Color secundario del puntero"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Color para mensajes resaltados por nombre"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separación horizontal GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Entrada de conversaciones"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Diálogo de solicitud"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Diálogo de notificación"
 
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Seleccionar el color"
 
-#: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Seleccionar tipografía de la interfaz"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipografía para %s"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "Tipografía de la interfaz GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
@@ -18252,50 +13526,39 @@ msgstr "Tema de atajos de teclado GTK+"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Colores de la interfaz"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Tamaño de los controles"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Tipografía"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Herramientas de ficheros Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Escribir la configuración en %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Volver a leer archivos de configuración gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de tema GTK+ de Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 "Da acceso a los parámetros de configuración de gtkrc que se utilizan "
 "habitualmente."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "En bruto"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Le permite enviar datos en bruto a protocolos basados en texto."
 
-#: ../pidgin/plugins/raw.c:178
 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."
@@ -18304,7 +13567,6 @@ msgstr ""
 "IRC,  TOC). Pulse «Intro» en la caja de entrada para enviarlo. Observe la "
 "ventana de depuración."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -18313,12 +13575,10 @@ msgstr ""
 "Usted está utilizado %s, versión %s. La versión actual es %s. Puede "
 "obtenerla de <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Registro de cambios:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nueva versión disponible"
 
@@ -18328,19 +13588,16 @@ msgstr "Nueva versión disponible"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notificación de versiones"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Comprueba periódicamente la existencia de nuevas versiones."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -18356,87 +13613,70 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/sendbutton.c:138
 msgid "Send Button"
 msgstr "Botón «enviar»"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/sendbutton.c:140
 msgid "Conversation Window Send Button."
 msgstr "Botón «enviar» de la ventana de conversación."
 
 #. *< summary
-#: ../pidgin/plugins/sendbutton.c:141
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for when no physical keyboard is present."
-msgstr "Añade un botón «Enviar» al área de entrada de datos de la ventana de conversación. Útil para cuando no hay un teclado físico disponible."
+msgstr ""
+"Añade un botón «Enviar» al área de entrada de datos de la ventana de "
+"conversación. Útil para cuando no hay un teclado físico disponible."
 
-#: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "Corrección duplicada"
 
-#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "La palabra específica ya existe en la lista de corrección."
 
-#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "Reemplazos de texto"
 
-#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "Usted escribe"
 
-#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "Usted envía"
 
-#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "Solamente palabras enteras"
 
-#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "Distingue mayúsculas de minúsculas"
 
-#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "Añadir una regla nueva de reemplazo de texto"
 
-#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "Usted _escribe:"
 
-#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "Usted _envía:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2296
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Ajustar al formato _exacto (desmarcar para gestionar mayúsculas y minúsculas "
 "automáticamente)"
 
-#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "Reemplazar solamente palabras _enteras"
 
-#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "Opciones de reemplazos de texto general"
 
-#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "Habilitar la sustitución de la última palabra al enviar"
 
-#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "Reemplazo de texto"
 
-#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Reemplaza el texto de los mensajes salientes según las reglas definidas por "
@@ -18448,7 +13688,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Deslizante de amigos"
 
@@ -18456,11 +13695,9 @@ msgstr "Deslizante de amigos"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versión horizontal deslizante de la lista de amigos."
 
-#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Mostrar marcas de tiempo cada"
 
@@ -18470,50 +13707,39 @@ msgstr "Mostrar marcas de tiempo cada"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Marca temporal"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Mostrar marcas de tiempo al estilo iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Mostrar una marca de tiempo al estilo iChat cada N minutos."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Opciones de formato de marca de tiempo"
 
 # JFS: Is this complete? REVIEW
-#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Forzar formato de tiempo de 24 horas"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Mostrar las fechas en..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Co_nversaciones:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Para mensajes diferidos"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Para mensajes diferidos y para chats"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Registro de _mensajes:"
 
@@ -18523,19 +13749,16 @@ msgstr "Registro de _mensajes:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Formatos de marca de tiempo de mensajes"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Configura el formato de la marca de tiempo de mensajes."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -18543,44 +13766,32 @@ msgstr ""
 "Este complemento permite al usuario configurar los formatos de marca de "
 "tiempo para los mensajes en conversaciones y guardados en el registro."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacidad:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Ventanas de conversación de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparencia de las ventanas de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante en la ventana MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Eliminar la transparencia de las ventanas MI al enfocar"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Siempre en primer plano"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Ventana de la lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparencia de la ventana de lista de _amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
 "Eliminar la transparencia de la ventana de lista de amigos cuando se enfoca"
@@ -18591,19 +13802,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para la lista de amigos y las conversaciones."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -18615,55 +13823,44 @@ msgstr ""
 "\n"
 "* Nota: Este complemento requiere Win2000 o superior."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Versión en ejecución de GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Iniciar %s al iniciar Windows"
 
 # Usar empotrable? (jfs)
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable "
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Mantener la ventana de lista de amigos por encima del resto"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Solamente cuando se apile"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Destello de ventana cuando se reciben mensajes de chat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opciones de Pidgwin en Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opciones específicas de %s para Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Contiene las opciones específicas al Pidgin de Windows como el apilado de la "
 "lista de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconectado.</font>"
 
@@ -18673,49 +13870,80 @@ msgstr "<font color='#777777'>Desconectado.</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Consola XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Cuenta: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>No conectado a XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Introducir una entrada <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Introducir una entrada <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Insertar una entrada <messag/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Enviar y recibir entradas XMPP en crudo."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Código [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Error de operación de grupo"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "Error al establecer las opciones del socket"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Autenticación Windows Live ID: no se encontró el token de autenticación "
+#~ "en la respuesta del servidor"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "¡Falló la autenticación Windows Live!"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "Demasiado malvado (remitente)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Demasiado malvado (destinatario)"
+
+#~ msgid "Available Message"
+#~ msgstr "Mensajes disponibles"
+
+#~ msgid "Away Message"
+#~ msgstr "Mensajes de ausencia"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(obteniendo)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Error al solicitar un testigo de conexión"
+
+#~ msgid "TCP Address"
+#~ msgstr "Dirección TCP"
+
+#~ msgid "UDP Address"
+#~ msgstr "Dirección UDP"
+
 #~ msgid "Screen name:"
 #~ msgstr "Nombre de usuario:"
 
-#~ msgid "Screen Name"
-#~ msgstr "Nombre de usuario"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Alguien dice su nombre de usuario en el chat"
 
@@ -18880,9 +14108,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "_Send To"
 #~ msgstr "_Enviar a"
 
-#~ msgid "_Smiley"
-#~ msgstr "_Emoticono"
-
 #~ msgid "Conversation History"
 #~ msgstr "Historial de conversaciones"
 
@@ -19110,9 +14335,9 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "automática global en el diálogo de las opciones del complemento. Si "
 #~ "quiere establecer mensajes de respuesta particulares para un amigo sólo "
 #~ "tiene que pulsar con el botón derecho sobre el amigo en la ventana con la "
-#~ "lista de amigos. Vaya a la pestaña «Avanzadas» en el diálogo de edición "
-#~ "de cuentas si quiere configurar un mensaje de respuesta automática para "
-#~ "sólo alguna de sus cuentas."
+#~ "lista de amigos. Vaya a la pestaña «Avanzadas» en el diálogo de edición de "
+#~ "cuentas si quiere configurar un mensaje de respuesta automática para sólo "
+#~ "alguna de sus cuentas."
 
 #~ msgid "Set autoreply message for %s"
 #~ msgstr "Fijar el mensaje de respuesta automática para %s"
@@ -20258,9 +15483,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Away m_essage:"
 #~ msgstr "_Mensaje de ausencia:"
 
-#~ msgid "Quit message"
-#~ msgstr "Mensaje de salida"
-
 #~ msgid "Restore Away State On Reconnect"
 #~ msgstr "Restaurar el estado de ausencia al reconectarse"
 
@@ -20423,8 +15645,7 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Enviar un MI a un nombre de usuario:\n"
 #~ "\tgaim-remote uri 'aim:goim?screenname=Pingüino&message=hola+mundo'\n"
 #~ "En este caso, «Pingüino» es el nombre de usuario al que se le quiere\n"
-#~ "enviar un MI, y «hola mundo» es el mensaje a enviar. Se debe utilizar "
-#~ "'+'\n"
+#~ "enviar un MI, y «hola mundo» es el mensaje a enviar. Se debe utilizar '+'\n"
 #~ "en lugar de los espacios en blanco.\n"
 #~ "Por favor, tenga en cuenta el entrecomillado utilizado arriba. Si "
 #~ "ejecuta\n"
@@ -20467,9 +15688,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Show fewer options"
 #~ msgstr "Mostrar menos opciones"
 
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Herramientas/_Ausentarse"
-
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/Herramientas/Acciones del com_plemento"
 
@@ -21214,9 +16432,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "_Browse"
 #~ msgstr "_Navegador"
 
-#~ msgid "_Reset"
-#~ msgstr "_Restablecer"
-
 #~ msgid "Show IMs and chats in _same tabbed window"
 #~ msgstr "Mo_strar MIs y chats en la misma ventana con solapas."
 
diff --git a/po/et.po b/po/et.po
index 6d596bfc53..b3c9c3c59f 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 2.3.1\n"
+"Project-Id-Version: pidgin 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-19 03:21-0500\n"
-"PO-Revision-Date: 2008-02-19 23:58+0200\n"
+"POT-Creation-Date: 2008-08-15 11:07-0400\n"
+"PO-Revision-Date: 2008-08-06 11:19+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,13 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Täpsemate andmete saamiseks kasuta `%s -h'.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -52,7 +48,6 @@ msgstr ""
 "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
 "                         lõpetamine\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:743
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -63,253 +58,104 @@ msgstr ""
 "tekkinud olukorda ja vii migreerumine käsitsi lõpule. Samuti palun teata "
 "sellest veast aadressile http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:574
-#: ../finch/gntblist.c:710 ../finch/gntblist.c:723 ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Viga"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Konto jäi lisamata"
 
-#: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
-msgstr "Konto ekraaninimi ei tohi tühi olla."
+msgid "Username of an account must be non-empty."
+msgstr "Konto kasutajanimi ei tohi tühi olla."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Uutest sõnumitest antakse teada"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Parooli peetakse meeles"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Protokollide pluginaid pole paigaldatud."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Ilmselt unustasid sa käsu 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4541
 msgid "Modify Account"
 msgstr "Muuda kontot"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Uus konto"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
-msgid "Screen name:"
-msgstr "Ekraaninimi:"
+msgid "Username:"
+msgstr "Kasutajanimi:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Selle konto loomine serverisse"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:620 ../finch/gntblist.c:698
-#: ../finch/gntblist.c:733 ../finch/gntblist.c:1077 ../finch/gntblist.c:1303
-#: ../finch/gntblist.c:1437 ../finch/gntblist.c:2602 ../finch/gntblist.c:2651
-#: ../finch/gntblist.c:2715 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1059 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
-#: ../libpurple/account.c:1116 ../libpurple/account.c:1419
-#: ../libpurple/account.c:1454 ../libpurple/conversation.c:1219
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
-#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
-#: ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:730
-#: ../libpurple/protocols/jabber/buddy.c:2430
-#: ../libpurple/protocols/jabber/buddy.c:2466
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1777
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/jabber/usermood.c:202
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359 ../libpurple/protocols/msnp9/msn.c:284
-#: ../libpurple/protocols/msnp9/msn.c:301
-#: ../libpurple/protocols/msnp9/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:356
-#: ../libpurple/protocols/myspace/user.c:582
-#: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6197
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:120
-#: ../libpurple/protocols/qq/group_opt.c:375
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3438
-#: ../libpurple/protocols/sametime/sametime.c:3524
-#: ../libpurple/protocols/sametime/sametime.c:3698
-#: ../libpurple/protocols/sametime/sametime.c:5451
-#: ../libpurple/protocols/sametime/sametime.c:5541
-#: ../libpurple/protocols/sametime/sametime.c:5666
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/silc.c:966
-#: ../libpurple/protocols/silc/silc.c:1174
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:742
-#: ../libpurple/protocols/silc10/silc.c:948
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3535
-#: ../libpurple/protocols/yahoo/yahoo.c:3546 ../pidgin/gtkaccount.c:1841
-#: ../pidgin/gtkaccount.c:2400 ../pidgin/gtkblist.c:6767
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:765
-#: ../pidgin/gtkdialogs.c:904 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1016 ../pidgin/gtkdialogs.c:1040
-#: ../pidgin/gtkdialogs.c:1062 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1151 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1246 ../pidgin/gtkdialogs.c:1273
-#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
 msgstr "Loobu"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1056 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1453 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:729 ../pidgin/gtkdebug.c:746
-#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Salvesta"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Kas sa soovid kustutada kontot %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Konto kustutamine"
 
 #. Delete button
-#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2259 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Kontod"
 
-#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Selles nimekirjas on võimalik kontosid lubada ja keelata."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
-#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2819
-#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5540
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2399
-#: ../pidgin/gtkblist.c:6766 ../pidgin/gtkconv.c:1702
-#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Lisa"
 
 #. Modify button
-#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Muuda"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2346
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s määras kasutaja %s oma sõbraks%s%s"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2398
 msgid "Add buddy to your list?"
 msgstr "Kas lisada sõber sinu nimekirja?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2456
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s soovib kasutaja %s lisada oma sõbranimekirja%s%s"
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2479
-#: ../pidgin/gtkaccount.c:2486
 msgid "Authorize buddy?"
 msgstr "Kas autoriseerida sõber?"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2480 ../pidgin/gtkaccount.c:2487
 msgid "Authorize"
 msgstr "Autoriseeri"
 
-#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2481 ../pidgin/gtkaccount.c:2488
 msgid "Deny"
 msgstr "Keela"
 
-#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -318,12 +164,10 @@ msgstr ""
 "Ühendunuid: %d\n"
 "Kokku: %d"
 
-#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
@@ -332,478 +176,281 @@ msgstr ""
 "\n"
 "Viimati nähtud: %s tagasi"
 
-#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../finch/gntblist.c:563
-msgid "You must provide a screename for the buddy."
-msgstr "Sa pead sõbrale ekraaninime määrama."
+msgid "You must provide a username for the buddy."
+msgstr "Sa pead sõbrale kasutajanime määrama."
 
-#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "Sa pead grupi määrama."
 
-#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "Sa pead konto valima."
 
-#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "Valitud konto pole hetkel võrgus."
 
-#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "Viga sõbra lisamisel"
 
-#: ../finch/gntblist.c:601 ../libpurple/protocols/oscar/oscar.c:2949
-#: ../pidgin/gtkaccount.c:1914 ../pidgin/gtksavedstatuses.c:971
-msgid "Screen Name"
-msgstr "Ekraaninimi"
+msgid "Username"
+msgstr "Kasutajanimi"
 
-#: ../finch/gntblist.c:604
 msgid "Alias (optional)"
 msgstr "Alias (valikuline)"
 
-#: ../finch/gntblist.c:607
 msgid "Add in group"
-msgstr ""
+msgstr "Lisa gruppi"
 
-#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
-#: ../finch/gntblist.c:2583 ../finch/gntblist.c:2637 ../finch/gntblist.c:2702
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3200 ../pidgin/gtknotify.c:517
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3380 ../pidgin/gtkblist.c:6297
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Sõbra lisamine"
 
-#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "Palun sisesta sõbra andmed."
 
-#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Jututoad"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:684 ../finch/gntblist.c:2578 ../finch/gntblist.c:2632
-#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1596
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
-#: ../pidgin/gtkroomlist.c:749
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nimi"
 
-#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
-#: ../libpurple/protocols/msn/msn.c:1559
-#: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1015
-#: ../pidgin/gtkdialogs.c:1039 ../pidgin/gtkdialogs.c:1061
-#: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
 msgid "Group"
 msgstr "Grupp"
 
-#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "Automaatühendumine"
 
-#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6680
 msgid "Add Chat"
 msgstr "Vestluse lisamine"
 
-#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
 msgstr "Ülejäänud andmeid on sul võimalik hiljem kontekstimenüüst muuta."
 
-#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "Viga grupi lisamisel"
 
-#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "Sa pead lisatavale grupile nime määrama."
 
-#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "Selle nimega grupp on juba olemas."
 
-#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
-#: ../libpurple/protocols/sametime/sametime.c:5450
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtkblist.c:6763
 msgid "Add Group"
 msgstr "Grupi lisamine"
 
-#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "Sisesta grupi nimi"
 
-#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr ""
 
-#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "Palun uuenda tarvilikud väljad."
 
-#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Redigeeri"
 
-#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "Sätete redigeerimine"
 
-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Andmed"
 
-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "Vastuvõtmine..."
 
-#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:903
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hangi andmeid"
 
-#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "Sõbramärguande lisamine"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1650
 msgid "Send File"
 msgstr "Saada fail"
 
-#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:660 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "Blokitud"
 
-#: ../finch/gntblist.c:1216 ../finch/gntblist.c:1605
 msgid "View Log"
 msgstr "Logi vaatamine"
 
-#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Palun sisesta %s jaoks uus nimi"
 
-#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "Nime muutmine"
 
-#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "Määra alias"
 
-#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "Nime algkuju määramiseks sisesta tühi string."
 
-#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Selle kontakti eemaldamisel kaovad ära ka kõik selle kontakti sõbrad"
 
-#: ../finch/gntblist.c:1423
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "Selle grupi eemaldamisel kaovad ära ka kõik selles grupis olevad sõbrad"
 
-#: ../finch/gntblist.c:1428
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Kas sa soovid eemaldada kontot %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "Eemaldamiskinnitus"
 
-#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1699 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "Eemalda"
 
 #. Buddy List
-#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2876 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5036
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Sõbranimekiri"
 
-#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr ""
 
-#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1251
-#: ../libpurple/protocols/jabber/buddy.c:2221
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/jabber.c:992
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1618
-#: ../libpurple/protocols/jabber/jabber.c:1632
-#: ../libpurple/protocols/jabber/jabber.c:1646
-#: ../libpurple/protocols/jabber/jabber.c:1660
-#: ../libpurple/protocols/msn/msn.c:1567 ../libpurple/protocols/msn/msn.c:1743
-#: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1599
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3224
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:789
-#: ../libpurple/protocols/jabber/buddy.c:953
-#: ../libpurple/protocols/msn/msn.c:607 ../libpurple/protocols/msn/msn.c:625
-#: ../libpurple/protocols/msn/msn.c:633 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:541
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2973
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3252
-#: ../pidgin/gtkblist.c:3702 ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "Jõude"
 
-#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr ""
 
-#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Uus..."
 
-#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Salvestatud..."
 
-#: ../finch/gntblist.c:2437 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:601
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: ../finch/gntblist.c:2591 ../finch/gntblist.c:2596
 msgid "Block/Unblock"
 msgstr "Bloki/Eemalda blokk"
 
-#: ../finch/gntblist.c:2592 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloki"
 
-#: ../finch/gntblist.c:2593 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Võta blokeering maha"
 
-#: ../finch/gntblist.c:2598
 msgid ""
-"Please enter the screen name or alias of the person you would like to Block/"
+"Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Palun sisesta isiku ekraaninimi või alias, keda sa soovid blokkida või "
+"Palun sisesta isiku kasutajanimi või alias, keda sa soovid blokkida või "
 "kellelt sa soovid blokki eemaldada."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
-#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1115
-#: ../libpurple/account.c:1418 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1776
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/msnp9/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:300
-#: ../libpurple/protocols/msnp9/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:334
-#: ../libpurple/protocols/myspace/user.c:581
-#: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6196
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1909
-#: ../libpurple/protocols/silc10/silc.c:741
-#: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3534
-#: ../libpurple/protocols/yahoo/yahoo.c:3545 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:903
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "Olgu"
 
-#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:759
 msgid "New Instant Message"
 msgstr "Uus välksõnum"
 
-#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:761
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Palun sisesta isiku ekraaninimi või alias, kellega soovid välksõnumeid "
+"Palun sisesta isiku kasutajanimi või alias, kellega soovid välksõnumeid "
 "vahetada."
 
-#: ../finch/gntblist.c:2698
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
 msgid "Join a Chat"
 msgstr "Vestlusega ühinemine"
 
-#: ../finch/gntblist.c:2712
 msgid "Please enter the name of the chat you want to join."
 msgstr "Palun sisesta vestluse nimi, millega soovid ühineda."
 
-#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Ühine"
 
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Palun sisesta isiku kasutajanimi või alias, kelle logi sa soovid vaadata."
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Valikud"
 
-#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "Saada välksõnum..."
 
-#: ../finch/gntblist.c:2770
 msgid "Block/Unblock..."
 msgstr "Bloki/Eemalda blokk..."
 
-#: ../finch/gntblist.c:2775
 msgid "Join Chat..."
 msgstr "Ühine vestlusega..."
 
-#: ../finch/gntblist.c:2780
+msgid "View Log..."
+msgstr "Vaata logi..."
+
+msgid "View All Logs"
+msgstr "Kõikide logide vaatamine"
+
 msgid "Show"
 msgstr "Näita"
 
-#: ../finch/gntblist.c:2785
 msgid "Empty groups"
 msgstr "Tühje gruppe"
 
-#: ../finch/gntblist.c:2792
 msgid "Offline buddies"
 msgstr "Ühendamata sõpru"
 
-#: ../finch/gntblist.c:2799
 msgid "Sort"
 msgstr "Sordi"
 
-#: ../finch/gntblist.c:2804
 msgid "By Status"
 msgstr "Oleku järgi"
 
-#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4193
 msgid "Alphabetically"
 msgstr "Tähestikuliselt"
 
-#: ../finch/gntblist.c:2814
 msgid "By Log Size"
 msgstr "Logi suuruse järgi"
 
-#: ../finch/gntblist.c:2825
 msgid "Buddy"
 msgstr "Sõber"
 
-#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:647
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Vestlus"
 
-#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Grupeerimine"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Sertifikaadi importimine"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Hostinime määramine"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Sisesta hostinimi, mille kohta see sertifikaat mõeldud on."
 
-#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -812,19 +459,15 @@ msgstr ""
 "Faili %s pole võimalik importida.\n"
 "Veendu, et fail on loetav ja et see on PEM-vormingus.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Sertifikaadi importimise viga"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Tõrge X.509 sertifikaadi importimisel"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "PEM-vormingus sertifikaadi valimine"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -833,24 +476,19 @@ msgstr ""
 "Tõrge faili %s eksportimisel.\n"
 "Veendu, et sul on lubatud sihtkohta kirjutada\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Sertifikaadi eksportimise viga"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Tõrge X.509 sertifikaadi eksportimisel"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 sertifikaadi eksportimine"
 
-#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "\"%s\" sertifikaat"
 
-#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -863,57 +501,38 @@ msgstr ""
 "SHA1-sõrmejälg:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "SSL-hosti sertifikaat"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Kas kustutada \"%s\" sertifikaat?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Sertifikaadi kustutamise kinnitus"
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Sertifikaadihaldur"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
-#: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Hostinimi"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1678
-#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Andmed"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:403 ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2373
-#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Sulge"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s katkestas ühenduse"
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -926,11 +545,9 @@ msgstr ""
 "Finch ei proovi kontot automaatselt ühendada enne, kui sa pole viga "
 "kõrvaldanud ja kontot uuesti kasutusele võtnud."
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Konto taaslubamine"
 
-#: ../finch/gntconn.c:156
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
@@ -938,45 +555,35 @@ msgstr ""
 "Konto ühendus on katkenud ja sa pole enam selle vestluse osaline. Konto "
 "taasühendamisel ühendatakse sina ka automaatselt selle vestlusega."
 
-#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "Sellist käsku pole."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Süntaksi viga:  Sa sisestasid selle käsule vale arvu argumente."
 
-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Tõrge sinu käsu täitmisel, tõrke põhjus on teadmata."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "See käsk toimib ainult vestlustes, välksõnumites aga mitte."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "See käsk toimib ainult välksõnumites, vestlustes aga mitte."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "See käsk ei toimi selle protokolliga."
 
-#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
-msgstr "Sõnumit ei saadetud kuna sa pole sisse logitud."
+msgstr "Sõnumit ei saadetud, kuna sa pole sisse logitud."
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s"
 
-#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3479
 #, c-format
 msgid ""
 "\n"
@@ -985,73 +592,73 @@ msgstr ""
 "\n"
 "%s tipib..."
 
-#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Sa lahkusid sellest vestlusest."
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Logimine käivitatud. Alatest käesolevast hetkest logitakse selle vestluse "
 "kõik sõnumid."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1392
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Logimine lõpetatud. Alatest käesolevast hetkest selle vestluse sõnumeid enam "
 "ei logita."
 
-#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Kellele saata"
 
-#: ../finch/gntconv.c:568
+msgid "Invite message"
+msgstr "Kutse sõnum"
+
+msgid "Invite"
+msgstr "Kutsu"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Palun sisesta selle kasutaja nimi, keda sa soovid\n"
+"jututuppa kutsuda. Kui sisestad ka sõnumi, siis\n"
+"saadetakse see sõbrale koos kutsumisteatega."
+
 msgid "Conversation"
 msgstr "Vestlus"
 
-#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Puhasta tagasikerimine"
 
-#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Ajatempleid näidatakse"
 
-#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Lisa sõbramärguanne..."
 
-#: ../finch/gntconv.c:611
-msgid "View Log..."
-msgstr "Vaata logi..."
+msgid "Invite..."
+msgstr "Kutsu..."
 
-#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "Luba logimine"
 
-#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Luba helid"
 
-#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATVASTUS> "
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:968
-msgid "List of users:\n"
-msgstr "Kasutajate nimekiri:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Toetatud silumisvalikud on:  version"
 
-#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "Sellist käsku pole (selles kontekstis)."
 
-#: ../finch/gntconv.c:1169 ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1059,7 +666,20 @@ msgstr ""
 "Kasuta \"/help &lt;käsk&gt;\" selle käsu abiteabe saamiseks.\n"
 "Sellest kontekstis on saadaval järgnevad käsud:\n"
 
-#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7778
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s pole korrektne sõnumiklass. Lubatud sõnumiklasside vaatamiseks anna käsk "
+"'/help msgcolor'."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s pole korrektne värvus. Lubatud värvuste vaatamiseks anna käsk '/help "
+"msgcolor'."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1067,58 +687,52 @@ msgstr ""
 "say &lt;message&gt;:  Sõnumi saatmine nagu tehtaks seda ilma käsku "
 "kasutamata."
 
-#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7781
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  IRC-stiilis tegevus sõbrale või vestlusele."
 
-#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7784
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;võti&gt;:  Silumisteabe saatmine käesolevasse vestlusesse."
 
-#: ../finch/gntconv.c:1251 ../pidgin/gtkconv.c:7787
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Vestluse tagasikerimise puhastamine."
 
-#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7793
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;käsk&gt;:  Abiteave käsu kohta."
 
-#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Vestluses osalevate kasutajate nimekirja näitamine."
 
-#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pluginate akna näitamine."
 
-#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Sõbranimekirja näitamine."
 
-#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Kontode akna näitamine."
 
-#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Silumisakna näitamine."
 
-#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs: Eelistuste akna näitamine."
 
-#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Salvestatud olekute akna näitamine."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:948 ../pidgin/gtkconv.c:2656
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
 msgid "Unable to open file."
 msgstr "Faili pole võimalik avada."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Silumisaken"
 
@@ -1126,246 +740,189 @@ msgstr "Silumisaken"
 #. * 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:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Puhasta"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pausi"
 
-#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Failiülekanded - %d%% faili %d-st"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Failiülekanded - %d%% %d failist"
+msgstr[1] "Failiülekanded - %d%% %d failist"
 
 #. Create the window.
-#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Failiülekanded"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Edenemine"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Failinimi"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Suurus"
 
-#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Kiirus"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Jäänud"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:380
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:780
-#: ../libpurple/protocols/jabber/buddy.c:784
-#: ../libpurple/protocols/jabber/buddy.c:943
-#: ../libpurple/protocols/jabber/jabber.c:1569
-#: ../libpurple/protocols/msn/msn.c:617 ../libpurple/protocols/msn/msn.c:627
-#: ../libpurple/protocols/msn/msn.c:632 ../libpurple/protocols/msn/msn.c:635
-#: ../libpurple/protocols/msnp9/msn.c:540
-#: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2761
-#: ../libpurple/protocols/oscar/oscar.c:3813
-#: ../libpurple/protocols/sametime/sametime.c:3313
-#: ../libpurple/protocols/sametime/sametime.c:4204
-#: ../libpurple/protocols/yahoo/yahoo.c:3285 ../pidgin/gtkblist.c:3296
-#: ../pidgin/gtkblist.c:3310 ../pidgin/gtkblist.c:3312
-#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Olek"
 
-#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "See aken suletakse ülekannete lõppemisel"
 
-#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Lõpetatud ülekanded puhastatakse"
 
-#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Seiska"
 
-#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Tühistatud"
 
-#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:445
+msgid "Sent"
+msgstr "Saadetud"
+
+msgid "Received"
+msgstr "Vastu võetud"
+
+msgid "Finished"
+msgstr "Lõpetatud"
+
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Fail salvestati nimega %s."
 
-#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1077
-msgid "Finished"
-msgstr "Lõpetatud"
+msgid "Sending"
+msgstr "Saatmine"
 
-#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
-msgid "Transferring"
-msgstr "Ülekandmine"
+msgid "Receiving"
+msgstr "Vastuvõtmine"
 
-#: ../finch/gntlog.c:183
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr ""
 
-#: ../finch/gntlog.c:186
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr ""
 
-#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
+"Süsteemseid sündmusi logitakse ainult juhul, kui eelistus \"Kõiki "
+"olekumuutusi logitakse süsteemsesse logisse\" on lubatud."
 
-#: ../finch/gntlog.c:275 ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
+"Välksõnumeid logitakse ainult juhul, kui eelistus \"Kõiki välksõnumeid "
+"logitakse\" on lubatud."
 
-#: ../finch/gntlog.c:278 ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Vestluseid logitakse ainult juhul, kui eelistus \"Kõiki vestlusi logitakse\" "
 "on märgitud."
 
-#: ../finch/gntlog.c:284 ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "Logisid ei leitud"
 
-#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Logide kogusuurus:"
 
 #. Search box *********
-#: ../finch/gntlog.c:338
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "Kerimine/otsimine: "
 
-#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Vestlused %s peal"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:447 ../pidgin/gtklog.c:724
-#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Vestlused - %s"
 
-#: ../finch/gntlog.c:472 ../pidgin/gtklog.c:824
+msgid "All Conversations"
+msgstr "Kõik vestlused"
+
 msgid "System Log"
 msgstr "Süsteemne logi"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "E-sõnumid"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Sulle on e-sõnum!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "Saatja"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "Teema"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) sai %d uue sõnumi."
 msgstr[1] "%s (%s) sai %d uut sõnumit."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "Uus e-sõnum"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "Andmed: %s"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "Sõbra andmed"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Jätka"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "Välksõnum"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
-msgid "Invite"
-msgstr "Kutsu"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(puudub)"
 
-#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
+msgid "URI"
+msgstr "URI"
+
 msgid "ERROR"
 msgstr "VIGA"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "tõrge plugina laadimisel"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "tõrge plugina mälust välja laadimisel"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1382,40 +939,31 @@ msgstr ""
 "Veebisait: %s\n"
 "Failinimi: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Enne plugina seadistamist peab see olema laaditud."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Sellel pluginal pole sedistamisvalikuid."
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Viga plugina laadimisel"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "Valitud fail pole korrektne plugin."
 
-#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr "Palun ava silumisaken ja proovi sealt leida täpne veateade."
 
-#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Plugina valimine paigaldamiseks"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Selle nimekirja abil saab pluginaid aktiveerida ja deaktiveerida"
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Paigalda plugin..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Seadista pluginat"
 
@@ -1424,379 +972,290 @@ msgstr "Seadista pluginat"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "Eelistused"
 
-#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Palun sisesta sõber, kelle kohta märguanne seatakse."
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Uus sõbramärguanne"
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Sõbramärguande redigeerimine"
 
-#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Kellest märku antakse"
 
 #. Account:
-#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Sõbra nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Märguanne, kui sõber..."
 
-#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Logib sisse"
 
-#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "Logib välja"
 
-#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "Eemaldub"
 
-#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "Pöördub eemalolekust tagasi"
 
-#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "Jääb jõude"
 
-#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "Naaseb jõudeolekust"
 
-#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "Alustab tippimist"
 
-#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Teeb tippimisel pausi"
 
-#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "Lõpetab tippimise"
 
-#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "Saadab sõnumi"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Tegevus"
 
-#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Avatakse välksõnumi aken"
 
-#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Kuvatakse teavituse hüpikakent"
 
-#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Saadetakse sõnum"
 
-#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Käivitatakse käsk"
 
-#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Mängitakse heli"
 
-#: ../finch/gntpounce.c:460
 msgid "Pounce only when my status is not Available"
 msgstr "Märguanne ainult juhul, kui minu olekuks on \"pole saadaval\""
 
-#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Märguannet pole võimalik luua"
 
-#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Sul pole ühtegi kontot."
 
-#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Enne märguande loomist pead Sa omale konto looma."
 
-#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Kas sa soovid kustutada %2$s märguande %1$s kohta?"
 
-#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Sõbramärguanded"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alustas sulle sõnumi sisestamist (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s jättis sulle sõnumi sisestamise pooleli (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s logis sisse (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s pole enam jõude (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s naases eemalolekust (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s lõpetas sulle sõnumi sisestamise (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s logis välja (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s jäi jõude (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s eemaldus. (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s saatis sulle sõnumi. (%s)"
 
-#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Tulenevalt klaviatuuri kasutamisest"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "Viimatisaadetud sõnumist"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
-#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mitte iial"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Jõudeaega näidatakse"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Ühendamata sõpru näidatakse"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Sõpru teavitatakse, kui sa oled sõnumit kirjutamas"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Logi vorming"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Välksõnumeid logitakse"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Vestlusi logitakse"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Olekumuutusi logitakse"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Jõudeoleku ajast teatamine"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Jõudeoleku puhul määratakse uus olek"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Mitme minuti möödudes olekut muudetakse"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Uueks olekuks saab"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Vestlused"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "Logimine"
 
-#: ../finch/gntrequest.c:621
+msgid "You must fill all the required fields."
+msgstr "Sa pead täitma kõik nõutavad väljad."
+
+msgid "The required fields are underlined."
+msgstr "Nõutavad väljad on alla joonitud."
+
 msgid "Not implemented yet."
 msgstr "Pole veel teostatud."
 
-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Faili salvestamine..."
 
-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Faili avamine..."
 
-#: ../finch/gntrequest.c:743
 msgid "Choose Location..."
 msgstr "Asukoha valimine..."
 
-#: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
+msgstr "Kui soovid veel selle kategooria tubasid leida, siis vajuta 'Enter'."
 
-#: ../finch/gntroomlist.c:273
 msgid "Get"
 msgstr ""
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "Tubade nimekiri"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Sõber logib sisse"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Sõber logib välja"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Sõnum võetakse vastu"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Sõnumi vastuvõtmine alustab vestlust"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Saadetakse sõnumit"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Isik siseneb jututuppa"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Isik väljub jututoast"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Sa kõneled jututoas"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Teisted kõnelevad jututoas"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
-msgid "Someone says your screen name in chat"
-msgstr "Keegi ütleb vestluses sinu nime"
+msgid "Someone says your username in chat"
+msgstr "Keegi ütleb jututoas sinu nime"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer'i tõrge"
 
-#: ../finch/gntsound.c:363 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "Tõrge GStreamer'i lähtestamisel."
 
-#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkprefs.c:1631
-#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(vaikimisi)"
 
-#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "Helifaili valimine..."
 
-#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "Helide eelistused"
 
-#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "Profiilid"
 
-#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "Konsoolipiiks"
 
-#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "Käsk"
 
-#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "Helid puuduvad"
 
-#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "Helitegemise meetod"
 
-#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "Meetod: "
 
-#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1806,82 +1265,56 @@ msgstr ""
 "(failinime jaoks kasuta %s)"
 
 #. Sound options
-#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "Helide valikud"
 
-#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "Heli fookusesse sattumise korral"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
-#: ../pidgin/gtkprefs.c:1791 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alati"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "Kui ma olen saadaval"
 
-#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "Kui mind pole saadaval"
 
-#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "Valjus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "Helisündmused"
 
-#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "Sündmus"
 
-#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "Fail"
 
-#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "Proovi"
 
-#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "Algväärtusta"
 
-#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "Vali..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Kas sa soovid \"%s\" kustutada?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Oleku kustutamine"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Salvestatud olekud"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/msn/msn.c:733
-#: ../libpurple/protocols/myspace/myspace.c:171
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Pealkiri"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Liik"
 
@@ -1893,132 +1326,71 @@ msgstr "Liik"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:292
-#: ../libpurple/protocols/bonjour/bonjour.c:299
-#: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1673
-#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
-#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msn/msn.c:703
-#: ../libpurple/protocols/msn/msn.c:708 ../libpurple/protocols/msn/msn.c:713
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2856
-#: ../libpurple/protocols/novell/novell.c:2959
-#: ../libpurple/protocols/novell/novell.c:2965
-#: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5657
-#: ../libpurple/protocols/oscar/oscar.c:5875
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:5905
-#: ../libpurple/protocols/oscar/oscar.c:5912
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/sametime/sametime.c:3336
-#: ../libpurple/protocols/sametime/sametime.c:3342
-#: ../libpurple/protocols/sametime/sametime.c:3348
-#: ../libpurple/protocols/sametime/sametime.c:3427
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3788
-#: ../libpurple/protocols/yahoo/yahoo.c:3794
-#: ../libpurple/protocols/zephyr/zephyr.c:2349
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Sõnum"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Kasuta"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Vigane pealkiri"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Palun määra olekule pealkiri, mis poleks tühi string."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Topeltpealkiri"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Palun sisesta olekule teistsugune pealkiri."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Alamolek"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Olek:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Sõnum:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Oleku redigeerimine"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Järgnevate kontode jaoks kasutatakse teistsugust olekut"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Salvesta ja kasuta"
 
-#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Sertifikaadid"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "Helid"
 
-#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Olekud"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Viga plugina mälust laadimisel."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "X-kuva pole võimalik leida"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Akend pole võimalik leida"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "Seda pluginat pole võimalik laadida kuna pluginal pole X11 tuge."
+msgstr "Seda pluginat pole võimalik laadida, kuna pluginal pole X11 tuge."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntLõikelaud"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Lõikelaua plugin"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -2026,77 +1398,60 @@ msgstr ""
 "Kui võimalik, siis gnt lõikelaua muutuste korral tehakse muutused saadavaks "
 "ka X-i jaoks."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s logis sisse"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s logis välja"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s saatis sulle sõnumi"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Sõber logib sisse või välja"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Sa saad välksõnumi"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Keegi räägib vestluses"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Keegi ütleb vestluses sinu nime"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Röstri abil teavitatakse kui"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Piiksutakse kah!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Terminaliaknale määratakse URGENT omadus."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Röstriplugin"
 
-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Vestlused kasutajaga %s, %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Ajaloo plugina kasutamiseks peab logimine olema lubatud"
 
-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2108,15 +1463,12 @@ msgstr ""
 "Kui lubada välksõnumite ja/või vestluste logimine, siis on vastavat liiki "
 "jutuajamis(t)ele võimalik aktiveerida ka ajalooplugin."
 
-#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntAjalugu"
 
-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Uutes viimase vestluse logi näitamine."
 
-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2124,167 +1476,113 @@ msgstr ""
 "Vestluse avamisel lisab see plugin avatava vestluse aknasse viimase vestluse "
 "logi."
 
-#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:738
+#, c-format
 msgid "Online"
 msgstr "Ühendatud"
 
-#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5707
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3136 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3296 ../pidgin/gtkblist.c:3678
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
 msgid "Offline"
 msgstr "Ühendamata"
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3335
 msgid "Online Buddies"
 msgstr "Ühendatud sõpru"
 
-#: ../finch/plugins/grouping.c:117
 msgid "Offline Buddies"
 msgstr "Ühendamata sõpru"
 
-#: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
 msgstr "Ühendatud/Ühendamata"
 
-#: ../finch/plugins/grouping.c:168
 msgid "Meebo"
 msgstr ""
 
-#: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr ""
 
-#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "Plugin tagab alternatiivsed valikud sõbranimekirja grupeerimisel."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntViimaneLogi"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Viimase logi plugin."
 
-#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "kontod"
 
-#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Sisselogimiseks on vaja parooli"
 
-#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Sisesta parool %s jaoks (%s)"
 
-#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "Salvesta parool"
 
-#: ../libpurple/account.c:1142 ../libpurple/connection.c:118
-#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s jaoks pole protokollipluginat"
 
-#: ../libpurple/account.c:1144 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Ühenduse viga"
 
-#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1729
 msgid "New passwords do not match."
 msgstr "Uued paroolid ei klapi omavahel."
 
-#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "Täida kõik väljad."
 
-#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "Algne parool"
 
-#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "Uus parool"
 
-#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "Uus parool (veel kord)"
 
-#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "%s parooli muutmine"
 
-#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "Palun sisesta oma praegune parool ja uus parool."
 
-#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "Kasutaja %s andmete muutmine"
 
-#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Määra kasutajateave"
 
-#: ../libpurple/account.c:1920 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:784
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/jabber/buddy.c:2051
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3433 ../pidgin/gtkblist.c:6187
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Sõbrad"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "sõbranimekiri"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(POLE VASTAVUSES)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "Subjekt \"%s\" esitas ühekordseks kasutamiseks järgneva sertifikaadi:"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2294,53 +1592,40 @@ msgstr ""
 "Sõrmejälg (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Ühekordseks kasutamiseks mõeldud sertifikaadi verifitseerimine"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Sertifitseerimiskeskused"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Kas nõustuda subjekti \"%s\" sertifikaadiga?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "SSL-sertifikaadi verifitseerimine"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Nõustu"
 
-#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Lükka tagasi"
 
-#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Vaata sertifikaati..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2349,7 +1634,6 @@ msgstr ""
 "Subjekti \"%s\" poolt esitatud sertifikaat on ise allkirjastatud. Selle "
 "usaldatavust pole võimalik automaatselt kontrollida."
 
-#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
@@ -2359,16 +1643,13 @@ msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "SSL-sertifikaadi viga"
 
-#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Vigane sertifikaadiahel"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2377,12 +1658,10 @@ msgstr ""
 "sertifikaati valideerida."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2390,7 +1669,6 @@ msgid ""
 "signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "Vigane sertifitseerimiskeskuse allkiri"
 
@@ -2398,7 +1676,6 @@ msgstr "Vigane sertifitseerimiskeskuse allkiri"
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1434
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2406,7 +1683,6 @@ msgid ""
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2424,126 +1700,93 @@ msgstr ""
 "Aegumise kuupäev: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Sertifikaadi andmed"
 
-#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Viga registreerimisel"
 
-#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Viga registreeringu tühistamisel"
 
-#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s logis sisse"
 
-#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s logis välja"
 
-#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2354
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:329
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Sõnumit pole võimalik saata: Sõnum on liiga suur."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kasutajale %s pole võimalik sõnumit saata."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Sõnum on liiga suur."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
-#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "Sõnumit pole võimalik saata."
 
-#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Sõnumi saatmine"
 
-#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Saada sõnum"
 
-#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s sisenes tuppa."
 
-#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] sisenes tuppa."
 
-#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sa oled nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s väljus toast."
 
-#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s väljus toast (%s)."
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Tõrge ühenduse hankimisel: %s"
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Tõrge nime hankimisel: %s"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Tõrge serveri nime hankimisel: %s"
 
-#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple D-BUS server ei tööta allpool nimetatud põhjusel"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Nimetu"
 
-#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "Uut lahendajaprotsessi pole võimalik luua\n"
 
-#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "Lahendajaprotsessile pole võimalik päringut saata\n"
 
-#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2552,13 +1795,10 @@ msgstr ""
 "Viga %s lahendamisel:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
-#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Viga %s lahendamisel: %d"
 
-#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2567,20 +1807,17 @@ msgstr ""
 "Viga lahendajaprotsessilt lugemisel:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:599
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Faililõputunnus lahendajaprotsessilt lugemisel"
 
-#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Viga lõime loomisel: %s"
 
-#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
 
-#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2589,7 +1826,6 @@ msgstr ""
 "Viga faili %s lugemisel: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2598,7 +1834,6 @@ msgstr ""
 "Viga faili %s kirjutamisel: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2607,39 +1842,31 @@ msgstr ""
 "Viga failile %s ligipääsul: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "Kataloog pole kirjutatav."
 
-#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nullsuurusega faili pole võimalik saata."
 
-#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Kataloogi pole võimalik saata."
 
-#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s pole tavaline fail. Ettevaatuse tõttu ei kirjutata seda üle.\n"
 
-#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s soovib saata sulle faili %s (%s)"
 
-#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s soovib saata sulle faili"
 
-#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Kas nõustud failiülekandega kasutajalt %s?"
 
-#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2650,133 +1877,105 @@ msgstr ""
 "Kaughost: %s\n"
 "Kaugport: %d"
 
-#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s pakub faili %s saatmist"
 
-#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole lubatud failinimi.\n"
 
-#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Pakun faili %s saatmist kasutajale %s"
 
-#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Faili %s ülekandmise alustamine kasutajalt %s"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Fail %s täielikult üle kantud"
 
-#: ../libpurple/ft.c:703
+#, c-format
 msgid "File transfer complete"
 msgstr "Fail on täielikult üle kantud"
 
-#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sa katkestasid faili %s ülekandmise"
 
-#: ../libpurple/ft.c:1143
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Faili ülekandmine katkestatud"
 
-#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s katkestas faili %s ülekandmise"
 
-#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s katkestas failiülekande"
 
-#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tõrge faili ülekandmisel kasutajale %s."
 
-#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tõrge faili ülekandmisel kasutajalt %s."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Käsu käivitamine terminalis"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "\"aim\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "\"gg\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "\"icq\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "\"irc\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "\"msnim\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "\"sip\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "\"xmpp\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "\"ymsgr\" URL-ide käsitlemise käsk (kui on lubatud)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "\"aim\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "\"gg\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "\"icq\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "\"irc\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "\"msnim\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "\"sip\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "\"xmpp\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "\"ymsgr\" URL-ide käsitleja"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -2784,7 +1983,6 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"aim\" "
 "URL-e."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -2792,7 +1990,6 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"gg\" "
 "URL-e."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -2800,7 +1997,6 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"icq\" "
 "URL-e."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -2808,7 +2004,6 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"irc\" "
 "URL-e."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -2816,7 +2011,6 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"msnim"
 "\" URL-e."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -2824,7 +2018,6 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"sip\" "
 "URL-e."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -2832,7 +2025,6 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"xmpp\" "
 "URL-e."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -2840,120 +2032,99 @@ msgstr ""
 "Kui märgitud, siis peaks \"command\" võtmes määratud käsk käsitlema \"ymsgr"
 "\" URL-e."
 
-#: ../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 ""
+"Kui märgitud, siis seda liiki URL-ide jaoks kasutatav käsk käivitatakse "
+"terminalis."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"aim\" URL-e või mitte"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"gg\" URL-e või mitte"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"icq\" URL-e või mitte"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"irc\" URL-e või mitte"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"msnim\" URL-e või mitte"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"sip\" URL-e või mitte"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"xmpp\" URL-e või mitte"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Kas määratud käsk peaks käsitlema \"ymsgr\" URL-e või mitte"
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Logijal pole lugemisfunktsiooni</font></b>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Lihttekst"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Lihtne vana vorming"
 
-#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Selle vestluse logimisel tekkis tõrge."
 
-#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr ""
+msgstr "<font color=\"red\"><b>Logide rada pole võimalik leida!</b></font>"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Faili pole võimalik lugeda: %s</b></font>"
 
-#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATVASTUS>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Sul on kasutusel %s kuid selle plugina jaoks on vajalik %s."
 
-#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "See plugin pole ID-d defineerinud."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI versioonid ei klapi: %d.%d.x (vaja on %d.%d.x)"
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
-msgstr "Pluginal pole kõik vajalikud funktsioonid realiseeritud"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Plugin ei teosta kõiki vajalikke funktsioone (list_icon, login ja close)"
 
-#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2961,87 +2132,61 @@ msgid ""
 msgstr ""
 "Vajalikku pluginat %s ei leitud. Palun paigalda see plugin ja proovi uuesti."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Pluginat pole võimalik laadida"
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vajalikku pluginat %s pole võimalik laadida."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Sinu pluginat pole võimalik laadida"
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s vajab pluginat %s, kuid selle väljalaadimisel tekkis tõrge."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Automaatne nõustumine"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 "Valitud kasutajate poolt algatatud failiülekannetega automaatne nõustumine."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 "Automaatselt aktsepteeritud fail \"%s\" kasutajalt \"%s\" on üle kantud."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:2294
-#: ../libpurple/protocols/oscar/oscar.c:2343
-#: ../libpurple/protocols/oscar/oscar.c:5989
-#: ../libpurple/protocols/oscar/oscar.c:6044
-#: ../libpurple/protocols/oscar/oscar.c:6270
-#: ../libpurple/protocols/oscar/oscar.c:6340 ../libpurple/request.h:1458
-#: ../libpurple/request.h:1468 ../pidgin/gtkblist.c:552
 msgid "_Cancel"
 msgstr "_Loobu"
 
-#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr ""
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3049,11 +2194,9 @@ msgstr ""
 "Rada, kuhu failid salvestatakse\n"
 "(Palun sisesta täisrada)"
 
-#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "Sõbranimekirja kandmata kasutajate failidest keeldutakse automaatselt"
 
-#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3061,18 +2204,15 @@ msgstr ""
 "Automaatselt nõustutud faili täielikust ülekandmisest teavitatakse\n"
 "hüpikakna abil (seda juhul, kui saatjaga pole vestlust käimas)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1672
-#: ../libpurple/protocols/msnp9/msn.c:1702
+msgid "Create a new directory for each user"
+msgstr "Iga kasutaja jaoks loodakse uus kataloog"
+
 msgid "Notes"
 msgstr "Märkused"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Redigeeri oma märkmeid..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Redigeeri märkmeid..."
 
@@ -3084,18 +2224,15 @@ msgstr "Redigeeri märkmeid..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Märkmed sõprade kohta"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Sõprade kohta märkmete salvestamine."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Sõbranimekirjas olevate sõprade kohta märkmete salvestamise võimaluse "
@@ -3107,7 +2244,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Šifritest"
 
@@ -3115,7 +2251,6 @@ msgstr "Šifritest"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Libpurple'ga kaasasolevate šifrite testimine."
 
@@ -3125,7 +2260,6 @@ msgstr "Libpurple'ga kaasasolevate šifrite testimine."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus näide"
 
@@ -3133,8 +2267,6 @@ msgstr "DBus näide"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus plugina näide"
 
@@ -3144,58 +2276,45 @@ msgstr "DBus plugina näide"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
-msgstr ""
+msgstr "Failjuhtimine"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
-msgstr ""
+msgstr "Juhtimine faili pandud käskude abil."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuteid"
 
 #. 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
 msgid "I'dle Mak'er"
 msgstr "Jõudeaja määraja"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Määra konto jõudeaeg"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Määra"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Ükski sinu konto pole jõude."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Nulli konto jõudeaeg"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Nulli"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Määra jõudeaeg kõigile kontodele"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Nulli kõikide jõudeolevate kontode jõudeaeg"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Lubab sul käsitsi määrata, kui kaua sa oled jõude olnud"
 
@@ -3205,19 +2324,16 @@ msgstr "Lubab sul käsitsi määrata, kui kaua sa oled jõude olnud"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC testklient"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "IPC toe testplugin (klient)."
 
 #. *  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."
@@ -3231,31 +2347,25 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC testserver"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "IPC toe testplugin (server)."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "IPC toe testimise serverplugin. See plugin registreerib IPC käske."
 
-#: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "Ühinemiste ja osalemiste peitmise sätted"
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Väikseim toa suurus"
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Kasutaja passiivsuse ajapiirang (minutites)"
 
@@ -3265,19 +2375,16 @@ msgstr "Kasutaja passiivsuse ajapiirang (minutites)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Ühinemiste ja osalemiste peitmine"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Kõrvaliste ühinemis- ja osalemisteadete peitmine."
 
 #. *  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."
@@ -3290,119 +2397,92 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Kasutaja pole ühendatud."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Saadetud automaatvastus:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s logis välja."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Sa oled serverist lahti ühendatud."
 
-#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
+"Sa pole hetkel ühendatud. Enne sisselogimist pole võimalik sõnumeid vastu "
+"võtta."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
-"Sõnumit pole võimalik saata kuna see on suurimast lubatud pikkusest pikem"
+"Sõnumit pole võimalik saata, kuna see on suurimast lubatud pikkusest pikem"
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Sõnumit pole võimalik saata."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Tuli"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2861
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Üldise logilugemise sätted"
 
-#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Suuruseid arvutatakse kiiresti"
 
-#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Kasutatakse nimede heuristikat"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Logikataloog"
 
@@ -3412,19 +2492,16 @@ msgstr "Logikataloog"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Logilugeja"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Teiste välksõnumiprogrammide logide kaasamine logivaatajasse."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3438,20 +2515,15 @@ msgstr ""
 "HOIATUS: Selle plugina kood on alles alfaversioonis ja võib tihti kokku "
 "joosta.  Kasuta seda omal riisikol."
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono pluginate laadija"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr ".NET pluginate laadimine Mono abil."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr ""
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr ""
 
@@ -3464,34 +2536,28 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Reavahetus"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Reavahetuse lisamine kuvatava sõnumi ette."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
+"the username in the conversation window."
 msgstr ""
 "Reavahetuse lisamine kuvatava sõnumi ette nii, et kogu sõnum ilmub "
-"vestlusaknas saatja ekraaninime alla, mitte selle järele."
+"vestlusaknas saatja kasutajanime alla, mitte selle järele."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Võrguvabade sõnumite emuleerimine"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Ühendamata kasutajatele sõnumite salvestamine sõbramärguannetena."
 
-#: ../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."
@@ -3499,7 +2565,6 @@ msgstr ""
 "Ülejäänud sõnumid salvestatakse sõbramärguannetena. Salvestatud märguandeid "
 "on võimalik muuta või kustutada `Sõbramärguannete' dialoogi abil."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -3508,51 +2573,23 @@ msgstr ""
 "\"%s\" pole hetkel võrku ühendatud. Kas sa soovid saatmata sõnumid "
 "salvestada ja saata need automaatselt siis, kui \"%s\" uuesti võrku ühendub?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Võrguvaba sõnum"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Seda märguannet on võimalik muuta või kustutada `Sõbramärguannete' dialoogi "
 "abil"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:661
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Jah"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:661
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1930
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Ei"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Võrguvabade sõnumite salvestamine märguannetena"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Küsimusi ei esitata, alati salvestatakse märguannetena."
 
@@ -3562,48 +2599,38 @@ msgstr "Küsimusi ei esitata, alati salvestatakse märguannetena."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl'i pluginate laadija"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Perl'is kirjutatud pluginate tugi"
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
-msgstr "Lubatakse ainult minu sõbraloendis olevatele kasutajatele"
+msgstr "Lubatakse ainult minu sõbranimekirjas olevatele kasutajatele"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Keelatakse minu eemaloleku korral"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Teavitussõnumeid kuvatakse vestlustes"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr ""
 
@@ -3613,7 +2640,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Signaalide testimine"
 
@@ -3621,8 +2647,6 @@ msgstr "Signaalide testimine"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Test veendumaks, kas kõik signaalid töötavad korrektselt."
 
@@ -3632,7 +2656,6 @@ msgstr "Test veendumaks, kas kõik signaalid töötavad korrektselt."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Lihtne plugin"
 
@@ -3640,13 +2663,10 @@ msgstr "Lihtne plugin"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Test veendumaks, kas enamus asju töötavad korrektselt."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509 sertifikaadid"
 
@@ -3656,7 +2676,6 @@ msgstr "X.509 sertifikaadid"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3664,8 +2683,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL toe tagamine GNUTLS-i abil."
 
@@ -3675,7 +2692,6 @@ msgstr "SSL toe tagamine GNUTLS-i abil."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3683,8 +2699,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "SSL toe tagamine Mozilla NSS_i abil."
 
@@ -3694,7 +2708,6 @@ msgstr "SSL toe tagamine Mozilla NSS_i abil."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3702,48 +2715,38 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL tugiteekide kasutamise tagamine (mähkurina)."
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s pole enam eemal."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s läks eemale."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s on jõude."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s pole enam jõude."
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s logis sisse."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Teavitatakse kui"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Sõber läheb _eemale"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Sõber jääb _jõude"
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Sõber logib s_isse või välja"
 
@@ -3753,7 +2756,6 @@ msgstr "Sõber logib s_isse või välja"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Sõprade olekust teavitaja"
 
@@ -3761,8 +2763,6 @@ msgstr "Sõprade olekust teavitaja"
 #. *< version
 #. *  summary
 #. *  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."
@@ -3770,15 +2770,12 @@ msgstr ""
 "Vestlusakendes teavitatakse sind sõprade eemaldumisest või tegevuseta "
 "olekust."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-pluginate laadija"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl-pluginate laadimise tagamine"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3787,61 +2784,35 @@ msgstr ""
 "kasutada, siis pead sa paigaldama ActiveTCL'i aadressilt http://www."
 "activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:101
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour For Windows tööriistakomplekti ei leitud. Täiendavat teavet "
-"saad korduma kippuvate küsimuste (FAQ) alt aadressil: http://developer."
-"pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
+"saad korduma kippuvate küsimuste (FAQ) alt aadressilt http://d.pidgin.im/"
+"BonjourWindows."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Sissetulevaid välksõnumiühendusi pole võimalik kuulata\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:147
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Kohaliku mDNS-serveriga pole võimalik ühendust saada.  Kas see üldse töötab?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:392
-#: ../libpurple/protocols/bonjour/bonjour.c:698
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:996
 msgid "First name"
 msgstr "Eesnimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:701
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1000
 msgid "Last name"
 msgstr "Perekonnanimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1329
-#: ../libpurple/protocols/jabber/buddy.c:1339
-#: ../libpurple/protocols/jabber/buddy.c:2223
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "Email"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:401
-#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "AIM-i konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "XMPP konto"
 
@@ -3855,394 +2826,252 @@ msgstr "XMPP konto"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:508
-#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolli plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s sulges vestluse."
 
-#: ../libpurple/protocols/bonjour/jabber.c:457
-#: ../libpurple/protocols/bonjour/jabber.c:522
-#: ../libpurple/protocols/bonjour/jabber.c:567
-#: ../libpurple/protocols/bonjour/jabber.c:744
-#: ../libpurple/protocols/bonjour/jabber.c:762
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Sõnumit pole võimalik saata ja seetõttu pole võimalik ka vestlust algatada."
 
-#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "Soklit pole võimalik avada"
 
-#: ../libpurple/protocols/bonjour/jabber.c:671
-msgid "Error setting socket options"
-msgstr "Viga soklivalikute seadmisel"
-
-#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "Soklit pole võimalik porti kuulama panna"
 
-#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "Soklit pole võimalik kuulata"
 
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Viga kohaliku mDNSResponder'iga suhtlemisel."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Vigased proksi sätted"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "Sinu määratud proksil on vigane hostimini või port."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Tõendi viga"
 
-#: ../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 "Tõendit pole võimalik vastu võtta.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
-msgstr "Sõbraloendi salvestamine..."
+msgstr "Sõbranimekirja salvestamine..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Sinu sõbranimekiri on tühi, faili ei kirjutatud mitte midagi."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
-msgstr "Sõbraloendi salvestamine õnnestus"
+msgstr "Sõbranimekirja salvestamine õnnestus"
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
-msgstr "Sõbraloendit pole võimalik laadida"
+msgstr "Sõbranimekirja pole võimalik laadida"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
-msgstr "Sõbraloendi laadimine..."
+msgstr "Sõbranimekirja laadimine..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
-msgstr "Sõbraloend edukalt laaditud!"
+msgstr "Sõbranimekiri edukalt laaditud!"
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
-msgstr "Sõbraloendi salvestamine..."
+msgstr "Sõbranimekirja salvestamine..."
+
+msgid "Load buddylist from file..."
+msgstr "Sõbranimekirja laadimine failist..."
 
-#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
-msgstr ""
+msgstr "Täida registreerumiseks vajalikud väljad."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Paroolid ei klapi omavahel."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Uut kontot pole vea tõttu võimalik registreerida.\n"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Uus Gadu-Gadu konto on registreeritud"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Registreerimine edukalt läbi viidud!"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:971
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:1762
 msgid "Password"
 msgstr "Parool"
 
-#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Parool (uuesti)"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Sisesta praegune tõend"
 
-#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Praegune tõend"
 
-#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Uue Gadu-Gadu konto registreerimine"
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Palun täida järgnevad väljad"
 
-#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/oscar/oscar.c:3835
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Linn"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Sünniaasta"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1745
-#: ../libpurple/protocols/msnp9/msn.c:1601
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sugu"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Mees või naine"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Mees"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Naine"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
-msgstr ""
+msgstr "Sõprade otsimine"
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
-msgstr ""
+msgstr "Palun sisesta oma otsingukriteerium"
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
-msgstr ""
+msgstr "Täida väljad."
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Sinu praegune parool erine sinu poolt määratud paroolist."
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Parooli pole vea tõttu võimalik muuta.\n"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Gadu-Gadu konto parooli muutmine"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Parool on edukalt muudetud!"
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Palun sisesta oma praegune parool ja uus parool UIN-i jaoks: "
 
-#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu parooli muutmine"
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr ""
+msgstr "Sõbra jaoks vestluse valimine: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Lisa vestlusesse..."
 
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3138 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "Saadaval"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5735
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3690
-#: ../libpurple/protocols/yahoo/yahoo.c:3764 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
-#: ../pidgin/gtkstatusbox.c:1082
+#, c-format
 msgid "Away"
 msgstr "Eemal"
 
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:3743
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Eesnimi"
 
-#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Sünniaasta"
 
-#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3944
 msgid "Unable to display the search results."
 msgstr "Otsingutulemusi pole võimalik kuvada."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu avalik kataloog"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Otsingutulemused"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Sobivaid kasutajaid ei leitud"
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Sellele otsingukriteeriumile vastavaid kasutajaid ei leitud."
 
-#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Soklit pole võimalik lugeda"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
-msgstr "Sõbraloend alla laaditud"
+msgstr "Sõbranimekiri alla laaditud"
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
-msgstr "Sinu sõbraloend on serverist alla laaditud."
+msgstr "Sinu sõbranimekiri on serverist alla laaditud."
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
-msgstr "Sõbraloend üles laaditud"
+msgstr "Sõbranimekiri üles laaditud"
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
-msgstr "Sinu sõbraloend on serverisse üles laaditud."
+msgstr "Sinu sõbranimekiri on serverisse üles laaditud."
 
-#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Tõrge ühendumisel."
 
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Vestlusese lisamine"
 
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "Vestluse _nimi:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Viga vestlusel"
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Selline vestluse nimi on juba kasutusel"
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Puudub ühendus serveriga."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Otsi sõpru..."
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Muuda parooli..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
-msgstr "Sõbraloendi üleslaadimine serverisse"
+msgstr "Sõbranimekirja üleslaadimine serverisse"
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
-msgstr "Sõbraloendi serverist allalaadimine"
+msgstr "Sõbranimekirja serverist allalaadimine"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
-msgstr "Sõbraloendi kustutamine serverist"
+msgstr "Sõbranimekirja kustutamine serverist"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
-msgstr "Sõbraloendi salvestamine faili..."
-
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr "Sõbraloendi laadimine failist..."
+msgstr "Sõbranimekirja salvestamine faili..."
 
 #. magic
 #. major_version
@@ -4255,152 +3084,81 @@ msgstr "Sõbraloendi laadimine failist..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokolli plugin"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu kasutaja"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tundmatu käsk: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:511
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "hetketeema on: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:515
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "Teemat pole seatud"
 
-#: ../libpurple/protocols/irc/dcc_send.c:298
-#: ../libpurple/protocols/irc/dcc_send.c:339
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "Tõrge faili ülekandmisel"
 
-#: ../libpurple/protocols/irc/dcc_send.c:299
-#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Kuulatavat porti pole võimalik avada."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Viga päevasõnumi kuvamisel"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Päevasõnumit pole saadaval"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Selle ühendusega pole päevasõnumit seotud"
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s päevasõnum"
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2530
 msgid "Server has disconnected"
 msgstr "Server katkestas ühenduse"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Vaata päevasõnumit"
 
-#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "Ka_nal:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_Parool:"
 
-#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nimed ei tohi sisaldada tühje kohti"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1336
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:354
-#: ../libpurple/protocols/myspace/myspace.c:295
-#: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1331
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3776
-#: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "Ühendumine"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:1145
 msgid "SSL support unavailable"
 msgstr "SSL-i tugi pole saadaval"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:313
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1327
 msgid "Couldn't connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2524
 msgid "Read error"
 msgstr "Viga lugemisel"
 
-#: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1398
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3424
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Teema"
 
@@ -4412,68 +3170,27 @@ msgstr "Teema"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolli plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC protokolli plugin, mis Imeb Vähem"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2343
-#: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6747
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5781
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2099
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
-#: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6750
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5786
-#: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1867
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Kooditabelid"
 
-#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:964
-#: ../libpurple/protocols/jabber/jabber.c:966
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
-#: ../libpurple/protocols/silc/silc.c:1148
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "Username"
-msgstr "Kasutajanimi"
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
-#: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "Tegelik nimi"
 
@@ -4481,158 +3198,129 @@ msgstr "Tegelik nimi"
 #. 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:985
 msgid "Use SSL"
 msgstr "Kasutatakse SSL-i"
 
-#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "Vigane režiim"
 
-#: ../libpurple/protocols/irc/msgs.c:200
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s"
+msgstr ""
+
+msgid "End of ban list"
+msgstr "Tõrjumisnimekirja lõpp"
+
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sa oled kanalilt %s tõrjutud."
 
-#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "Tõrjutud"
 
-#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kasutajat %s pole võimalik tõrjuda: tõrjenimekiri on täis"
 
-#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(tuvastatud)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3733
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Hüüdnimi"
 
-#: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Hetkel jututubades"
 
-#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "Jõudeaeg"
 
-#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "Ühendatud alates"
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s määras uueks teemaks: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s puhastas teema."
 
-#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanali %s teema on: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tundmatu sõnum '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "Tundmatu sõnum"
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC server võttis vastu arusaamatu teate."
 
-#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Kanali %s kasutajad: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr "Ajavastus"
 
-#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr "IRC serveri kohalik aeg on:"
 
-#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr "Sellist kanalit pole"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:600
 msgid "no such channel"
 msgstr "sellist kanalit pole"
 
-#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr "Kasutaja pole sisse logitud"
 
-#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr "Sellist kanalit või hüüdnime pole"
 
-#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr "Ei saa saata"
 
-#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Ühinemine %s'ga on vaja kutset."
 
-#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr "Ainult kutsetega"
 
-#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sind löödi kasutaja %s poolt välja (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:806 ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Välja löödud kasutaja %s poolt (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:829
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mood (%s %s) %s poolt"
 
-#: ../libpurple/protocols/irc/msgs.c:914 ../libpurple/protocols/irc/msgs.c:915
 msgid "Invalid nickname"
 msgstr "Vigane hüüdnimi"
 
-#: ../libpurple/protocols/irc/msgs.c:916
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4640,7 +3328,6 @@ msgstr ""
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi.  Arvatavasti sisaldab "
 "nimi lubamatuid märke."
 
-#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4648,53 +3335,40 @@ msgstr ""
 "Sinu valitud hüüdnimi lükati serveri poolt tagasi, arvatavasti sisaldab nimi "
 "lubamatuid märke."
 
-#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Cannot change nick"
 msgstr "Hüüdmine pole võimalik muuta"
 
-#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Could not change nick"
 msgstr "Hüüdmine pole võimalik muuta"
 
-#: ../libpurple/protocols/irc/msgs.c:981
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1023
 msgid "Error: invalid PONG from server"
 msgstr "Viga: vigane PONG serverilt"
 
-#: ../libpurple/protocols/irc/msgs.c:1025
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-i vastus -- Mahajäämus %lu sekundit"
 
-#: ../libpurple/protocols/irc/msgs.c:1116
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1117
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kanaliga pole võimalik ühineda"
 
-#: ../libpurple/protocols/irc/msgs.c:1151
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kasutajanimi või kanal pole ajutiselt saadaval."
 
-#: ../libpurple/protocols/irc/msgs.c:1163
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;tegevusm&gt;:  Tegevuse sooritamine."
 
-#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4702,36 +3376,35 @@ msgstr ""
 "away [sõnum]:  Eemaloleku teate määramine. Ilma sõnumita käsku kasutatakse "
 "eemaolekust tagasitulemise puhul."
 
-#: ../libpurple/protocols/irc/parse.c:124
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Käsu saatmine chanserv'ile"
 
-#: ../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."
 msgstr ""
+"deop &lt;kasutaja1&gt; [kasutaja2] ...:  Kelleltki kanali operaatori õiguste "
+"eemaldamine. Selle tegemiseks pead sa olema kanali operaator."
 
-#: ../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 "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../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."
 msgstr "invite &lt;hüüdnimi&gt; [kanal]:  Kellegi kutsumine kanalile."
 
-#: ../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 ""
 
-#: ../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."
@@ -4740,7 +3413,6 @@ msgstr ""
 "tuppa sisenemine, vajadusel on valikuliselt võimalik määrata ka igale toale "
 "kanalivõti."
 
-#: ../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."
@@ -4748,7 +3420,6 @@ msgstr ""
 "kick &lt;hüüdnimi&gt; [sõnum]:  Kellegi kanalilt eemaldamine. Eemaldamiseks "
 "pead sa olema kanali operaator."
 
-#: ../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>"
@@ -4756,60 +3427,51 @@ msgstr ""
 "list: Võrgus olevate jututubade nimekirja kuvamine. <i>Hoiatus: mõned "
 "serverid võivad selle peale ühenduse katkestada.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;tegevusm&gt;:  Tegevuse sooritamine."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
-msgstr ""
+msgstr "memoserv: Käsu saatmine memoserv'ile"
 
-#: ../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;hüüdnimi|kanal&gt;:  Kanalile või "
+"kasutajale režiimi seadmine."
 
-#: ../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;hüüdnimi&gt; &lt;sõnum&gt;:  Erasõnumi saatmine kasutajale (seda "
+"näeb seda ainult adressaat)."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Kanalil olevate kasutajate nimekiri."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uus hüüdnimi&gt;:  Sinu hüüdnime muutmine."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:139
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;sihtkoht&lt;:  Märkuse saatmine kasutajale või kanalile."
 
-#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid "operserv: Send a command to operserv"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4817,116 +3479,90 @@ msgstr ""
 "part [tuba] [sõnum]:  Käesolevalt või määratud kanalilt lahkumine. Võimalik "
 "on ka määrata lahkumise sõnumit."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [sõnum]:  Serveriga ühenduse katkestamine. Võimalik on ka katkestamise "
 "kohta sõnum jätta."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Töötlemata käsu saatmine serverile."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
+"remove &lt;hüüdnimi&gt; [sõnum]:  Kellegi eemaldamine toast. Selle "
+"tegemiseks pead sa olema kanali operaator."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: IRC-serveri kohaliku aja näitamine."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [uus teema]:  Kanali teema vaatamine või muutmine."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [hüüdnimi]: CTCP VERSION päringu saatmine kasutajale"
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;hüüdnimi&gt;: Kasutaja kohta teabe hankimine."
 
-#: ../libpurple/protocols/irc/parse.c:156
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;hüüdnimi&gt;: Väljalogitud kasutaja kohta teabe hankimine."
 
-#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "CTCP PING vastus"
 
-#: ../libpurple/protocols/irc/parse.c:634
-#: ../libpurple/protocols/irc/parse.c:641 ../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 "Ühendus katkestatud."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:725
-#: ../libpurple/protocols/jabber/jabber.c:755
-#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Unknown Error"
 msgstr "Tundmatu viga"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Tõrge Ad-Hoc käsu täitmisel"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL tuge ei leitud."
+msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL-i tuge ei leitud."
+
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr "Sa vajad krüptimist, kuid TLS/SSL-i tuge ei leitud."
 
-#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
 
-#: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:526
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4935,147 +3571,74 @@ msgstr ""
 "%s vajab avatekstiautentimist üle krüptimata andmevoo. Kas lubada see ja "
 "jätkata autentimist?"
 
-#: ../libpurple/protocols/jabber/auth.c:325
-#: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:528
-#: ../libpurple/protocols/jabber/auth.c:529
-#: ../libpurple/protocols/jabber/auth.c:720
-#: ../libpurple/protocols/jabber/auth.c:721
 msgid "Plaintext Authentication"
 msgstr "Avatekstiline autentimine"
 
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:653
-#: ../libpurple/protocols/jabber/auth.c:901
-#: ../libpurple/protocols/jabber/auth.c:1050
-#: ../libpurple/protocols/jabber/auth.c:1077
-#: ../libpurple/protocols/jabber/auth.c:1101
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Server tagastas vigase vastuse."
 
-#: ../libpurple/protocols/jabber/auth.c:542
-#: ../libpurple/protocols/jabber/auth.c:733
 msgid "Server does not use any supported authentication method"
 msgstr "Server ei kasuta ühtegi toetatud autentimismeetodit"
 
-#: ../libpurple/protocols/jabber/auth.c:722
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"See server nõuab avatekstilist autentimist üle krüptimata ühenduse.  Kas "
-"seda peaks lubama ja autentimist jätkama?"
-
-#: ../libpurple/protocols/jabber/auth.c:924
-#: ../libpurple/protocols/jabber/auth.c:949
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:1023
 msgid "SASL error"
 msgstr "SASL-i viga"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1223
-#: ../libpurple/protocols/sametime/sametime.c:4182
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Täisnimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1235
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1238
 msgid "Given Name"
 msgstr "Eesnimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1286
 msgid "Street Address"
 msgstr "Tänavaaadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1283
 msgid "Extended Address"
 msgstr "Laiendatud aadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1289
 msgid "Locality"
-msgstr ""
+msgstr "Paikkond"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1292
 msgid "Region"
 msgstr "Piirkond"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1295
 msgid "Postal Code"
 msgstr "Postiindeks"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1299
-#: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Riik"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1310
-#: ../libpurple/protocols/jabber/buddy.c:1317
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1354
 msgid "Organization Name"
 msgstr "Organisatsiooni nimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1357
 msgid "Organization Unit"
 msgstr "Organisatsiooni üksus"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1366
 msgid "Role"
 msgstr "Roll"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1254
-#: ../libpurple/protocols/msn/msn.c:1814
-#: ../libpurple/protocols/msnp9/msn.c:1670
-#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1369
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3308
-#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
-#: ../libpurple/protocols/jabber/buddy.c:725
 msgid "Edit XMPP vCard"
 msgstr "XMPP vKaardi redigeerimine"
 
-#: ../libpurple/protocols/jabber/buddy.c:726
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5083,565 +3646,348 @@ msgstr ""
 "Ükski allpool olev väli pole kohustuslik. Sisesta ainult seda teavet, mis "
 "tundub sulle sobilik."
 
-#: ../libpurple/protocols/jabber/buddy.c:797
-#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Client"
 msgstr "Klient"
 
-#: ../libpurple/protocols/jabber/buddy.c:801
-#: ../libpurple/protocols/jabber/buddy.c:966
 msgid "Operating System"
 msgstr "Operatsioonisüsteem"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Last Activity"
 msgstr "Viimati aktiivne"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Info"
 msgstr "Teenuse avastamise andmed"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Service Discovery Items"
 msgstr "Teenuse avastamise kirjed"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Extended Stanza Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 msgid "Multi-User Chat"
 msgstr "Mitmekasutaja vestlus"
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "Multi-User Chat Extended Presence Information"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "In-Band Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Ad-Hoc Commands"
 msgstr "Ad-Hoc käsud"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "PubSub Service"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "SOCKS5 Bytestreams"
 msgstr "SOCKS5 baidivood"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "Out of Band Data"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "In-Band Registration"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Location"
 msgstr "Kasutaja asukoht"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "User Avatar"
 msgstr "Kasutaja avatar"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Chat State Notifications"
 msgstr "Vestluste olekust teavitaja"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Software Version"
 msgstr "Tarkvara versioon"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
 msgid "Stream Initiation"
-msgstr ""
+msgstr "Voo lähtestamine"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-#: ../libpurple/protocols/sametime/sametime.c:3285
 msgid "File Transfer"
 msgstr "Failiülekanne"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Mood"
 msgstr "Kasutaja meeleolu"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "User Activity"
 msgstr "Kasutaja aktiivsus"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Entity Capabilities"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "Encrypted Session Negotiations"
 msgstr "Krüptitud seansi läbirääkimised"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "User Tune"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "Reachability Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "User Profile"
 msgstr "Kasutajaprofiil"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "Jingle Audio"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "User Nickname"
 msgstr "Kasutaja hüüdnimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE UDP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle ICE TCP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Raw UDP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle Video"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Jingle DTMF"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Message Receipts"
 msgstr "Sõnumi vastuvõtjad"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "Public Key Publishing"
 msgstr "Avaliku võtme avalikustamine"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Chatting"
-msgstr ""
+msgstr "Kasutaja lobiseb"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Browsing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Gaming"
-msgstr ""
+msgstr "Kasutaja mängib"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "User Viewing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Stanza Encryption"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Entity Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "Viivitusega kohaletoimetamine"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Collaborative Data Objects"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "File Repository and Sharing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "STUN Service Discovery for Jingle"
 msgstr "STUN-teenuse avastamine Jingle jaoks"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Lihtsustatud krüptitud seansi läbirääkimised"
 
-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1083
-#: ../libpurple/protocols/oscar/oscar.c:2967
 msgid "Capabilities"
 msgstr "Võimalused"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1094
-msgid "Resource"
-msgstr "Vahend"
-
-#: ../libpurple/protocols/jabber/buddy.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1241
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Vahend"
+
 msgid "Middle Name"
 msgstr "Keskmine nimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1004
-#: ../libpurple/protocols/oscar/oscar.c:3821
-#: ../libpurple/protocols/oscar/oscar.c:3834
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Aadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:1280
 msgid "P.O. Box"
 msgstr "Postkast"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Un-hide From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1953
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "(Re-)Request authorization"
 msgstr "Küsi (uuesti) autoriseerimist"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Unsubscribe"
 msgstr "Lõpeta tellimus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log In"
 msgstr "Logi sisse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Log Out"
 msgstr "Logi välja"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
-#: ../libpurple/protocols/jabber/jabber.c:1613
 msgid "Chatty"
 msgstr "Lobisev"
 
-#: ../libpurple/protocols/jabber/buddy.c:2046
 msgid "Extended Away"
 msgstr "Kaua eemal"
 
-#: ../libpurple/protocols/jabber/buddy.c:2048
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5911
-#: ../libpurple/protocols/sametime/sametime.c:3347
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Mitte segada"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
 msgid "JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/jabber/buddy.c:2408
-#: ../libpurple/protocols/oscar/oscar.c:3744
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2251
 msgid "The following are the results of your search"
 msgstr "Järgneb sinu otsingu tulemus"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2336
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2356
 msgid "Directory Query Failed"
 msgstr "Kataloogipäringu tõrge"
 
-#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Could not query the directory server."
 msgstr "Kataloogiserverisse pole võimalik päringuid teha."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2391
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Serveri juhised: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2398
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2418
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/oscar/oscar.c:3756
 msgid "Email Address"
 msgstr "E-posti aadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
-#: ../libpurple/protocols/jabber/buddy.c:2428
 msgid "Search for XMPP users"
 msgstr "XMPP kasutajate otsimine"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2429
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:177
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5665
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Otsing"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Invalid Directory"
 msgstr "Vigane kataloog"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Enter a User Directory"
 msgstr "Kasutajate kataloogi sisestamine"
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
 msgid "Select a user directory to search"
 msgstr "Vali kasutajate kataloog, millest otsida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2465
 msgid "Search Directory"
 msgstr "Kataloogist otsimine"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5391
-#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Tuba:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s pole korrektne toa nimi"
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Vigane toa nimi"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s pole korrektne serveri nimi"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Vigane sereri nimi"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Seadistamise viga"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Seadistada pole võimalik"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Viga toa seadistustes"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Viga registreerimisel"
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Mitte-MUC jututubades pole lühinime muutmine toetatud"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Viga tubade loendi vastuvõtmisel"
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Vigane server"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Jututoaserveri sisestamine"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Vali konverentsiserver, kuhu päring esitada"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Otsi jututube"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Sa nõuad krüptimist aga selles serveris pole see toetatud."
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Kirjutamise viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:401
 msgid "Ping timeout"
 msgstr "Pingimine ületas ajapiirangu"
 
-#: ../libpurple/protocols/jabber/jabber.c:448
-#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "Lugemise viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:525
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2576
-#: ../libpurple/protocols/yahoo/yahoo.c:2608
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5650,606 +3996,414 @@ msgstr ""
 "Selle serveriga pole võimalik ühendust luua:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
 msgid "Unable to create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/jabber/jabber.c:625
-#: ../libpurple/protocols/jabber/jabber.c:1110
 msgid "Invalid XMPP ID"
 msgstr "Vigane XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:632
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Vigane XMPP ID. Domeen peab olema määratud."
 
-#: ../libpurple/protocols/jabber/jabber.c:710
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Kasutaja %s@%s registreerimine õnnestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:716
 #, c-format
 msgid "Registration to %s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:718
-#: ../libpurple/protocols/jabber/jabber.c:719
 msgid "Registration Successful"
 msgstr "Registreerimine õnnestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:727
-#: ../libpurple/protocols/jabber/jabber.c:728
 msgid "Registration Failed"
 msgstr "Tõrge registreerimisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:746
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:748
-#: ../libpurple/protocols/jabber/jabber.c:749
 msgid "Unregistration Successful"
 msgstr "Registreerimine edukalt tühistatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:757
-#: ../libpurple/protocols/jabber/jabber.c:758
 msgid "Unregistration Failed"
 msgstr "Tõrge registreeringu tühistamisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:925
 msgid "Already Registered"
 msgstr "Juba registreeritud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#: ../libpurple/protocols/oscar/oscar.c:3823
-#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "State"
 msgstr "Olek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Postal code"
 msgstr "Postiindeks"
 
-#: ../libpurple/protocols/jabber/jabber.c:1020
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1028
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
 msgid "Unregister"
 msgstr "Tühista registreering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "Konto registreeringu muutmiseks täida palun allpool olevad lahtrid."
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Please fill out the information below to register your new account."
 msgstr "Uue konto registreerimiseks täida palun allpool olevad lahtrid."
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
-#: ../libpurple/protocols/jabber/jabber.c:1051
 msgid "Register New XMPP Account"
 msgstr "Uue XMPP konto registreerimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
-#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register"
 msgstr "Registreeri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1058
 #, c-format
 msgid "Register New Account at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Change Registration"
 msgstr "Registreeringu muutmine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
-#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Error unregistering account"
 msgstr "Viga konto registreeringu tühistamisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
-#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "Account successfully unregistered"
 msgstr "Konto registreering edukalt tühistatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1340
 msgid "Initializing Stream"
 msgstr "Andmevoo lähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1345
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS-i lähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1349
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autentimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Re-initializing Stream"
 msgstr "Andmevaa taaslähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1452
-#: ../libpurple/protocols/jabber/jabber.c:1910
-#: ../libpurple/protocols/jabber/jabber.c:1953
-#: ../libpurple/protocols/jabber/jabber.c:1991
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5705
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Both"
 msgstr "Mõlemad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "From"
 msgstr "Saatja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "To"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1511
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Puudub"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Subscription"
 msgstr "Tellimus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
-#: ../libpurple/protocols/jabber/jabber.c:1527
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
-#: ../libpurple/protocols/jabber/jabber.c:1644
-#: ../libpurple/protocols/jabber/jabber.c:1658
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Meeleolu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/msn/msn.c:642
 msgid "Now Listening"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1617
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#: ../libpurple/protocols/jabber/jabber.c:1645
-#: ../libpurple/protocols/jabber/jabber.c:1659
 msgid "Mood Text"
 msgstr "Tujutekst"
 
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1619
-#: ../libpurple/protocols/jabber/jabber.c:1633
-#: ../libpurple/protocols/jabber/jabber.c:1647
-#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Allow Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
 msgid "Tune Artist"
 msgstr "Loo esitaja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Tune Title"
 msgstr "Loo pealkiri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1681
 msgid "Tune Album"
 msgstr "Loo album"
 
-#: ../libpurple/protocols/jabber/jabber.c:1682
 msgid "Tune Genre"
 msgstr "Loo žanr"
 
-#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "Tune Comment"
 msgstr "Loo kommentaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1684
 msgid "Tune Track"
 msgstr "Loo rada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1685
 msgid "Tune Time"
 msgstr "Loo kestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "Tune Year"
 msgstr "Loo aasta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Tune URL"
 msgstr "Loo URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1703
 msgid "Password Changed"
 msgstr "Parool muudetud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1704
 msgid "Your password has been changed."
 msgstr "Sinu parool on muudetud."
 
-#: ../libpurple/protocols/jabber/jabber.c:1710
-#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
-#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Change XMPP Password"
 msgstr "XMPP parooli muutmine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Please enter your new password"
 msgstr "Palun sisesta uus parool"
 
-#: ../libpurple/protocols/jabber/jabber.c:1789
-#: ../libpurple/protocols/oscar/oscar.c:6491
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Määra kasutajateave..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1794
-#: ../libpurple/protocols/oscar/oscar.c:6502
-#: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Parooli muutmine..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1799
 msgid "Search for Users..."
 msgstr "Kasutajate otsimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Bad Request"
 msgstr "Vigane päring"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Feature Not Implemented"
-msgstr ""
+msgstr "Võimalus pole teostatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Forbidden"
 msgstr "Keelatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1898
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
-#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Internal Server Error"
 msgstr "Serveri sisemine viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Item Not Found"
 msgstr "Kirjet ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Malformed XMPP ID"
 msgstr "Vigaselt vormindatud XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Not Acceptable"
 msgstr "Pole aktsepteeritav"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Not Allowed"
 msgstr "Pole lubatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Remote Server Not Found"
 msgstr "Kaugserverit ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Remote Server Timeout"
 msgstr "Kaugserver ületas ajapiirangu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Server Overloaded"
 msgstr "Server on ülekoormatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Service Unavailable"
 msgstr "Teenus pole saadaval"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Unexpected Request"
 msgstr "Ootamatu päring"
 
-#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Authorization Aborted"
 msgstr "Volituste andmine katkestati"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Invalid Authorization Mechanism"
 msgstr "Vigane volituste andmise mehhanism"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Authorization mechanism too weak"
 msgstr "Volituste andmise mehhanism on liiga nõrk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Authentication Failure"
 msgstr "Tõrge autentimisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Bad Format"
 msgstr "Vigane vorming"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Bad Namespace Prefix"
-msgstr ""
+msgstr "Vigane nimeruumi eesliide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Resource Conflict"
 msgstr "Vahendi vastuolu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
-msgstr ""
+msgstr "Ühenduse ajapiirang"
 
-#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Host Unknown"
 msgstr "Tundmatu host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1979
 msgid "Improper Addressing"
 msgstr "Väär adresseering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Invalid ID"
 msgstr "Vigane ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Invalid Namespace"
 msgstr "Vigane nimeruum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Invalid XML"
 msgstr "Vigane XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Non-matching Hosts"
 msgstr "Mittevastavad hostid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Policy Violation"
-msgstr ""
+msgstr "Reeglite rikkumine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Remote Connection Failed"
 msgstr "Tõrge kaugühenduse loomisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource Constraint"
 msgstr "Vahendi piirang"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2001
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "System Shutdown"
-msgstr ""
+msgstr "Süsteemi seiskamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Unsupported Encoding"
 msgstr "Toetamata kooditabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "Unsupported Version"
 msgstr "Toetamata versioon"
 
-#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "XML Not Well Formed"
 msgstr "XML pole korrektselt vormindatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Stream Error"
 msgstr "Voo viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:2100
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kasutajat %s pole võimalik tõrjuda"
 
-#: ../libpurple/protocols/jabber/jabber.c:2120
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2125
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2144
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tundmatu roll: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2149
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kasutajale pole võimalik rolli \"%s\" määrata: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kasutajat pole võimalik välja lüüa: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2233
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kasutajat %s pole võimalik pingida"
 
-#: ../libpurple/protocols/jabber/jabber.c:2251
-#: ../libpurple/protocols/jabber/jabber.c:2262
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2288
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2308
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4139
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
-#: ../libpurple/protocols/yahoo/yahoo.c:4139
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "config:  Configure a chat room."
 msgstr "config:  Jututoa seadistamine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Jututoa seadistamine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2353
 msgid "part [room]:  Leave the room."
 msgstr "part [tuba]:  Toast lahkumine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "register:  Register with a chat room."
 msgstr "register:  Jututuppa registreerumine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2364
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uus teema]:  Teema vaatamine või muutmine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2370
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;kasutaja&gt; [tuba]:  Kasutaja tõrjumine jututoast."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;kasutaja&gt; [põhjus]:  Kasutaja tõrjumine toast."
 
-#: ../libpurple/protocols/jabber/jabber.c:2376
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2382
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6257,30 +4411,24 @@ msgstr ""
 "role &lt;kasutaja&gt; &lt;moderator|participant|visitor|none&gt;: Kasutaja "
 "rolli määramine selle ruumi jaoks."
 
-#: ../libpurple/protocols/jabber/jabber.c:2388
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;kasutaja&gt; [sõnum]:  Kasutaja kutsumine jututuppa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2394
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;tuba&gt; [server]:  Serveris asuva jututoaga ühinemine."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+"join: &lt;tuba&gt; [parool]:  Selles serveris asuva jututoaga ühinemine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2400
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;kasutaja&gt; [tuba]:  Kasutaja toast väljalöömine."
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;kasutaja&gt; [põhjus]:  Kasutaja väljalöömine toast."
 
-#: ../libpurple/protocols/jabber/jabber.c:2405
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;kasutaja&gt; &lt;sõnum&gt;:  Erasõnumi saatmine teisele kasutajale."
 
-#: ../libpurple/protocols/jabber/jabber.c:2411
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tKasutaja, komponendi või serveri pingimine."
 
-#: ../libpurple/protocols/jabber/jabber.c:2416
-#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
@@ -6294,96 +4442,70 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP protokolli plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Domeen"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "SSL/TLS on vajalik"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Vana SSL-i sunnitakse peale (port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Avatekstiline autentimise on üle krüptimata andmevoo lubatud"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3466
-#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Ühendumisport"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3463
-#: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "Ühendumisserver"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "Failiülekande proksid"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s lahkus vestlusest."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s seadis uueks teemaks: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Teema on: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Tõrge sõnumi edastamisel kasutajale %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "XMPP sõnumi viga"
 
-#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
-msgid " (Code %s)"
-msgstr " (Kood %s)"
+msgid "(Code %s)"
+msgstr "(Kood %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "XML'i parsimise viga"
 
-#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:522
-#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "Uue ruumi loomine"
 
-#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6391,88 +4513,66 @@ msgstr ""
 "Sa lood uut tuba. Kas sa soovid sellele seadistusi määrata või nõustud "
 "vaikimisi seadistustega?"
 
-#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "_Seadista tuba"
 
-#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_Nõustu vaikeväärtustega"
 
-#: ../libpurple/protocols/jabber/presence.c:573
-#, c-format
-msgid "Error in chat %s"
-msgstr "Viga vestluses %s"
-
-#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Viga vestlusega %s ühinemisel"
 
-#: ../libpurple/protocols/jabber/si.c:1009
+#, c-format
+msgid "Error in chat %s"
+msgstr "Viga vestluses %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-"Kasutajale %s pole võimalik faili saata kuna kasutaja ei toeta "
+"Kasutajale %s pole võimalik faili saata, kuna kasutaja ei toeta "
 "failiülekandeid"
 
-#: ../libpurple/protocols/jabber/si.c:1010
-#: ../libpurple/protocols/jabber/si.c:1011
-#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Tõrge faili saatmisel"
 
-#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kasutajale %s pole võimalik faili saata, JID on vigane."
 
-#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kasutajale %s pole võimalik faili saata, kasutaja pole võrku ühendatud"
 
-#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1092
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "Vahendi valimine"
 
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "Kasutaja meeleolu määramine"
 
-#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Palun vali nimekirjast oma meeleolu."
 
-#: ../libpurple/protocols/jabber/usermood.c:201
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Määra"
 
-#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "Määra meeleolu..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Määra kasutaja hüüdnimi"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Palun määra omale uus hüüdnimi."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -6480,30 +4580,22 @@ msgstr ""
 "See teave on nähtav kõigile sinu kontaktide nimekirjas olijatele, sestap "
 "määra teemakohased andmed."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Määra hüüdnimi..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
 msgstr "Tegevused"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 msgid "Select an action"
 msgstr "Tegevuse valimine"
 
-#: ../libpurple/protocols/msn/contact.c:712
 msgid "Unable to retrieve MSN Address Book"
 msgstr "MSN-i aadressiraamatut pole võimalik vastu võtta"
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Küsimus konto %s sõbranimekirja sünkroniseerimise kohta (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6512,412 +4604,319 @@ msgstr ""
 "%s on kohalikus nimekirjas grupis \"%s\", kuid mitte serveri nimekirjas. Kas "
 "sa soovid sõpra sinna nimekirja lisada?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/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 on kohalikus nimekirjas, serveri nimekirjas aga mitte. Kas soovid seda "
+"sõpra ka serveri nimekirja lisada?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Sõnumit pole võimalik parsida"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Süntaksi viga (arvatavasti kliendi viga)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr "Vigane e-posti aadress"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Kasutajat pole olemas"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Puudub täielik domeeninimi"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Juba sisse logitud"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
-msgid "Invalid screen name"
-msgstr "Vigane ekraaninimi"
+#, c-format
+msgid "Invalid username"
+msgstr "Vigane kasutajanimi"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Vigane sõbralik nimi"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Nimekiri on täis"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Juba olemas"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Pole nimekirjas"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:760
+#, c-format
 msgid "User is offline"
 msgstr "Kasutaja pole ühendatud"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Liiga palju gruppe"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Vigane grupp"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Kasutaja pole grupis"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Grupinimi on liiga pikk"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
-msgstr ""
+msgstr "Nullgruppi pole võimalik eemaldada"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr ""
+msgstr "Kasutajat prooviti lisada olematusse gruppi"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Tõrge teavituse ülekandmisel"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:121
+#, c-format
 msgid "Not logged in"
 msgstr "Pole sisse logitud"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Teenus pole ajutiselt kättesaadav"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Andmebaasiserveri viga"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Käsk on keelatud"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Viga failioperatsioonil"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Viga mälu eraldamisel"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Serverile saadeti vale CHL-väärtus"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Server on hõivatud"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Server pole saadaval"
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Viga andmebaasiühenduses"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Viga ühenduse loomisel"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Kirjutamine pole võimalik"
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Seanss on ülekoormatud"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Kasutaja on liiga aktiivne"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Liiga palju seansse"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Sõbralik nimi muutub liiga tihti"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Server on liiga hõivatud"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1418
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
+#, c-format
 msgid "Authentication failed"
 msgstr "Tõrge autentimisel"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Võrku ühendamata kasutajale pole see lubatud"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Uusi kasutajaid vastu ei võeta"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport'i kontot pole veel üle vaadatud"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Halb pilet"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Tundmatu veakood %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-i viga: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Müks"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s müksas sind!"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Kasutaja %s müksamine..."
 
-#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
+msgid "Email Address..."
+msgstr "E-posti aadress..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Sinu MSN-i sõbralik nimi on liiga pikk."
 
-#: ../libpurple/protocols/msn/msn.c:282 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Sõbraliku nime määramine."
 
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Selle nimega näevad sind MSN-is olevad sõbrad."
 
-#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Oma kodutelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:318 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Oma töötelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Oma mobiiltelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
 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 ""
 
-#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Luba"
 
-#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Ära luba"
 
-#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
-msgid "This Hotmail account may not be active."
-msgstr "See Hotmaili konto võib mitte aktiivne olla."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:400 ../libpurple/protocols/msnp9/msn.c:397
-msgid "Send a mobile message."
+msgid "No text is blocked for this account."
+msgstr ""
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
+msgid "This account does not have email enabled."
+msgstr "Selle konto jaoks pole e-post lubatud."
+
+msgid "Send a mobile message."
+msgstr "Mobiilisõnumi saatmine."
+
 msgid "Page"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:665 ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "Kodutelefoni number"
 
-#: ../libpurple/protocols/msn/msn.c:669 ../libpurple/protocols/msnp9/msn.c:571
 msgid "Work Phone Number"
 msgstr "Töötelefoni number"
 
-#: ../libpurple/protocols/msn/msn.c:673 ../libpurple/protocols/msnp9/msn.c:575
 msgid "Mobile Phone Number"
 msgstr "Mobiiltelefoni number"
 
-#: ../libpurple/protocols/msn/msn.c:696 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:594
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3114
-#: ../libpurple/protocols/yahoo/yahoo.c:3798
 msgid "Be Right Back"
 msgstr "Tulen kohe tagasi"
 
-#: ../libpurple/protocols/msn/msn.c:702 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:598
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3116
-#: ../libpurple/protocols/yahoo/yahoo.c:3801
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
-#: ../libpurple/protocols/yahoo/yahoo.c:3813
 msgid "On the Phone"
 msgstr "Räägin telefoniga"
 
-#: ../libpurple/protocols/msn/msn.c:712 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3128
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
 msgid "Out to Lunch"
 msgstr "Lõunal"
 
@@ -6927,345 +4926,193 @@ msgstr "Lõunal"
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:731
-#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Esitaja"
 
-#: ../libpurple/protocols/msn/msn.c:732
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Määra sõbralik nimi..."
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Määra kodutelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Määra töötelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Määra mobiiltelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobiilseadmete lubamine/keelamine"
 
-#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
+msgid "View Blocked Text..."
+msgstr ""
+
 msgid "Open Hotmail Inbox"
 msgstr "Ava Hotmaili postkast"
 
-#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:819 ../libpurple/protocols/msnp9/msn.c:703
-#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Algata _jututuba"
 
-#: ../libpurple/protocols/msn/msn.c:857 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN-ile on vaja SSL-i tuge. Palun paigalda toetatud SSL-teek."
 
-#: ../libpurple/protocols/msn/msn.c:887 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "Tõrge serveriga ühendumisel."
 
-#: ../libpurple/protocols/msn/msn.c:1671 ../libpurple/protocols/msn/msn.c:2014
-#: ../libpurple/protocols/msnp9/msn.c:1527
-#: ../libpurple/protocols/msnp9/msn.c:1870
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
-#: ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1593 ../pidgin/plugins/convcolors.c:371
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Üldine"
 
-#: ../libpurple/protocols/msn/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1600
-#: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Vanus"
 
-#: ../libpurple/protocols/msn/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1602
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Amet"
 
-#: ../libpurple/protocols/msn/msn.c:1747
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/myspace/user.c:133
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:802
-#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../libpurple/protocols/msn/msn.c:1752 ../libpurple/protocols/msn/msn.c:1944
-#: ../libpurple/protocols/msn/msn.c:1950 ../libpurple/protocols/msn/msn.c:1957
-#: ../libpurple/protocols/msnp9/msn.c:1608
-#: ../libpurple/protocols/msnp9/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1813
 msgid "Hobbies and Interests"
 msgstr "Hobid ja huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1758 ../libpurple/protocols/msn/msn.c:1878
-#: ../libpurple/protocols/msn/msn.c:1884 ../libpurple/protocols/msn/msn.c:1891
-#: ../libpurple/protocols/msn/msn.c:1899 ../libpurple/protocols/msn/msn.c:1906
-#: ../libpurple/protocols/msnp9/msn.c:1614
-#: ../libpurple/protocols/msnp9/msn.c:1734
-#: ../libpurple/protocols/msnp9/msn.c:1740
-#: ../libpurple/protocols/msnp9/msn.c:1747
-#: ../libpurple/protocols/msnp9/msn.c:1755
-#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "A Little About Me"
 msgstr "Väheke minust"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1777
-#: ../libpurple/protocols/msnp9/msn.c:1633
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Perekonnaseis"
 
-#: ../libpurple/protocols/msn/msn.c:1778
-#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "Huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "Lemmikloomad"
 
-#: ../libpurple/protocols/msn/msn.c:1780
-#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "Kodulinn"
 
-#: ../libpurple/protocols/msn/msn.c:1781
-#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "Endised elukohad"
 
-#: ../libpurple/protocols/msn/msn.c:1782
-#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "Mood"
 
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "Huumor"
 
-#: ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "Muusika"
 
-#: ../libpurple/protocols/msn/msn.c:1785 ../libpurple/protocols/msn/msn.c:1966
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1641
-#: ../libpurple/protocols/msnp9/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1828
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lemmiktsitaat"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "Kontaktandmed"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "Isiklik"
 
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone"
 msgstr "Kodutelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msnp9/msn.c:1664
 msgid "Home Phone 2"
 msgstr "Kodutelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1809
-#: ../libpurple/protocols/msnp9/msn.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Home Address"
 msgstr "Koduaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Personal Mobile"
 msgstr "Isiklik mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Home Fax"
 msgstr "Kodufaks"
 
-#: ../libpurple/protocols/msn/msn.c:1812
-#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal Email"
 msgstr "Isiklik e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1813
-#: ../libpurple/protocols/msnp9/msn.c:1669
 msgid "Personal IM"
 msgstr "Isiklikud välksõnumid"
 
-#: ../libpurple/protocols/msn/msn.c:1815
-#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr "Tähtpäev"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "Tööl"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Töö nimetus"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1691
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Osakond"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "Ametikoht"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "Töötelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "Töötelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1839
-#: ../libpurple/protocols/msnp9/msn.c:1695
-#: ../libpurple/protocols/oscar/oscar.c:3839
 msgid "Work Address"
 msgstr "Tööaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1840
-#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "Töö-mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "Tööpeiler"
 
-#: ../libpurple/protocols/msn/msn.c:1842
-#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "Tööfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1843
-#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work Email"
 msgstr "Töö e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1844
-#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#: ../libpurple/protocols/msn/msn.c:1915 ../libpurple/protocols/msn/msn.c:1921
-#: ../libpurple/protocols/msn/msn.c:1928 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msnp9/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1777
-#: ../libpurple/protocols/msnp9/msn.c:1784
-#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Favorite Things"
 msgstr "Lemmikasjad"
 
-#: ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "Viimati uuendatud"
 
-#: ../libpurple/protocols/msn/msn.c:1991
-#: ../libpurple/protocols/msnp9/msn.c:1847
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: ../libpurple/protocols/msn/msn.c:2015
-#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid "The user has not created a public profile."
 msgstr "Kasutaja pole loonud avalikku profiili."
 
-#: ../libpurple/protocols/msn/msn.c:2016
-#: ../libpurple/protocols/msnp9/msn.c:1872
 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 ""
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1876
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7273,9 +5120,6 @@ msgstr ""
 "Kasutajaprofiili kohta pole võimalik mingeid andmeid leida. Kõige "
 "tõenäolisemalt pole seda kasutajat olemas."
 
-#: ../libpurple/protocols/msn/msn.c:2028
-#: ../libpurple/protocols/msnp9/msn.c:1884
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiili URL"
 
@@ -7289,130 +5133,81 @@ msgstr "Profiili URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2315 ../libpurple/protocols/msn/msn.c:2317
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger'i protokolli plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2352
-#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Kasutatakse HTTP meetodit"
 
-#: ../libpurple/protocols/msn/msn.c:2357
-#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "HTTP-meetodi server"
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Kasutatakse kohandatud tujunägusid"
 
-#: ../libpurple/protocols/msn/msn.c:2370
-#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: kasutaja müksamine tema tähelepanu võitmiseks"
 
-#: ../libpurple/protocols/msn/nexus.c:70
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID autentimine: Ühendumine pole võimalik"
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:126
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Windows Live ID autentimine: Serveri vastusest pole võimalik "
-"autentimistõendit leida"
-
-#: ../libpurple/protocols/msn/nexus.c:172
-msgid "Windows Live ID authentication Failed"
-msgstr "Tõrge Windows Live ID autentimisel"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID autentimine:Vigane vastus"
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s pole korrektne grupp."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s müksas sind!"
 
-#: ../libpurple/protocols/msn/notification.c:836
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Tundmatu viga (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4479
 msgid "Unable to add user"
 msgstr "Kasutajat pole võimalik lisada"
 
-#: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr ""
+msgstr "Kasutajat %s ei lisatud, kuna sinu sõbranimekiri on täis."
 
-#: ../libpurple/protocols/msn/notification.c:922
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Teenus pole ajutiselt kättesaadav."
 
-#: ../libpurple/protocols/msn/notification.c:1276
-#: ../libpurple/protocols/msnp9/notification.c:898
+msgid "Mobile message was not sent because it was too long."
+msgstr "Mobiilisõnumit ei saadetud, kuna see oli liiga pikk."
+
 msgid "Unable to rename group"
 msgstr "Gruppi pole võimalik ümber nimetada"
 
-#: ../libpurple/protocols/msn/notification.c:1331
-#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "Gruppi pole võimalik kustutada"
 
-#: ../libpurple/protocols/msn/notification.c:1945
-#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7431,40 +5226,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Sõnumit ei saadetud, kuna sõnumeid saadetakse liiga kiiresti."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"Sõnumit ei saadetud, kuna saatmisel tekkis kooditabeliga seotud tundmatu "
+"viga."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Sõnumit ei saadetud, kuna saatmisel tekkis tundmatu viga."
+
 msgid "Unable to connect"
 msgstr "Ühendumine pole võimalik"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Viga kirjutamisel"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Viga lugemisel"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7473,141 +5259,90 @@ msgstr ""
 "Ühenduse viga %s serverist:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "Meie protokoll pole serveri poolt toetatud."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Viga HTTP parsimisel."
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Sa oled teisest kohast sisse loginud."
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN serverid pole ajutiselt kättesaadavad. Palun oota ja proovi uuesti."
 
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN serverid jäetakse ajutiselt seisma"
 
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Pole võimalik autentida: %s"
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Sinu MSN-i sõbranimekiri pole ajutiselt saadaval. Palun oota ja proovi "
 "uuesti."
 
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Käepigistus"
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:358
+msgid "Transferring"
+msgstr "Ülekandmine"
+
 msgid "Starting authentication"
 msgstr "Autentimise alustamine"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Küpsise võtmine"
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Küpsise saatmine"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
-msgstr "Sõbraloendi vastuvõtmine"
+msgstr "Sõbranimekirja vastuvõtmine"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Arvutist eemal"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Räägin telefoniga"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Lõunal"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Võib-olla jäi sõnum ajapiirangu ületamise tõttu saatmata:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Nähtamatu olles pole võimalik sõnumit saata:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "Võrku ühendumata kasutajale pole võimalik sõnumit saata:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Ühenduse vea tõttu pole võimalik sõnumit saata:"
 
-#: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:428
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Sõnumit pole võimalik saata kuna me saadame liiga kiiresti:"
+msgstr "Sõnumit pole võimalik saata, kuna me saadame liiga kiiresti:"
 
-#: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:432
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:447
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Sõnumit pole võimlik saata kuna leidis aset tundmatu viga:"
+msgstr "Sõnumit pole võimlik saata, kuna leidis aset tundmatu viga:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s lisas sinu oma sõbranimekirja."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s eemaldas sinu oma sõbranimekirjast."
@@ -7615,18 +5350,16 @@ msgstr "%s eemaldas sinu oma sõbranimekirjast."
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" pole võimalik lisada."
 
-#: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:655
-msgid "The screen name specified is invalid."
-msgstr "Määratud ekraaninimi on vigane."
+msgid "The username specified is invalid."
+msgstr "Määratud kasutajanimi on vigane."
+
+msgid "This Hotmail account may not be active."
+msgstr "See Hotmaili konto võib mitte aktiivne olla."
 
-#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr "Sina tema loendis"
 
@@ -7640,20 +5373,15 @@ msgstr "Sina tema loendis"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2170
-#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolli plugin"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Šiffer on puudu"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "RC4 šifrit pole võimalik leida"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -7661,57 +5389,46 @@ msgstr ""
 "Uuenda oma libpurple teeki nii, et see toetakse RC4u šifrit (>= 2.0.1). "
 "MySpaceIM jäetakse laadimata."
 
-#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:353
 msgid "Unexpected challenge length from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:357
 msgid "Logging in"
 msgstr "Sisselogimine"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+msgstr[1] ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New mail messages"
 msgstr "Uued e-posti sõnumid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
 msgstr "Uued blogikommentaarid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
 msgstr "Uued profiilikommentaarid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
 msgstr "Uued sõbrakutsed!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
 msgstr "Uued pildikommentaarid"
 
-#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1585
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - Kasutajanimi on määramata"
 
-#: ../libpurple/protocols/myspace/myspace.c:1586
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "Sul ei paista MySpace kasutajanime olevat."
 
-#: ../libpurple/protocols/myspace/myspace.c:1587
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
 "Kas sa soovid praegu ühe määrata? (Märkus: SEDA POLE VÕIMALIK HILJEM MUUTA!)"
@@ -7719,17 +5436,13 @@ msgstr ""
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1611
-#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: ../libpurple/protocols/myspace/myspace.c:1846
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protkolli viga, veakood %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1868
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7738,190 +5451,145 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1891
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM viga"
 
-#: ../libpurple/protocols/myspace/myspace.c:2069
-#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
 msgstr "Tõrge sõbra lisamisel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2069
 msgid "'addbuddy' command failed."
 msgstr "Tõrge 'addbuddy' käsu täitmisel."
 
-#: ../libpurple/protocols/myspace/myspace.c:2103
-#: ../libpurple/protocols/myspace/myspace.c:2348
 msgid "persist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
 msgstr "Sellist kasutajat pole: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2210
 msgid "User lookup"
-msgstr ""
+msgstr "Kasutaja otsimine"
 
-#: ../libpurple/protocols/myspace/myspace.c:2329
-#: ../libpurple/protocols/myspace/myspace.c:2348
-#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "Failed to remove buddy"
 msgstr "Tõrge sõbra eemaldamisel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
 msgstr "Tõrge 'delbuddy' käsu täitmisel."
 
-#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "blocklist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2484
 msgid "Invalid input condition"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Read buffer full (2)"
 msgstr "Lugemispuhver on täis (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
 msgstr "Analüüsimatu sõnum"
 
-#: ../libpurple/protocols/myspace/myspace.c:2653
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2831
 msgid "IM Friends"
-msgstr "IM-sõbrad"
+msgstr "Välksõnumi-sõbrad"
 
-#: ../libpurple/protocols/myspace/myspace.c:2931
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"Serverist lisati või uuendati %d sõber (kaasa arvatud sõbrad, kes on juba "
+"serveripoolses nimekirjas)"
+msgstr[1] ""
 "Serverist lisati või uuendati %d sõpra (kaasa arvatud sõbrad, kes on juba "
 "serveripoolses nimekirjas)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2932
 msgid "Add contacts from server"
 msgstr "Serverist kontaktide lisamine"
 
-#: ../libpurple/protocols/myspace/myspace.c:2984
-#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
 msgstr "Sõprade lisamine MySpace.com'ist"
 
-#: ../libpurple/protocols/myspace/myspace.c:2985
 msgid "Importing friends failed"
 msgstr "Tõrge sõprade importimisel"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3041
 msgid "Find people..."
 msgstr "Otsi inimesi..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3044
 msgid "Change IM name..."
-msgstr "Minu IM-nime..."
+msgstr "Muuda välksõnumi nime..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr "myim URL-ikäsitleja"
 
-#: ../libpurple/protocols/myspace/myspace.c:3346
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Kuvatava nime näitamine olekutekstis"
 
-#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3478
 msgid "Send emoticons"
 msgstr "Tujunägude saatmine"
 
-#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
 msgstr "Ekraani eraldusvõime (punkti tollile)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Base font size (points)"
 msgstr "Aluskirjatüübi suurus (punktides)"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:790
-#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Kasutaja"
 
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3025
 msgid "Profile"
 msgstr "Profiil"
 
-#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Laul"
 
-#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Sõpru kokku"
 
-#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Kliendi versioon"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:570
 msgid "No username set"
 msgstr "Kasutajanimi on määramata"
 
-#: ../libpurple/protocols/myspace/user.c:577
-#: ../libpurple/protocols/myspace/user.c:671
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Palun määra kasutajanimi"
 
-#: ../libpurple/protocols/myspace/user.c:578
 msgid "Please enter a username to check its availability:"
 msgstr ""
 "Palun sisesta kasutajanimi, et kontrollida selle kasutamise võimalikkust:"
 
-#: ../libpurple/protocols/myspace/user.c:658
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Kasutajanimi on saadaval"
 
-#: ../libpurple/protocols/myspace/user.c:659
 msgid "This username is available. Would you like to set it?"
 msgstr "Kasutajanimi on vaba. Kas sa soovid seda pruukida?"
 
-#: ../libpurple/protocols/myspace/user.c:660
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "KUI SEE ON JUBA MÄÄRATUD, POLE SEDA ENAM VÕIMALIK MUUTA!"
 
-#: ../libpurple/protocols/myspace/user.c:672
 msgid "This username is unavailable."
 msgstr "See kasutajanimi pole saadaval."
 
-#: ../libpurple/protocols/myspace/user.c:673
 msgid "Please try another username:"
 msgstr "Palun proovi mõnda muud kasutajanime:"
 
@@ -7931,32 +5599,25 @@ msgstr "Palun proovi mõnda muud kasutajanime:"
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:48
-#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Osuta tähelepanu"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s osutas sulle tähelepanu!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Kasutajale %s tähelepanu osutamine..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Anna kõrvakiil"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s andis sulle kõrvakiilu!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Kasutajale %s kõrvakiilu andmine..."
@@ -7964,76 +5625,61 @@ msgstr "Kasutajale %s kõrvakiilu andmine..."
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Pane põlema"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s pani sind põlema!"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Kasutaja %s põlemapanemine..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Anna musi"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s andis sulle musi!"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Kasutajale %s musi andmine..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Kallista"
 
-#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s kallistas sind!"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Kasutaja %s kallistamine..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Anna laksu"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s andis sulle laksu!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Kasutajale %s laksu andmine..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Torgi"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s torkis sind!"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Kasutaja %s torkimine..."
@@ -8041,16 +5687,13 @@ msgstr "Kasutaja %s torkimine..."
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "Viska viis"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s lõi sinuga plaksu!"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Kasutajale %s plaksu löömine..."
@@ -8058,16 +5701,13 @@ msgstr "Kasutajale %s plaksu löömine..."
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Tünga"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s tüngas sind!"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Kasutaja %s tüngamine..."
@@ -8079,132 +5719,101 @@ msgstr "Kasutaja %s tüngamine..."
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Purista suud"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s puristas sinu poole suud!"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Kasutaja %s poole puristamine..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Võrku kirjutamine pole võimalik"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Võrgust pole võimalik lugeda"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Viga serveriga suhtlemisel"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Konverentsi ei leitud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Konverentsi pole olemas"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Selle nimega kataloog on juba olemas"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Toetamata"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Parool on aegunud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Vigane parool"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Kasutajat ei leitud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Konto on keelatud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
-msgstr ""
+msgstr "Serveril pole kataloogile ligipääsu"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Sinu süsteemiülem on selle toimingu keelanud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Server pole saadavalm, proovi hiljem uuesti"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Ühte kontakti pole samasse kataloogi võimalik kaks korda lisada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Ennast pole võimalik lisada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr "Vigane ekraaninimi või parool"
+msgid "Incorrect username or password"
+msgstr "Vigane kasutajanimi või parool"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
-msgstr ""
+msgid "Could not recognize the host of the username you entered"
+msgstr "Sinu poolt sisestatud kasutajanimest pole võimalik hosti ära tunda"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
 "Sinu konto keelati liiga suure hulga valede paroolide sisestamise tõttu"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Samasse vestlusesse pole võimalik ühte isikut kaks korda lisada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
-msgstr "Sa sisestasid vigase ekraaninime"
+msgid "You have entered an incorrect username"
+msgstr "Sa sisestasid vigase kasutajanime"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Kataloogi uuendamise käigus tekkis viga"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Protokolli versioon ei ühildu"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Sa oled kasutaja poolt blokitud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8212,55 +5821,44 @@ msgstr ""
 "See prooviversioon ei luba rohkem kui kümnel kasutajal samaaegselt sisse "
 "logida"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Kasutaja pole võrgus või oled sa blokitud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Tundmatu viga: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Tõrge sisselogimisel (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Sõnumit pole võimalik saata. Kasutaja kohta pole võimalik üksikasju hankida "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kasutajat %s pole võimalik sinu sõbranimekirja lisada (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Sõnumit pole võimalik saata (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kasutajat pole võimalik kutsuda (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Sõnumit pole võimalik saata. Konverentsi pole võimalik luua (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8269,7 +5867,6 @@ msgstr ""
 "Kasutajat %s pole võimalik serveripoolses nimekirjas kausta %s tõsta. Viga "
 "kausta loomisel (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8278,62 +5875,46 @@ msgstr ""
 "Kasutajat %s pole võimalik sinu sõbranimekirja lisada. Serveripoolses "
 "nimekirjas tekkis kausta loomisel viga (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kasutaja %s (%s) kohta pole võimalik üksikasju hankida."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kasutajat pole võimalik privaatsusnimekirja lisada (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kasutajat %s pole võimalik privaatsusnimekirjast eemaldada (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Serveripoolseid privaatsussätteid pole võimalik muuta (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Konverentsi pole võimalik luua (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Viga serveriga suhtlemisel. Ühendus suletakse."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Telefoninumber"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Isiklik tiitel"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "Kasutaja ID"
 
@@ -8343,37 +5924,29 @@ msgstr "Kasutaja ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Täisnimi"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konverents %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autentimine..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Serveriga pole võimalik ühenduda."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Vastuse ootamine..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s kutsus sind selles vestluses osalema."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Kutse vestlusele"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8384,31 +5957,28 @@ msgstr ""
 "\n"
 "Saadetud: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Kas sa soovid vestlusega ühineda?"
 
-#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
-msgstr "Sind logiti välja kuna sa logisid sisse teisest tööjaamast."
+msgstr "Sind logiti välja, kuna sa logisid sisse teisest tööjaamast."
 
-#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
+"Serveriga pole võimalik ühendust saada. Palun sisesta serveri aadress, "
+"millega soovid ühenduda."
 
-#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Viga. SSL-i tugi pole paigaldatud."
 
-#: ../libpurple/protocols/novell/novell.c:2522
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "See konverents on suletud. Rohkem sõnumeid pole võimalik saata."
 
@@ -8422,41 +5992,24 @@ msgstr "See konverents on suletud. Rohkem sõnumeid pole võimalik saata."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3536
-#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger protokolli plugin"
 
-#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Serveri aadress"
 
-#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Serveri port"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:62
 msgid "Could not join chat room"
 msgstr "Jututoaga pole võimalik ühineda"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Invalid chat room name"
 msgstr "Vigane jututoa nimi"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2487
-#: ../libpurple/protocols/yahoo/yahoo.c:2655
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Server sulges ühenduse."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
-#: ../libpurple/protocols/yahoo/yahoo.c:2648 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8465,10 +6018,6 @@ msgstr ""
 "Ühendus serveriga katkes:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr ""
 
@@ -8482,8 +6031,6 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM protokolli plugin"
 
@@ -8497,151 +6044,113 @@ msgstr "AIM protokolli plugin"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ protokolli plugin"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4427
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Encoding"
 msgstr "Kooditabel"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Kaugkasutaja sulges ühenduse."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Ühendus kaugkasutajaga katkes:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
-msgstr ""
+msgstr "Kaugkasutajaga pole võimalik ühendust saada."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Ebakorrektne viga"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "Vigane SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Teenus pole saadaval"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Teenust pole kirjeldatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "Pole hosti poolt toetatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "Pole kliendi poolt toetatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
-msgstr ""
+msgstr "Vastus on liiga suur"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
-msgstr ""
+msgstr "Päring on keelatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Pole piisavalt õiguseid"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (sender)"
+msgid "Warning level too high (sender)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:135
-msgid "Too evil (receiver)"
+msgid "Warning level too high (receiver)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "Kasutaja pole ajutiselt saadaval"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:347
 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 "
@@ -8653,7 +6162,6 @@ msgstr ""
 "tead, mis kooditabelit su sõber kasutab, siis saad sa seda määrata oma AIM/"
 "ICQ konto laiendatud valikute alt.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8664,135 +6172,101 @@ msgstr ""
 "klienti.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2444
-#: ../pidgin/gtkutils.c:2474
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Sõbraikoon"
 
-#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Hääl"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:6113
 msgid "Get File"
-msgstr ""
+msgstr "Faili hankimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Mängud"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Lisad"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ otseühendus"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ serveri relee"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Vana ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian krüptimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Videovestlus"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kaamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5883
+msgid "Screen Sharing"
+msgstr ""
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5918
+#, c-format
 msgid "Not Available"
 msgstr "Pole saadaval"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5904
+#, c-format
 msgid "Occupied"
 msgstr "Hõivatud"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3132 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
+#, c-format
 msgid "Invisible"
 msgstr "Nähtamatu"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3740
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "IP-aadress"
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Warning Level"
 msgstr "Hoiatuste tase"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Sõbra kommentaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8801,7 +6275,6 @@ msgstr ""
 "Autentimisserveriga pole võimalik ühendust saada:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8810,153 +6283,114 @@ msgstr ""
 "BOS-serveriga pole võimalik ühendust saada:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
-msgid "Screen name sent"
-msgstr "Ekraaninimi saadetud"
+msgid "Username sent"
+msgstr "Kasutajanimi saadetud"
 
-#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Ühendus saavutatud, küpsis saadetud"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Ühendumise lõpuleviimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:1302
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1388
-#: ../libpurple/protocols/yahoo/yahoo.c:2109
-msgid "Invalid screen name."
-msgstr "Vigane ekraaninimi."
-
-#: ../libpurple/protocols/oscar/oscar.c:1394
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+msgid "Invalid username."
+msgstr "Vigane kasutajanimi."
+
 msgid "Incorrect password."
 msgstr "Vale parool."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1398
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL'i välksõnumiserver pole ajutiselt saadaval."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1406
-#: ../libpurple/protocols/oscar/oscar.c:1415
 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 ""
+"Sinu ühendumine ja ühenduse katkestamine toimub liiga sagedasi. Oota 10 "
+"minutit ja proovi siis uuesti. Kui sa aga samamoodi jätkad, siis pead pärast "
+"ka kauem ootama."
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1410
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Sinu poolt kasutatava kliendi versioon on liiga vana. Palun hangi uuem "
 "versioon aadressilt %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Could Not Connect"
 msgstr "Pole võimalik ühenduda"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Received authorization"
 msgstr "Autoriseerimine vastu võetud"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
 msgid "The SecurID key entered is invalid."
 msgstr "Sisestatud SecurID võti on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:1488
 msgid "Enter SecurID"
 msgstr "SecurID sisestamine"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Sisesta digitaalkuval olev kuuekohaline number."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:2342
-#: ../libpurple/protocols/oscar/oscar.c:5988
-#: ../libpurple/protocols/oscar/oscar.c:6269 ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "_Olgu"
 
-#: ../libpurple/protocols/oscar/oscar.c:1530
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1533
-#: ../libpurple/protocols/oscar/oscar.c:1577
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1574
-#: ../libpurple/protocols/oscar/oscar.c:1673
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1676
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1706
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Parool saadetud"
 
-#: ../libpurple/protocols/oscar/oscar.c:1762
 msgid "Unable to initialize connection"
 msgstr "Ühendust pole võimalik lähtestada"
 
-#: ../libpurple/protocols/oscar/oscar.c:2251
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
+"Palun anna mulle volitused, et ma saaksin Sind oma sõbranimekirja lisada."
 
-#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Request Message:"
 msgstr "Volituste küsimise sõnum:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2292
 msgid "Please authorize me!"
 msgstr "Palun autoriseeri mind!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2333
-#: ../libpurple/protocols/oscar/oscar.c:2341
-#: ../libpurple/protocols/oscar/oscar.c:2468
-#: ../libpurple/protocols/oscar/oscar.c:5360
-#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Põhjendust pole määratud."
 
-#: ../libpurple/protocols/oscar/oscar.c:2340
 msgid "Authorization Denied Message:"
 msgstr "Volituste andmisest keeldumise sõnum:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8964,17 +6398,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2484
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8983,7 +6414,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2492
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8992,7 +6422,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9001,38 +6430,31 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2521
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr ""
+msgstr "ICQ kasutaja %u saatis sulle sõbra: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2527
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2532 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Lisa"
 
-#: ../libpurple/protocols/oscar/oscar.c:2533
 msgid "_Decline"
 msgstr "Lükka _tagasi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2657
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2666
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2675
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9041,21 +6463,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2684
 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2693
 #, 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."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2702
 #, 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."
@@ -9063,213 +6485,167 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2857
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Sõnumit pole võimalik saata: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2862
-#: ../libpurple/protocols/oscar/oscar.c:2926
 msgid "Unknown reason."
 msgstr "Tundmatu põhjus."
 
-#: ../libpurple/protocols/oscar/oscar.c:2860
-#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2926
 #, c-format
 msgid "User information not available: %s"
 msgstr "Kasutajateave pole saadaval: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Online Since"
 msgstr "Võrgus alates"
 
-#: ../libpurple/protocols/oscar/oscar.c:2962
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:2997
-msgid "Available Message"
-msgstr ""
+msgstr "Liige alates"
 
-#: ../libpurple/protocols/oscar/oscar.c:3101
 msgid "Your AIM connection may be lost."
 msgstr "Sinu AIM-ühendus võib olla katkenud."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3289
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
+"[Kasutaja poolt saadetud sõnumit pole võimalik kuvada, kuna see sisaldab "
+"vigaseid märke.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3453
 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 ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3538
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ühendus jututoaga %s on katkestatud."
 
-#: ../libpurple/protocols/oscar/oscar.c:3762
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Personal Web Page"
 msgstr "Isiklik veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Täiendavad andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:3824
-#: ../libpurple/protocols/oscar/oscar.c:3837
 msgid "Zip Code"
 msgstr "Indeks"
 
-#: ../libpurple/protocols/oscar/oscar.c:3848
+msgid "Work Information"
+msgstr "Töökoha andmed"
+
 msgid "Division"
 msgstr "Üksus"
 
-#: ../libpurple/protocols/oscar/oscar.c:3849
 msgid "Position"
 msgstr "Ametikoht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
-msgid "Work Information"
-msgstr "Töökoha andmed"
-
-#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Pop-Up Message"
 msgstr "Hüpiksõnum"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3955
-msgid "Screen name"
-msgstr "Ekraaninimi"
-
-#: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
-msgid "Error Changing Account Info"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
 msgstr ""
-"Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna küsitud ekraaninimi "
-"erineb algupärasest nimest."
+"Viga 0x%04x: Kasutajanime pole võimalik vormindada, kuna küsitud nimi erineb "
+"algupärasest nimest."
 
-#: ../libpurple/protocols/oscar/oscar.c:4041
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna see on vigane."
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+"Viga 0x%04x: Kasutajanime pole võimalik vormindada, kuna see on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:4044
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
 msgstr ""
-"Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna see on liiga pikk."
+"Viga 0x%04x: Kasutajanime pole võimalik vormindada, kuna see on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 msgstr ""
-"Viga 0x%04x: E-postiaadressi pole võimalik muuta kuna selle ekraaninime alt "
-"on tehtud päring, mis on hetkel veel lahendamata."
+"Viga 0x%04x: E-posti aadressi pole võimalik muuta, kuna selle kasutajanime "
+"alt on tehtud päring, mis on hetkel veel lahendamata."
 
-#: ../libpurple/protocols/oscar/oscar.c:4050
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 msgstr ""
-"Viga 0x%04x: E-posti aadressi pole võimalik muuta kuna määratud aadressiga "
-"on seotud liiga palju ekraaninimesid."
+"Viga 0x%04x: E-posti aadressi pole võimalik muuta, kuna määratud aadressiga "
+"on seotud liiga palju kasutajanimesid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Viga 0x%04x: E-posti aadressi pole võimalik muuta kuna määratud aadress on "
+"Viga 0x%04x: E-posti aadressi pole võimalik muuta, kuna määratud aadress on "
 "vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:4056
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Viga 0x%04x: Tundmatu viga."
 
-#: ../libpurple/protocols/oscar/oscar.c:4066
+msgid "Error Changing Account Info"
+msgstr ""
+
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Kasutaja %s e-posti aadress on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4068
 msgid "Account Info"
 msgstr "Konto andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM profile."
-msgstr ""
+msgstr "AIM-i profiili pole võimalik seada."
 
-#: ../libpurple/protocols/oscar/oscar.c:4521
 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 ""
+"Arvatavasti proovisid Sa oma profiili määrata enne sisselogimise "
+"protseduuride lõppemist.  Sinu profiil jääb muutmata. Proovi seda muuta "
+"pärast täielikku ühendumist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4535
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9280,11 +6656,9 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Profile too long."
 msgstr "Profiil on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4584
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9295,84 +6669,65 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4589
 msgid "Away message too long."
 msgstr "Eemaloleku teade on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4662
 #, c-format
 msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4664
-#: ../libpurple/protocols/oscar/oscar.c:5129
-#: ../libpurple/protocols/oscar/oscar.c:5144
 msgid "Unable To Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4783
 msgid "Unable To Retrieve Buddy List"
 msgstr "Sõbranimekirja pole võimalik vastu võtta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4784
 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 minutes."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4979
-#: ../libpurple/protocols/oscar/oscar.c:4981
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/oscar/oscar.c:5212
-#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5127
 #, 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õpra %s pole võimalik lisada kuna su sõbranimekirjas on juba liiga palju "
+"Sõpra %s pole võimalik lisada, kuna su sõbranimekirjas on juba liiga palju "
 "sõpru. Palun eemalda sealt mõni ja siis proovi uuesti."
 
-#: ../libpurple/protocols/oscar/oscar.c:5127
-#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "(no name)"
 msgstr "(nimi puudub)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5141
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Sõpra %s pole teadmata põhjusel võimalik lisada."
 
-#: ../libpurple/protocols/oscar/oscar.c:5275
 #, c-format
 msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
 msgstr ""
+"Kasutaja %s andis sulle loa enese lisamiseks sinu sõbranimekirja. Kas sa "
+"soovid seda kasutajat lisada?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5283
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5356
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5360
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9380,176 +6735,127 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5397
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Sinu välksõnumit ei saadetud kuna Sul pole võimalik AIM-vestlustes "
+"Sinu välksõnumit ei saadetud, kuna Sul pole võimalik AIM-vestlustes "
 "välksõnumeid saata."
 
-#: ../libpurple/protocols/oscar/oscar.c:5672
-#: ../libpurple/protocols/oscar/oscar.c:5677
-msgid "Away Message"
-msgstr "Eemaloleku sõnum"
-
-#: ../libpurple/protocols/oscar/oscar.c:5677
-msgid "<i>(retrieving)</i>"
-msgstr "<i>(vastuvõtmine)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5877
 msgid "iTunes Music Store Link"
 msgstr "iTunes muusikapoe viit"
 
-#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Sõbrakommentaar %s kohta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Buddy Comment:"
 msgstr "Sõbrakommentaar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6037
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6043
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "Ü_hendu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Get AIM Info"
 msgstr "Hangi AIM-andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
-#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6105
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6127
 msgid "Re-request Authorization"
 msgstr "Volituste uuestiküsimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "ICQ Privacy Options"
 msgstr "ICQ privaatsusvalikud"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "The new formatting is invalid."
 msgstr "Uus vormindus on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
-msgid "Screen name formatting can change only capitalization and whitespace."
+msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "Change Address To:"
 msgstr "Aadressi muutmine:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6313
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>sa ootad autoriseerimist</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sa ootad järgnevate sõprade autoriseerimist"
 
-#: ../libpurple/protocols/oscar/oscar.c:6317
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Find Buddy by Email"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Search for a buddy by email address"
 msgstr "Sõbra otsimine e-posti aadressi järgi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Sisesta otsitava sõbra e-posti aadress."
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "_Search"
 msgstr "_Otsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
-msgid "Set User Info (URL)..."
-msgstr "Kasutajate andmete määramine (URL)..."
+msgid "Set User Info (web)..."
+msgstr "Kasutajate andmete määramine (veebis)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6508
-msgid "Change Password (URL)"
-msgstr ""
+msgid "Change Password (web)"
+msgstr "Muuda parooli (veebis)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6512
-msgid "Configure IM Forwarding (URL)"
+msgid "Configure IM Forwarding (web)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6522
 msgid "Set Privacy Options..."
 msgstr "Määra privaatsusvalikud..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6529
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Display Currently Registered Email Address"
-msgstr ""
+msgstr "Praegu registreeritud e-posti aadressi kuvamine"
 
-#: ../libpurple/protocols/oscar/oscar.c:6537
 msgid "Change Currently Registered Email Address..."
-msgstr ""
+msgstr "Praegu registreeritud e-posti aadressi muutmine..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Search for Buddy by Email Address..."
-msgstr ""
+msgstr "Sõbra otsimine e-posti aadressi järgi..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Search for Buddy by Information"
-msgstr ""
+msgstr "Sõbra otsimine andmete järgi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6754
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9559,569 +6865,423 @@ msgstr ""
 "AIM/ICQ proksi serverit (aeglasem, kuid\n"
 "ei näita sinu IP-aaddressi välja)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Proovitakse ühenduda proksi serveri kaudu."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1039
 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 ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Peamised andmed"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Riik/Piirkond"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Tähtkuju"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Sodiaagimärk"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Veregrupp"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Indeks"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Mobiiltelefoni number"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
-msgstr ""
+msgstr "Veevalaja"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Kalad"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Jäär"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Sõnn"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Kaksikud"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Vähk"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Lõvi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Neitsi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Kaalud"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpion"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Ambur"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Kaljukits"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Rott"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Pühvel"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tiiger"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Jänes"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Draakon"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Madu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Hobune"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Kits"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Ahv"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Kukk"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Koer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Siga"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Muu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
-msgstr ""
+msgstr "Minu andmete muutmine"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
-msgstr ""
+msgstr "Minu andmete uuendamine"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Sinu andmed on uuendatud"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Sa lükkasid kasutaja %d päringu tagasi"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Sisesta oma põhjus:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Lükka päring tagasi"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr ""
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr ""
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Sa eemaldasid iseenda edukalt oma sõbranimekirjast"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Kasutaja %d vajab autentimist"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr ""
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Kas sa võiks olla minu sõber?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid-i viga"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Vigane QQid"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Grupi ID"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Looja"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Grupi kirjeldus"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Palun sisesta välise grupi ID"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Põhjus: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:281
-#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Nõustu"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Sinu päring grupiga %d liitumiseks lükati halduri %d poolt tagasi"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Sinu päring grupiga %d liitumiseks sai halduri %d nõusoleku"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Sa [%d] lahkusid grupist \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Sind [%d] lisati gruppi \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "See grupp lisati sinu sõbranimekirja"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Ma ei ole liige"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Ma olen liige"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Ma olen haldur"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Tundmatu olek"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Kood [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr ""
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:99
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Kas sa nõustud selle päringuga?"
 
-#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Sisesta oam põhjus:"
 
-#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr ""
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Süsteemne sõnum"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Tõrge välksõnumi saatmisel."
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-msgid "Keep alive error"
-msgstr "Ühenduse ülevalhoidmise viga"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Tundmatu-%d"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
-msgstr "Viga sisselogimistõendi küsimisel"
+msgid "Level"
+msgstr "Tase"
 
-#: ../libpurple/protocols/qq/login_logout.c:490
-msgid "Unable to login. Check debug log."
-msgstr "Sisse pole võimalik logida, kontrolli silumislogi."
+msgid "Member"
+msgstr "Liige"
 
-#: ../libpurple/protocols/qq/login_logout.c:493
-msgid "Unable to login"
-msgstr "Sisse pole võimalik logida"
+msgid " VIP"
+msgstr " VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "Ühendumine pole võimalik."
+msgid " TCP"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
-msgstr "Tundmatu-%d"
+msgid " FromMobile"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "TCP-aadress"
+msgid " BindMobile"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "UDP-aadress"
+msgid " Video"
+msgstr " Video"
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
-msgstr "Tase"
+msgid " Space"
+msgstr ""
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Vigane nimi"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Hetkel ühendatux</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Viimane värskendus</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Server</b>: %s: %d<br>\n"
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Ühenduse režiim</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>Serveri IP</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Tegelik hostinimi</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Minu avalik IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Sisselogimise aeg</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Viimase sisselogimise IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Viimase sisselogimise aeg</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Sisselogimise andmed"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
-msgstr ""
+msgstr "Minu andmete määramine"
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Muuda parooli"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Sisselogimisandmete näitamine"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr ""
 
@@ -10135,223 +7295,251 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokolli\tplugin"
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Ühendumine TCP abil"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr "uuestisaatmise sagedus(ed)"
+
+msgid "Keep alive interval(s)"
+msgstr "Ühenduse ülevalhoidmise sagedus(ed)"
+
+msgid "Update interval(s)"
+msgstr "Uuenduste sagedus(ed)"
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "Vigane pealkiri"
+
+#, fuzzy
+msgid "Keep alive error"
+msgstr "Ühenduse ülevalhoidmise sagedus(ed)"
+
+msgid "Failed to connect server"
+msgstr "Tõrge serveriga ühendumisel"
+
 msgid "Socket error"
 msgstr "Sokli viga"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Ühendus serveriga katkes:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "Soklist pole võimalik lugeda"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr "Viga kirjutamisel"
+
+msgid "Connection lost"
+msgstr "Ühendus katkes"
+
+msgid "Couldn't resolve host"
+msgstr "Hosti pole võimalik lahendada"
+
+msgid "hostname is NULL or port is 0"
+msgstr "hostinimi on NULL või on port 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Ühendumine serveriga %s, katseid %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Ühendumine pole võimalik."
+
+msgid "Could not resolve hostname"
+msgstr "Hostinime pole võimalik lahendada"
+
+msgid "Unable to login. Check debug log."
+msgstr "Sisse pole võimalik logida, kontrolli silumislogi."
+
+msgid "Unable to login"
+msgstr "Sisse pole võimalik logida"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Tõrge sisselogimisel, vastust ei saadud"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Sind [%d] lisati gruppi \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d keeldus failist %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Faili saatmine"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d katkestas %s ülekandmise"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Ühendus katkes"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Tõrge sisselogimisel, vastust ei saadud"
-
-#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "Kas sa soovid seda sõpra lisada?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sind lisati %s poolt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Kas sa soovid teda lisada?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s lisas sinu [%s] oma sõbranimekirja"
 
-#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Kasutaja %s lükkas su päringu tagasi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "Kasutaja %s nõustus sinu päringuga"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s soovib määrata sind [%s] oma sõbraks"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Sõnum: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s pole sinu sõbranimekirjas"
 
-#: ../libpurple/protocols/sametime/sametime.c:419
+#, c-format
+msgid "Notice from: %s"
+msgstr ""
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Ühendus suletud (kirjutamine)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupi pealkiri:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Grupi %s andmed"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Käepigistuse saatmine"
 
-#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "Sisselogimine on ümber suunatud"
 
-#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Teenuste käivitamine"
 
-#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1748
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Viga soklist lugemisel: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1773
-#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "Konverents suletud"
 
-#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "Sõnumit pole võimalik saata: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "Kõlarid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "Videokaamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3319
-#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3324
-#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "Väline kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3431
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10359,27 +7547,21 @@ msgid ""
 msgstr ""
 "Palun sisesta uue konverentsi teema ja kasutajale %s saadetava kutse sõnum"
 
-#: ../libpurple/protocols/sametime/sametime.c:3435
 msgid "New Conference"
 msgstr "Uus konverents"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "Algata"
 
-#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "Saadaolevad konverentsid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "Uue konverentsi loomine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "Kasutaja kutsumine konverentsile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3516
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10387,27 +7569,21 @@ msgid ""
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3521
 msgid "Invite to Conference"
 msgstr "Konverentsile kutsumine"
 
-#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "Konverentsile kutsumine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4431
 msgid "Topic:"
 msgstr "Teema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10416,64 +7592,49 @@ msgstr ""
 "Meanwhile kontole %s pole hostinime ega IP-aadressi määratud. Palun määra "
 "see ja jätka sisselogimist."
 
-#: ../libpurple/protocols/sametime/sametime.c:3694
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile ühenduse sätted"
 
-#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "Ühendu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tundmatu (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "Viimane teadaolev klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4355
-#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4358
-#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4383
 #, 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4388
 msgid "Select User"
 msgstr "Vali kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "Kasutajat pole võimalik lisada: kasutajat ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
 #, 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5065
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10482,63 +7643,48 @@ msgstr ""
 "Viga faili %s lugemisel: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "Serverisse salvestatud sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "Sõbranimekirja salvestamise režiim"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "Ainult kohalik sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "Nimekirja sünkroniseerimine serveriga"
 
-#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "Gruppi pole võimalik lisada: grupp on juba olemas"
 
-#: ../libpurple/protocols/sametime/sametime.c:5364
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "Grupp '%s' on sinu sõbraloendis juba olemas."
+msgstr "Grupp '%s' on sinu sõbranimekirjas juba olemas."
 
-#: ../libpurple/protocols/sametime/sametime.c:5367
-#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "Gruppi pole võimalik lisada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "Võimalikud vastavused"
 
-#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10546,37 +7692,30 @@ msgid ""
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "Gruppi pole võimalik lisada: gruppi ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5534
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5535
 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5584
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Otsingutulemused '%s' jaoks"
 
-#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10584,150 +7723,86 @@ msgid ""
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "Otsingutulemused"
 
-#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "Vastavusi pole"
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No Matches"
 msgstr "Vastavusi pole"
 
-#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5663
 msgid "User Search"
 msgstr "Kasutajaotsing"
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr "Impordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "Export Sametime List..."
 msgstr "Ekspordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "Kasutajaotsing..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr "Jõuga sisselogimine (serveri ümbersuunamisi eiratakse)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr "Kliendi identiteet on peidetud"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Kasutaja %s pole võrgus"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Kaugkasutaja pole enam võrgus"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10735,118 +7810,53 @@ msgid ""
 "Remote port: %d"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
-msgstr ""
+msgstr "Välksõnumi võtit pole võimalik seada"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
-msgstr ""
+msgstr "Välksõnumiparooli seadmine"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr ""
+msgstr "Avalikku võtit pole võimalik hankida"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Avalikku võtit pole võimalik laadida"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Kasutaja andmed"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kasutaja andmeid pole võimalik hankida"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Ava..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Sõber %s pole võrgus"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10854,336 +7864,170 @@ msgstr ""
 "Sõbra lisamiseks pead sa importima tema avaliku võtme. Avaliku võtme "
 "importimiseks vajuta nuppu \"Impordi\"."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
 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:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
 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:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Ärata mind üles!"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Üliaktiivne"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Õnnelik"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Kurb"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Vihane"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:666
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Armukade"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Häbenev"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Armunud"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Unine"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:676
-#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Tüdinud"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:678
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Põnevil"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:680
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Rahutu"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Eelistatud kontakt"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Eelistatud keel"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Seade"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:728
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Avaliku võtme hankimine..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Parool:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanalit %s pole võrgus olemas"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanali andmed"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kanali andmeid pole võimalik hankida"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanali nimi:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Kasutajate arv:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanali asutaja:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanali šiffer:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanali HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanali teema:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
-msgstr ""
+msgstr "<br><b>Kanali režiimid:</b>"
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Asutaja võtme sõrmejälg:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Avaliku võtme avamine..."
 
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanali parool"
 
-#: ../libpurple/protocols/silc/chat.c:432
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Kanali avalike võtmete nimekiri"
 
-#: ../libpurple/protocols/silc/chat.c:437
-#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11192,446 +8036,246 @@ msgid ""
 "able to join."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Grupinimi"
 
-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
-#: ../libpurple/protocols/silc/silc.c:1163
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Parool"
 
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Kasutajate piirang"
 
-#: ../libpurple/protocols/silc/chat.c:747
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Kanalile kasutajate piirangu seadmine. Null tähendab kasutajate piirangu "
 "lähtestamist."
 
-#: ../libpurple/protocols/silc/chat.c:911
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:916
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Tõrjenimekiri"
 
-#: ../libpurple/protocols/silc/chat.c:924
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:937
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:942
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:950
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:956
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:961
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:968
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:973
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:980
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:985
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1046
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1360
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1361
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1246
-#: ../libpurple/protocols/silc/silc.c:1362
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Tundmatu käsk"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Turvaline failiülekanne"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Viga faili ülekandmisel"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Ligipääs keelatud"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Ühendumine ületas ajapiirangu"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Tõrge ühendumise loomisel"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Failiülekande seanssi pole olemas"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Pole ühtegi akriivset failiülekandeseanssi"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Failiülekanne on juba käivitatud"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Failiülekannet pole võimalik alustada"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Faili pole võimalik saata"
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Tekkis viga"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Isiklikud andmed"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Sünnipäev"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1156
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Üksus"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Märkus"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sa oled kanali <I>%s</I> looja"
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanali <I>%s</I> looja on <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Tegelik nimi"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Olekutekst"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Avaliku võtme sõrmejälg"
 
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Veel..."
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc/silc.c:1220
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Teemat pole võimalik seada"
 
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Tõrge hüüdnime muutmisel"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Tubade nimekiri"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Tubade nimekirja pole võimalik hankida"
 
-#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Võrk on tühi"
 
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Avalikku võtit pole vastu võetud"
 
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Serveri andmed"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Serveri andmeid pole võimalik hankida"
 
-#: ../libpurple/protocols/silc/ops.c:1552
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Serveri statistika"
 
-#: ../libpurple/protocols/silc/ops.c:1553
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Serveri statistikat pole võimalik hankida"
 
-#: ../libpurple/protocols/silc/ops.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11666,71 +8310,46 @@ msgstr ""
 "Serverioperaatoretid kokku: %d\n"
 "Marsruuterioperaatoreid kokku: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Võrgustatistika"
 
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Tõrge ping'i läbiviimisel"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Serverilt saadi ping-vastus"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Kasutajat pole võimalik jälgida"
 
-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
-#: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
-msgstr ""
+msgstr "Ühenduse autentimine"
 
-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Serveri avaliku võtme verifitseerimine"
 
-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/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 ""
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11739,100 +8358,67 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Avaliku võtme verifitseerimine"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Vaata..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Toetamata avaliku võtme liik"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Ühendus katkestatud serveri poolt"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Viga SILC-serveriga ühendumisel"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Tõrge võtmevahetusel"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Tõrge ühendumisel"
 
-#: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Võtmevahetuse läbiviimine"
 
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Ühendumine SILC-serverisse"
+msgid "Unable to create connection"
+msgstr "Ühendust pole võimalik luua"
 
-#: ../libpurple/protocols/silc/silc.c:455
-#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "SILC-võtmepaari pole võimalik laadida"
 
-#: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:361
-msgid "Unable to create connection"
-msgstr "Ühendust pole võimalik luua"
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "Ühendumine SILC-serverisse"
 
-#: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Vaba pole piisavalt mälu"
 
-#: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "SILC-protokolli pole võimalik lähtestada"
 
-#: ../libpurple/protocols/silc/silc.c:559
-#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Viga SILC-võtmepaari laadimisel"
 
-#: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:656
+#, c-format
+msgid "Download %s: %s"
+msgstr ""
+
 msgid "Your Current Mood"
 msgstr "Sinu hetkemeeleolu"
 
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
+#, c-format
 msgid "Normal"
 msgstr "Tavaline"
 
-#: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Armunud"
 
-#: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11840,345 +8426,207 @@ msgstr ""
 "\n"
 "Sinu poolt eelistatud ühenduse võtmise meetodid"
 
-#: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Videokonverentsid"
 
-#: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Sinu hetkeolek"
 
-#: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Võrguteenused"
 
-#: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Sinu VKaarti fail"
 
-#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Ajavöönd (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Kasutaja ühendatud oleku rekvisiidid"
 
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:737
 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 ""
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:784
-#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Päevasõnum"
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "Päevasõnum pole saadaval"
 
-#: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:779
-#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Sellele ühendusele pole seonduvat päevasõnumit"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1171
-#: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:830
-#: ../libpurple/protocols/silc10/silc.c:874
-#: ../libpurple/protocols/silc10/silc.c:945
-#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Uue SILC võtmepaari loomine"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Paroolid ei klapi omavahel"
 
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Tõrge võtmepaari genereerimisel"
 
-#: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Võtme pikkus"
 
-#: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Avaliku võtme fail"
 
-#: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Salajase võtme fail"
 
-#: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Parool (uuesti)"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Võtmepaari loomine"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "SILC võtmepaari loomine..."
 
-#: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Kasutaja <I>%s</i> pole võrgus"
 
-#: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Teema on liiga pikk"
 
-#: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "kanalit %s ei leitud"
 
-#: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Tundmatu käsk: %s, (võibolla kliendi viga)"
 
-#: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
-msgstr ""
+msgstr "leave [kanal]:  Vestlusest lahkumine"
 
-#: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  Teema vaatamine või muutmine"
 
-#: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
+"join &lt;kanal&gt; [&lt;parool&gt;]:  Selles võrgus oleva vestlusega "
+"ühinemine"
 
-#: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2697
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;hüüdnimi&gt; &lt;sõnum&gt;:  Erasõnumi saatmine kasutajale"
 
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;hüüdnimi&gt; [&lt;sõnum&gt;]:  Erasõnumi saatmine kasutajale"
 
-#: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Serveri päevasõnumi vaatamine"
 
-#: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [sõnum]:  Serveriga ühenduse katkestamine, võimalik on jätta ka "
 "sellekohane sõnum"
 
-#: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;hüüdnimi&gt;:  Selle hüüdnimega kasutaja andmete vaatamine"
 
-#: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanal&gt; &lt;hüüdnimi&gt; [kommentaar]:  Kasutaja kanalilt "
 "väljalöömine"
 
-#: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;hüüdnimi&gt;]:  Kliendi tõrjumine kanalilt"
 
-#: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Ühendatud serverile PING-i saatmine"
 
-#: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12193,141 +8641,91 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolli plugin"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "Võrk"
 
-#: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Avaliku võtme fail"
 
-#: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Salajase võtme fail"
 
-#: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Šiffer"
 
-#: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Avaliku võtmega autentimine"
 
-#: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Kõikide sõnumite digitaalne signeerimine ja verifitseerimine"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "SILC võtmepaari loomine..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "SILC võtmepaari pole võimalik luua\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Tegelik nimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Kasutajanimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "E-post: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Hostinimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisatsioon: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Riik: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:376
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Võtme pikkus: \t%d bitti\n"
 
-#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versioon: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12338,150 +8736,110 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:381
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Avaliku võtme teave"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonverents"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Arvuti"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s kirjutas sõnumi tahvlile. Soovid sa selle tahvli avada?"
 
-#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr "%s kirjutas sõnumi kanali %s tahvlile. Soovid sa selle tahvli avada?"
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Tahvel"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Serveri statistika pole saadaval"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Tõrge: Versioonid ei klapi, uuenda oma klienti"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Tõrge: Teine pool ei toeta või ei usalda sinu avalikku võtit"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Tõrge: Teine pool ei toeta pakutud šifrit"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Tõrge: Teine pool ei toeta pakutud PKCS'i"
 
-#: ../libpurple/protocols/silc10/ops.c:1952
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Tõrge: Teine pool ei toeta pakutud räsifunktsiooni"
 
-#: ../libpurple/protocols/silc10/ops.c:1955
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Tõrge: Teine pool ei toeta pakutud HMAC'i"
 
-#: ../libpurple/protocols/silc10/ops.c:1957
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Tõrge: Vigane signatuur"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Tõrge: Vigane küpsis"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Tõrge: Autentimine nurjus"
 
-#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "SILC-kliendi ühendust pole võimalik lähtestada"
 
-#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Nimetu Nipitiri"
 
-#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "SILC-võtmepaari pole võimalik laadida: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Pole võimalik kirjutada"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "Pole võimalik ühenduda"
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Tundmatu vastus serverilt."
 
-#: ../libpurple/protocols/simple/simple.c:1749
-#: ../libpurple/protocols/simple/simple.c:1795
-#: ../libpurple/protocols/simple/simple.c:1810
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "Kuulavat soklit pole võimalik luua"
 
-#: ../libpurple/protocols/simple/simple.c:1774
-msgid "Couldn't resolve host"
-msgstr "Hosti pole võimalik lahendada"
-
-#: ../libpurple/protocols/simple/simple.c:1875
-msgid "Could not resolve hostname"
-msgstr "Hostinime pole võimalik lahendada"
-
-#: ../libpurple/protocols/simple/simple.c:1893
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "SIP-kasutajanimed ei tohi sisaldada sõnavahe- ja @-märke"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "SIP-i kasutajanimed ei tohi sisaldada sõnavahe- ja @-märke"
 
 #. *< type
 #. *< ui_requirement
@@ -12491,235 +8849,195 @@ msgstr "SIP-kasutajanimed ei tohi sisaldada sõnavahe- ja @-märke"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolli plugin"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokolli plugin"
 
-#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Olek avalikustatakse (märkus: igaüks võib sind näha)"
 
-#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Kasutatakse UDP protokolli"
 
-#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Kasutatakse proksit"
 
-#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Autentimiskasutaja"
 
-#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Autentimisdomeen"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "%s lahendamine"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Faili %s pole võimalik kirjutada."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Faili %s pole võimalik lugeda."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s pole hetkel sisse logitud."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Tõrge."
 
-#: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Liiga palju vastavusi."
 
-#: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Kataloogiteenus pole ajutiselt saadaval."
 
-#: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "Email lookup restricted."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Võtmesõnu ei ole."
 
-#: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Kasutajal pole kataloogiandmeid."
 
-#: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Tundmatu tõrge: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
-msgid "Incorrect screen name or password."
-msgstr "Vigane hüüdnimi või parool."
+#, c-format
+msgid "Incorrect username or password."
+msgstr "Vigane kasutajanimi või parool."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "See teenus pole ajutiselt saadaval."
 
-#: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Tekkis tundmatu viga %d.  Andmed: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Vigane grupinimi"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Ühendus sulgeti"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Vastuse ootamine..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Paroolimuutmine õnnestus"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6398
-#: ../pidgin/gtkblist.c:6735
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande."
 
-#: ../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 "Ülekandmiseks pole võimalik ühendust luua."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Failipäist pole võimalik kirjutada.  Faili ei kanta üle."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s soovib, et sa saadaksid talle faili"
@@ -12734,45 +9052,36 @@ msgstr "%s soovib, et sa saadaksid talle faili"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! süsteemne sõnum %s jaoks:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Volituste andmisest keeldumise sõnum:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12780,170 +9089,121 @@ msgid ""
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
-msgstr ""
+msgstr "Tõrge Yahoo! autentimisel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
 #, 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 ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2069
 msgid "Ignore buddy?"
-msgstr ""
+msgstr "Kas eirata sõpra?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
+msgstr "Sinu konto on lukus. Palun logi Yahoo! veebisaidile."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2137
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2190
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
+msgstr "Sõpra %s pole võimalik serveri nimekirjas gruppi %s lisada (konto %s)."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2193
 msgid "Could not add buddy to server list"
-msgstr ""
+msgstr "Sõpra pole võimalik serveri nimekirja lisada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2315
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
 msgid "Received unexpected HTTP response from server."
-msgstr ""
+msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2700
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2993
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Ühendumisprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3118
-#: ../libpurple/protocols/yahoo/yahoo.c:3804
 msgid "Not at Home"
 msgstr "Pole kodus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3120
-#: ../libpurple/protocols/yahoo/yahoo.c:3807
 msgid "Not at Desk"
 msgstr "Pole töölaua taga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3122
-#: ../libpurple/protocols/yahoo/yahoo.c:3810
 msgid "Not in Office"
 msgstr "Pole kontoris"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3126
-#: ../libpurple/protocols/yahoo/yahoo.c:3816
 msgid "On Vacation"
 msgstr "Puhkusel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
-#: ../libpurple/protocols/yahoo/yahoo.c:3822
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3223
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Not on server list"
 msgstr "Pole serveri loendis"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3270
-#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
-#: ../libpurple/protocols/yahoo/yahoo.c:3349
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3343
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Join in Chat"
 msgstr "Ühine vestlusega"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
 msgid "Initiate Conference"
 msgstr "Algata konverents"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3425
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3431
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3532
 msgid "Activate which ID?"
 msgstr "Milline ID aktiveerida?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3543
 msgid "Join whom in chat?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3555
 msgid "Activate ID..."
 msgstr "Aktiveeri ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3559
 msgid "Join User in Chat..."
 msgstr "Ühine kasutajaga vestluses..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
 msgid "Open Inbox"
 msgstr "Ava sisendkast"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4153
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4166
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kasutajaga Doodle seansi algatamine"
 
@@ -12957,92 +9217,64 @@ msgstr "doodle: Kasutajaga Doodle seansi algatamine"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4375
-#: ../libpurple/protocols/yahoo/yahoo.c:4377
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Yahoo Japan"
 msgstr "Jaapani Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Japan Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Pager port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer server"
 msgstr "Failiülekande server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Japan file transfer server"
 msgstr "Jaapani failiülekandeserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "File transfer port"
 msgstr "Failiülekande port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Chat room locale"
 msgstr "Jututoa lokaat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4424
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Chat room list URL"
 msgstr "Jututubade nimekirja URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Yahoo Chat server"
 msgstr "Yahoo jututoaserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Yahoo Chat port"
 msgstr "Yahoo jututoaport"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Doodle päringu saatmine."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s proovib sulle saata %d-failist koosnevat gruppi.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Viga kirjutamisel"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Jaapani Yahoo! profiil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profiil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -13050,7 +9282,6 @@ msgstr ""
 "Vabandust, täiskasvanutele mõeldud materjali sisaldavad profiilid pole "
 "hetkel toetatud."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -13058,101 +9289,78 @@ msgstr ""
 "Kui sa soovid seda profiili vaadata, siis pead sa oma veebisirvija abil "
 "külastama seda aadressi:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobid"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Viimased uudised"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Koduleht"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Lahe viit nr 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Lahe viit nr 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Lahe viit nr 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Viimane uuendus"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Kasutaja %s andmed pole saadaval"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 "Vabandust, see profiil paistab olevat hetkel toetamata keeles või vormingus."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 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 ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Kasutajaprofiil on tühi."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s lükkas sinu konverentsikutse tuppa \"%s\" tagasi, esitades järgneva "
 "põhjenduse: \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr ""
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Tundmatu tuba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Võibolla on tuba täis"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "Pole saadaval"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13160,46 +9368,34 @@ msgstr ""
 "Tundmatu viga. Võib-olla pead sa välja logima ja enne jututoaga "
 "taasliitumist 5 minutit ootama"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Sa vestled nüüd jututoas %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Tõrge sõbraga jututoas ühinemisel"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Võibolla pole nad jututoas?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Tõrge jututubade nimekirja hankimisel."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Veebikaamerad"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Tubade nimekirja pole võimalik hankida."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13208,7 +9404,6 @@ msgstr ""
 "Ühendus serveriga katkes\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13216,100 +9411,76 @@ msgstr ""
 "(Sõnumi teisendamisel tekkis viga.\t Kontrolli kontoredaktorist "
 "'Kooditabeli' valikut.)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:795
-#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Peidetud või pole sisse logitud"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1510
-#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Igaüks"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Class:"
 msgstr "_Klass:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2372
 msgid "_Instance:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Recipient:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2389
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2702
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2707
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2712
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2717
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2722
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2728
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2745
 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 ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2751
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2756
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2832
 msgid "Resubscribe"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -13323,45 +9494,33 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2928
-#: ../libpurple/protocols/zephyr/zephyr.c:2930
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolli plugin"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2955
 msgid "Use tzc"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "tzc command"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13370,76 +9529,61 @@ msgstr ""
 "Soklit pole võimalik luua:\n"
 "%s"
 
-#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "HTTP-proksi vastust pole võimalik analüüsida: %s\n"
 
-#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proksi ühenduse viga %d"
 
-#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Ligipääs keelatud: HTTP proksi server keelab pordi %d tunneldamise."
 
-#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Viga %s lahendamisel"
 
-#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Hostinime pole võimalik lahendada"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s has requested your attention!"
+msgstr "%s müksas sind!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "_Jah"
 
-#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "_Ei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "_Nõustu"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Ma pole hetkel siin"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "salvestatud olekud"
 
-#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nüüd nimega %s.\n"
 
-#: ../libpurple/server.c:333
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
-
-#: ../libpurple/server.c:378
-#, c-format
-msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:875
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13448,306 +9592,268 @@ msgstr ""
 "%s kutsub kasutajat %s jututuppa %s:\n"
 "%s"
 
-#: ../libpurple/server.c:880
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s kutsub kasutajat %s jututuppa %s\n"
 
-#: ../libpurple/server.c:884
 msgid "Accept chat invitation?"
 msgstr "Kas nõustume jututoa kutsega?"
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+msgid "Shortcut"
+msgstr ""
+
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Salvestatud pilt"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
 msgid "SSL Connection Failed"
 msgstr "Tõrge SSL-ühendumisel"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Tõrge SSL käepigistusel"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL-ühenduse partner esitas vigase sertifikaadi"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Tundmatu SSL-viga"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr ""
 
-#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "Mitte segada"
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Kaua eemal"
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobiilne"
 
-#: ../libpurple/status.c:161
 msgid "Listening to music"
 msgstr ""
 
-#: ../libpurple/status.c:610
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s (%s) muutus olekut %s -> %s"
+msgstr "%s (%s) muutis olekut %s -> %s"
 
-#: ../libpurple/status.c:621
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) on nüüd %s"
 
-#: ../libpurple/status.c:627
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) pole enam %s"
 
-#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s jäi jõude"
 
-#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s naases jõudeolekust"
 
-#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s jäi jõude"
 
-#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s naases jõudeolekust"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Viga %s lugemisel"
 
-#: ../libpurple/util.c:2805
 #, 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 ""
 
-#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Arvutamine..."
 
-#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Tundmatu."
 
-#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
-#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päev"
 msgstr[1] "%d päeva"
 
-#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tund"
 msgstr[1] "%s, %d tundi"
 
-#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minutit"
 
-#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutit"
 
-#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Hostiga %s pole võimalik ühenduda: %s"
 
-#: ../libpurple/util.c:4686
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4692
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:322
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "Ühendumine katkestati sinu arvutis oleva teise tarkvara poolt."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:324
 #, c-format
 msgid "Remote host closed connection."
 msgstr "Kaughost sulges ühenduse."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:326
 #, c-format
 msgid "Connection timed out."
 msgstr "Ühendumine ületas ajapiirangu."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:328
 #, c-format
 msgid "Connection refused."
 msgstr "Ühendus lükati tagasi."
 
-#: ../pidgin.desktop.in.h:1
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Aadress on juba kasutusel."
+
 msgid "Internet Messenger"
 msgstr "Interneti sõnumivahetus"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin, Interneti sõnumivahetus"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Välksõnumite saatmine mitmete protokollide kaudu"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Suund"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Salve suund"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Sisselogimise valikud"
 
-#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:411
-msgid "Screen _name:"
-msgstr "_Ekraaninimi:"
-
-#: ../pidgin/gtkaccount.c:501
-msgid "_Local alias:"
-msgstr "_Kohalik alias:"
+msgid "_Username:"
+msgstr "_Kasutajanimi:"
 
-#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "_Parooli peetakse meeles"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "Kasutaja valikud"
 
-#: ../pidgin/gtkaccount.c:576
+msgid "_Local alias:"
+msgstr "_Kohalik alias:"
+
 msgid "New _mail notifications"
 msgstr "Teavitused e-posti _uute sõnumite kohta"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
 msgstr "Selle konto jaoks kasutatakse seda sõbra_ikooni:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "%s - valikud"
 
-#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "Kasutatakse GNOME proksi sätteid"
 
-#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "Kasutatakse üldisi proksi sätteid"
 
-#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "Proksi puudub"
 
-#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "Kasutatakse keskkonnast tulenevaid sätteid"
 
@@ -13756,73 +9862,52 @@ msgstr "Kasutatakse keskkonnast tulenevaid sätteid"
 #. 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:978
 msgid "If you look real closely"
 msgstr "Kui sa päris lähedalt vaatad, siis"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "võid sa näha paarituvaid liblikaid"
 
-#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "Proksi valikud"
 
-#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "_Proksi liik:"
 
-#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1037
-msgid "_Username:"
-msgstr "_Kasutajanimi:"
-
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "_Parool:"
 
-#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "Uut kontot pole võimalik salvestada"
 
-#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr "Selliste parameetritega konto on juba olemas."
 
-#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "Konto lisamine"
 
-#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Põhiline"
 
-#: ../pidgin/gtkaccount.c:1471
-msgid "Create this new account on the server"
-msgstr "See on uus konto ja tuleb serverisse luua"
+msgid "Create _this new account on the server"
+msgstr "See on _uus konto ja tuleb serverisse luua"
 
-#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "Laien_datud"
 
-#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
-#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2135
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13836,7 +9921,6 @@ msgid ""
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -13844,129 +9928,102 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:552
-msgid "_Merge"
-msgstr ""
+msgid "Please update the necessary fields."
+msgstr "Palun uuenda tarvilikud väljad."
 
-#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6682
 msgid "Room _List"
 msgstr "Tubade _nimekiri"
 
-#: ../pidgin/gtkblist.c:973
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Palun sisesta teave vestluse kohta, millega soovid ühineda.\n"
 
-#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6717
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
-#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Bloki"
 
-#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "Eemalda _blokeering"
 
-#: ../pidgin/gtkblist.c:1306
 msgid "Move to"
 msgstr "Tõsta uude kohta"
 
-#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "Hangi a_ndmed"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "Vä_lksõnum"
 
-#: ../pidgin/gtkblist.c:1355
 msgid "_Send File..."
 msgstr "Saada _fail..."
 
-#: ../pidgin/gtkblist.c:1362
 msgid "Add Buddy _Pounce..."
 msgstr "Lisa _sõbramärguanne..."
 
-#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
-#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-#: ../pidgin/gtkblist.c:1377
 msgid "Hide when offline"
 msgstr "Peida, kui pole võrku ühendatud"
 
-#: ../pidgin/gtkblist.c:1377
 msgid "Show when offline"
 msgstr "Näita, kui pole võrku ühendatud"
 
-#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
-#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../pidgin/gtkblist.c:1452
+msgid "Set Custom Icon"
+msgstr "Määra kohandatud ikoon"
+
+msgid "Remove Custom Icon"
+msgstr "Eemalda kohandatud ikoon"
+
 msgid "Add _Buddy..."
 msgstr "Lisa _sõber..."
 
-#: ../pidgin/gtkblist.c:1455
 msgid "Add C_hat..."
 msgstr "Lisa _vestlus..."
 
-#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "_Kustuta grupp"
 
-#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "Muuda _nime"
 
 #. join button
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "Ü_hine"
 
-#: ../pidgin/gtkblist.c:1482
 msgid "Auto-Join"
 msgstr "Automaatühinemine"
 
-#: ../pidgin/gtkblist.c:1484
 msgid "Persistent"
 msgstr "Püsiv"
 
-#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
+msgid "_Edit Settings..."
+msgstr "_Muuda sätteid..."
+
 msgid "_Collapse"
 msgstr "Ahen_da"
 
-#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "Laien_da"
 
-#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
-#: ../pidgin/gtkblist.c:5363 ../pidgin/gtkblist.c:5376
 msgid "/Tools/Mute Sounds"
 msgstr "/Vahendid/Vaigista helid"
 
-#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4818
-#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -13976,148 +10033,122 @@ msgstr ""
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2618
 msgid "Unknown node type"
 msgstr ""
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3053
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
 
-#: ../pidgin/gtkblist.c:3054
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Sõbrad/Uus _välksõnum..."
 
-#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Sõbrad/Ühine _jututoaga..."
 
-#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Get User _Info..."
 msgstr "/Sõbrad/Hangi kasutaja _andmed"
 
-#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/View User _Log..."
 msgstr "/Sõbrad/Vaata kasutaja _logi..."
 
-#: ../pidgin/gtkblist.c:3059
 msgid "/Buddies/Sh_ow"
 msgstr "/Sõbrad/_Näita"
 
-#: ../pidgin/gtkblist.c:3060
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Sõbrad/Näita/Ü_hendamata sõpru"
 
-#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Sõbrad/Näita/_Tühje gruppe"
 
-#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Sõbrad/Näita/_Sõbra üksikasju"
 
-#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Sõbrad/Näita/_Jõudeoleku aegu"
 
-#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Sõbrad/Näita/_Protokollide ikoone"
 
-#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Sõbrad/Sõp_rade sortimine"
 
-#: ../pidgin/gtkblist.c:3067
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Sõbrad/Lisa _sõber..."
 
-#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/Add C_hat..."
 msgstr "/Sõbrad/Lisa ju_tutuba..."
 
-#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add _Group..."
 msgstr "/Sõbrad/Lisa _grupp..."
 
-#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/_Quit"
 msgstr "/Sõbrad/_Lõpeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3074
 msgid "/_Accounts"
 msgstr "/_Kontod"
 
-#: ../pidgin/gtkblist.c:3075 ../pidgin/gtkblist.c:7402
-msgid "/Accounts/Manage"
-msgstr "/Kontod/Halda"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Kontod/Halda kontosid"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3078
 msgid "/_Tools"
 msgstr "/_Vahendid"
 
-#: ../pidgin/gtkblist.c:3079
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Vahendid/Sõbra_märguanded"
 
-#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/_Certificates"
 msgstr "/Vahendid/_Sertifikaadid"
 
-#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/Plu_gins"
 msgstr "/Vahendid/Plu_ginad"
 
-#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Pr_eferences"
 msgstr "/Vahendid/_Eelistused"
 
-#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
-#: ../pidgin/gtkblist.c:3085
+msgid "/Tools/Smile_y"
+msgstr "/Vahendid/_Tujunäod"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Vahendid/_Failiülekanded"
 
-#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/R_oom List"
 msgstr "/Vahendid/_Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/System _Log"
 msgstr "/Vahendid/Süsteemne _logi"
 
-#: ../pidgin/gtkblist.c:3089
 msgid "/Tools/Mute _Sounds"
 msgstr "/Vahendid/_Vaigista helid"
 
 #. Help
-#: ../pidgin/gtkblist.c:3091
 msgid "/_Help"
 msgstr "/A_bi"
 
-#: ../pidgin/gtkblist.c:3092
 msgid "/Help/Online _Help"
 msgstr "/Abi/_Online abi"
 
-#: ../pidgin/gtkblist.c:3093
 msgid "/Help/_Debug Window"
 msgstr "/Abi/_Silumisaken"
 
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
 msgid "/Help/_About"
 msgstr "/Abi/Programmist _lähemalt"
 
-#: ../pidgin/gtkblist.c:3127
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:3135
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
 #, c-format
 msgid ""
 "\n"
@@ -14126,214 +10157,160 @@ msgstr ""
 "\n"
 "<b>Teema:</b> %s"
 
-#: ../pidgin/gtkblist.c:3135
 msgid "(no topic set)"
 msgstr "(teemat pole seatud)"
 
-#: ../pidgin/gtkblist.c:3212
 msgid "Buddy Alias"
 msgstr "Sõbra alias"
 
-#: ../pidgin/gtkblist.c:3241
 msgid "Logged In"
 msgstr "Sisse logitud"
 
-#: ../pidgin/gtkblist.c:3287
 msgid "Last Seen"
 msgstr "Viimati nähtud"
 
-#: ../pidgin/gtkblist.c:3308
 msgid "Spooky"
 msgstr "Kummituslik"
 
-#: ../pidgin/gtkblist.c:3310
 msgid "Awesome"
 msgstr "Imeline"
 
-#: ../pidgin/gtkblist.c:3312
 msgid "Rockin'"
 msgstr "Rokkiv"
 
-#: ../pidgin/gtkblist.c:3328
 msgid "Total Buddies"
 msgstr "Sõpru kokku"
 
-#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jõude %dp %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jõude %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3699
 #, c-format
 msgid "Idle %dm"
 msgstr "Jõude %dm"
 
-#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/New Instant Message..."
 msgstr "/Sõbrad/Uus välksõnum..."
 
-#: ../pidgin/gtkblist.c:3854 ../pidgin/gtkblist.c:3887
 msgid "/Buddies/Join a Chat..."
 msgstr "/Sõbrad/Ühine vestlusega..."
 
-#: ../pidgin/gtkblist.c:3855
 msgid "/Buddies/Get User Info..."
 msgstr "/Sõbrad/Hangi kasutaja andmed..."
 
-#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Buddy..."
 msgstr "/Sõbrad/Lisa sõber..."
 
-#: ../pidgin/gtkblist.c:3857 ../pidgin/gtkblist.c:3890
 msgid "/Buddies/Add Chat..."
 msgstr "/Sõbrad/Lisa vestlus..."
 
-#: ../pidgin/gtkblist.c:3858
 msgid "/Buddies/Add Group..."
 msgstr "/Sõbrad/Lisa grupp..."
 
-#: ../pidgin/gtkblist.c:3893
 msgid "/Tools/Privacy"
 msgstr "/Vahendid/Privaatsus"
 
-#: ../pidgin/gtkblist.c:3896
 msgid "/Tools/Room List"
 msgstr "/Vahendid/Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d lugemata sõnum, saatja: %s\n"
 msgstr[1] "%d lugemata sõnumit, saatja: %s\n"
 
-#: ../pidgin/gtkblist.c:4191
 msgid "Manually"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkblist.c:4194
 msgid "By status"
 msgstr "Oleku järgi"
 
-#: ../pidgin/gtkblist.c:4195
 msgid "By log size"
 msgstr "Logi suuruse järgi"
 
-#: ../pidgin/gtkblist.c:4532
 #, c-format
 msgid "%s disconnected"
 msgstr "%s katkestas ühenduse"
 
-#: ../pidgin/gtkblist.c:4534
 #, c-format
 msgid "%s disabled"
 msgstr "%s on keelatud"
 
-#: ../pidgin/gtkblist.c:4538
 msgid "Reconnect"
 msgstr "Ühendu uuesti"
 
-#: ../pidgin/gtkblist.c:4538 ../pidgin/gtkblist.c:4657
 msgid "Re-enable"
 msgstr "Luba uuesti"
 
-#: ../pidgin/gtkblist.c:4655
 msgid "Welcome back!"
 msgstr "Tere tulemast tagasi!"
 
-#: ../pidgin/gtkblist.c:4691
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "%d konto on keelatud kuna sa logisid teisest kohast sisse:"
-msgstr[1] "%d kontot on keelatud kuna sa logisid teisest kohast sisse:"
+msgstr[0] "%d konto on keelatud, kuna sa logisid teisest kohast sisse:"
+msgstr[1] "%d kontot on keelatud, kuna sa logisid teisest kohast sisse:"
 
-#: ../pidgin/gtkblist.c:4970
 msgid "<b>Username:</b>"
 msgstr "<b>Kasutajanimi:</b>"
 
-#: ../pidgin/gtkblist.c:4977
 msgid "<b>Password:</b>"
 msgstr "<b>Parool</b>"
 
-#: ../pidgin/gtkblist.c:4988
 msgid "_Login"
 msgstr "_Logi sisse"
 
-#: ../pidgin/gtkblist.c:5072
 msgid "/Accounts"
 msgstr "/Kontod"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5086
 #, 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5357
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Sõbrad/Näita/Ühendamata sõpru"
 
-#: ../pidgin/gtkblist.c:5360
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Sõbrad/Näita/Tühje gruppe"
 
-#: ../pidgin/gtkblist.c:5366
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Sõbrad/Näita/Sõbra üksikasju"
 
-#: ../pidgin/gtkblist.c:5369
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Sõbrad/Näita/Jõudeaegu"
 
-#: ../pidgin/gtkblist.c:5372
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Sõbrad/Näita/Protokollide ikoone"
 
-#: ../pidgin/gtkblist.c:6323
-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 ""
-"Palun sisesta isiku ekraaninimi, keda sa soovid lisada oma sõbraloendisse. "
-"Vajadusel võid sa lisada ka sõbra aliase või hüüdnime. Võimaluse korral "
-"kuvatakse hüüdnime ekraaninime asemel.\n"
+msgid "Add a buddy.\n"
+msgstr "Sõbra lisamine.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6346
-msgid "A_ccount:"
-msgstr "_Konto:"
+msgid "Buddy's _username:"
+msgstr "Sõbra _kasutajanimi:"
 
-#. End of account box
-#: ../pidgin/gtkblist.c:6358
-msgid "_Screen name:"
-msgstr "_Ekraaninimi:"
+msgid "(Optional) A_lias:"
+msgstr "(Valikuline) a_lias:"
 
-#: ../pidgin/gtkblist.c:6380 ../pidgin/gtkblist.c:6730
-msgid "A_lias:"
-msgstr "A_lias:"
+msgid "Add buddy to _group:"
+msgstr "Sõbra lisamine _gruppi:"
 
-#: ../pidgin/gtkblist.c:6647
 msgid "This protocol does not support chat rooms."
 msgstr "See protokoll ei toeta jututubasid"
 
-#: ../pidgin/gtkblist.c:6663
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14341,82 +10318,67 @@ msgstr ""
 "Sa pole hetkel ühegi protokolli kaudu sisse logitud ja seega pole sul "
 "võimalik vestelda."
 
-#: ../pidgin/gtkblist.c:6707
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "Palun sisesta alias ja vestluse kohta käivad andmed lisatakse sinu "
-"sõbraloenisse.\n"
+"sõbranimekirja.\n"
+
+msgid "A_lias:"
+msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6737
 msgid "Auto_join when account becomes online."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6738
 msgid "_Hide chat when the window is closed."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6764
 msgid "Please enter the name of the group to be added."
 msgstr "Palun sisesta lisatava grupi nimi."
 
-#: ../pidgin/gtkblist.c:7422
+msgid "Enable Account"
+msgstr "Luba konto"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Kontod/Luba konto"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontod/"
 
-#: ../pidgin/gtkblist.c:7446
 msgid "_Edit Account"
 msgstr "_Redigeeri kontot"
 
-#: ../pidgin/gtkblist.c:7459 ../pidgin/gtkconv.c:3137
 msgid "No actions available"
 msgstr "Toiminguid pole"
 
-#: ../pidgin/gtkblist.c:7467
 msgid "_Disable"
 msgstr "_Keela"
 
-#: ../pidgin/gtkblist.c:7479
-msgid "Enable Account"
-msgstr "Luba konto"
-
-#: ../pidgin/gtkblist.c:7485
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Kontod/Luba konto"
-
-#: ../pidgin/gtkblist.c:7534
 msgid "/Tools"
 msgstr "/Vahendid"
 
-#: ../pidgin/gtkblist.c:7604
 msgid "/Buddies/Sort Buddies"
 msgstr "/Sõbrad/Sordi sõbrad"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "SSL-Serverid"
 
-#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "Tundmatu käsk."
 
-#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:775
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:828
 msgid "Invite Buddy Into Chat Room"
 msgstr "Sõbra kutsumine jututuppa"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:858
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14424,183 +10386,138 @@ msgstr ""
 "Palun sisesta selle kasutaja nimi, keda sa soovid jututuppa kutsuda. Kui "
 "sisestad ka sõnumi, siis saadetakse see sõbrale koos kutsumisteatega."
 
-#: ../pidgin/gtkconv.c:879
 msgid "_Buddy:"
 msgstr "_Sõber:"
 
-#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "Sõ_num:"
 
-#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Vestlused kasutajaga %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "Vestluse salvestamine"
 
-#: ../pidgin/gtkconv.c:1138 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Otsing"
 
-#: ../pidgin/gtkconv.c:1164 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "O_tsida stringi:"
 
-#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "Ära eira"
 
-#: ../pidgin/gtkconv.c:1668
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "Viimati ütles"
 
-#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "Ikooni salvestamine"
 
-#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "Peida ikoon"
 
-#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "Salvesta ikoon kui..."
 
-#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "Määra kohandatud ikoon..."
 
-#: ../pidgin/gtkconv.c:2792
-msgid "Remove Custom Icon"
-msgstr "Eemalda kohandatud ikoon"
+msgid "Change Size"
+msgstr ""
 
-#: ../pidgin/gtkconv.c:2922
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2941
 msgid "/_Conversation"
 msgstr "/_Vestlus"
 
-#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Vestlus/Uus _välksõnum..."
 
-#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/_Find..."
 msgstr "/Vestlus/_Otsi..."
 
-#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/View _Log"
 msgstr "/Vestlus/Vaata _logi"
 
-#: ../pidgin/gtkconv.c:2951
 msgid "/Conversation/_Save As..."
 msgstr "/Vestlus/Salvesta _kui..."
 
-#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Vestlus/_Puhasta tagasikerimine"
 
-#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/Se_nd File..."
 msgstr "/Vestlus/Saada _fail..."
 
-#: ../pidgin/gtkconv.c:2958
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Vestlus/Lisa sõbra_märguanne..."
 
-#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Get Info"
 msgstr "/Vestlus/_Hangi teavet"
 
-#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/In_vite..."
 msgstr "/Vestlus/_Kutsu..."
 
-#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/M_ore"
 msgstr "/Vestlus/_Veel"
 
-#: ../pidgin/gtkconv.c:2968
 msgid "/Conversation/Al_ias..."
 msgstr "/Vestlus/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/_Block..."
 msgstr "/Vestlus/_Bloki..."
 
-#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Unblock..."
 msgstr "/Vestlus/_Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Add..."
 msgstr "/Vestlus/_Lisa..."
 
-#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Remove..."
 msgstr "/Vestlus/_Eemalda"
 
-#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Vestlus/Lisa _viit..."
 
-#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Vestlus/Lisa _pilt..."
 
-#: ../pidgin/gtkconv.c:2989
 msgid "/Conversation/_Close"
 msgstr "/Vestlus/_Sulge"
 
 #. Options
-#: ../pidgin/gtkconv.c:2993
 msgid "/_Options"
 msgstr "/V_alikud"
 
-#: ../pidgin/gtkconv.c:2994
 msgid "/Options/Enable _Logging"
 msgstr "/Valikud/Luba _logimine"
 
-#: ../pidgin/gtkconv.c:2995
 msgid "/Options/Enable _Sounds"
 msgstr "/Valikud/Luba _helid"
 
-#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valikud/Näita _vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:2998
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valikud/Näita _ajatempleid"
 
-#: ../pidgin/gtkconv.c:3125
 msgid "/Conversation/More"
 msgstr "/Vestlus/Veel"
 
-#: ../pidgin/gtkconv.c:3181
 msgid "/Options"
 msgstr "/Valikud"
 
@@ -14609,79 +10526,60 @@ msgstr "/Valikud"
 #. 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:3216 ../pidgin/gtkconv.c:3248
 msgid "/Conversation"
 msgstr "/Vestlus"
 
-#: ../pidgin/gtkconv.c:3256
 msgid "/Conversation/View Log"
 msgstr "/Vestlus/Vaata logi"
 
-#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/Send File..."
 msgstr "/Vestlus/Saada fail..."
 
-#: ../pidgin/gtkconv.c:3266
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Vestlus/Lisa sõbramärguanne..."
 
-#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Get Info"
 msgstr "/Vestlus/Hangi andmed"
 
-#: ../pidgin/gtkconv.c:3276
 msgid "/Conversation/Invite..."
 msgstr "/Vestlus/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Alias..."
 msgstr "/Vestlus/Alias..."
 
-#: ../pidgin/gtkconv.c:3286
 msgid "/Conversation/Block..."
 msgstr "/Vestlus/Bloki..."
 
-#: ../pidgin/gtkconv.c:3290
 msgid "/Conversation/Unblock..."
 msgstr "/Vestlus/Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:3294
 msgid "/Conversation/Add..."
 msgstr "/Vestlus/Lisa..."
 
-#: ../pidgin/gtkconv.c:3298
 msgid "/Conversation/Remove..."
 msgstr "/Vestlus/Eemalda..."
 
-#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Insert Link..."
 msgstr "/Vestlus/Lisa viit..."
 
-#: ../pidgin/gtkconv.c:3308
 msgid "/Conversation/Insert Image..."
 msgstr "/Vestlus/Lisa pilt..."
 
-#: ../pidgin/gtkconv.c:3314
 msgid "/Options/Enable Logging"
 msgstr "/Valikud/Luba logimine"
 
-#: ../pidgin/gtkconv.c:3317
 msgid "/Options/Enable Sounds"
 msgstr "/Valikud/Luba helid"
 
-#: ../pidgin/gtkconv.c:3330
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valikud/Näita vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:3333
 msgid "/Options/Show Timestamps"
 msgstr "/Valikud/Näita ajatempleid"
 
-#: ../pidgin/gtkconv.c:3411
 msgid "User is typing..."
 msgstr "Kasutaja tipib..."
 
-#: ../pidgin/gtkconv.c:3481
 #, c-format
 msgid ""
 "\n"
@@ -14691,520 +10589,376 @@ msgstr ""
 "%s lõpetas sisestamise"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3647 ../pidgin/gtkconv.c:8318
 msgid "S_end To"
 msgstr "K_ellele saata"
 
-#: ../pidgin/gtkconv.c:4359
 msgid "_Send"
 msgstr "_Saada"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4497
 msgid "0 people in room"
 msgstr "0 isikut toas"
 
-#: ../pidgin/gtkconv.c:5796 ../pidgin/gtkconv.c:5917
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "toas on %d isik"
 msgstr[1] "toas on %d isikut"
 
-#: ../pidgin/gtkconv.c:6544 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6548
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6551
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6554 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Lugemata sõnumid"
 
-#: ../pidgin/gtkconv.c:6560
 msgid "New Event"
 msgstr "Uus sündmus"
 
-#: ../pidgin/gtkconv.c:7790
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Vestluse kogu tagasikerimispuhvri puhastamine."
 
-#: ../pidgin/gtkconv.c:7994
 msgid "Confirm close"
 msgstr "Sulgemiskinnitus"
 
-#: ../pidgin/gtkconv.c:8026
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Sul on lugemata sõnumeid. Oled kindel, et soovid akent sulgeda?"
 
-#: ../pidgin/gtkconv.c:8659
 msgid "Close other tabs"
 msgstr "Sulge teised kaardid"
 
-#: ../pidgin/gtkconv.c:8665
 msgid "Close all tabs"
 msgstr "Sulge kõik kaardid"
 
-#: ../pidgin/gtkconv.c:8673
 msgid "Detach this tab"
 msgstr "Haagi see kaart lahti"
 
-#: ../pidgin/gtkconv.c:8679
 msgid "Close this tab"
 msgstr "Sulge see kaart"
 
-#: ../pidgin/gtkconv.c:9193
 msgid "Close conversation"
 msgstr "Vestluse sulgemine"
 
-#: ../pidgin/gtkconv.c:9797
 msgid "Last created window"
 msgstr "Viimati loodud aknasse"
 
-#: ../pidgin/gtkconv.c:9799
 msgid "Separate IM and Chat windows"
 msgstr "Välksõnumid ja jututoad eraldi akendesse"
 
-#: ../pidgin/gtkconv.c:9801 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "Uude aknasse"
 
-#: ../pidgin/gtkconv.c:9803
 msgid "By group"
 msgstr "Grupi kaupa"
 
-#: ../pidgin/gtkconv.c:9805
 msgid "By account"
 msgstr "Konto kaupa"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Silumislogi salvestamine"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Vastavuste esiletõstmine"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Ainult _ikoon"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Ainult _tekst"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "Ikoon ja tekst _korraga"
 
-#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Täiendavate valikuta jaoks klõpsa parema nupuga."
 
-#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Tase "
 
-#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Vali silumisfiltri tase."
 
-#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Kõik"
 
-#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Muu"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Hoiatused"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Vead"
 
-#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Saatuslikud vead"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:118
-msgid "lead developer"
-msgstr "juhtiv arendaja"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../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:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "arendaja"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
 msgid "support"
 msgstr "kasutajatugi"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "kasutajatugi/kvaliteedikontroll"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:113
 msgid "developer & webmaster"
 msgstr "arendaja ja veebimeister"
 
-#: ../pidgin/gtkdialogs.c:100
 msgid "Senior Contributor/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "win32 port"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "hooldaja"
 
-#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaimi hooldaja"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:115
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:116
 msgid "XMPP developer"
 msgstr "XMPP arendaja"
 
-#: ../pidgin/gtkdialogs.c:117
 msgid "original author"
 msgstr "algse versiooni autor"
 
-#: ../pidgin/gtkdialogs.c:134
+msgid "lead developer"
+msgstr "juhtiv arendaja"
+
 msgid "Afrikaans"
 msgstr "Aafrika"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:229
 msgid "Arabic"
 msgstr "Araabia"
 
-#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr "Valgevene ladina"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:230
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "Bengaali"
 
-#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
 msgid "Catalan"
 msgstr "Kataloonia"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "Valentsia kataloonia"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:233
 msgid "Czech"
 msgstr "Tšehhi"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "Taani"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:234
 msgid "German"
 msgstr "Saksa"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "Austraalia inglise"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "Kanada inglise"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "Briti inglise"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "Pärsia"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:245
 msgid "Galician"
 msgstr "Galiitsia"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "Gujarati keelemeeskond"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:246
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:247
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "Indoneesia"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:251
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
 msgid "Georgian"
 msgstr "Gruusia"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Gruusia tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "Kannada tõlkemeeskond"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
 msgid "Korean"
 msgstr "Korea"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "Kurdi"
 
-#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Lithuanian"
 msgstr "Leedu"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Bokmål Norwegian"
 msgstr "Norra (bokmål)"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "Nepaali"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "Hollandi, Flaami"
 
-#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "Norra (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:195
+msgid "Occitan"
+msgstr ""
+
 msgid "Punjabi"
 msgstr "Pandžabi"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:260
 msgid "Polish"
 msgstr "Poola"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "Portugali-Brasiilia"
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "Rumeenia"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Russian"
 msgstr "Vene"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:263 ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Slovak"
 msgstr "Slovaki"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:266
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "Albaania"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
 msgid "Serbian"
 msgstr "Serbia"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:269
-#: ../pidgin/gtkdialogs.c:270
+msgid "Sinhala"
+msgstr ""
+
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Tamil"
 msgstr "Tamili"
 
-#: ../pidgin/gtkdialogs.c:212
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Thai"
 msgstr "Tai"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:271
 msgid "Turkish"
 msgstr "Türgi"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "Urdu"
 msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ja Gnome-Vi meeskond"
 
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:272
 msgid "Simplified Chinese"
 msgstr "Hiina lihtsustatud"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongi hiina"
 
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:273
 msgid "Traditional Chinese"
 msgstr "Hiina traditsiooniline"
 
-#: ../pidgin/gtkdialogs.c:228
 msgid "Amharic"
 msgstr "Amhari"
 
-#: ../pidgin/gtkdialogs.c:358
 #, c-format
 msgid "About %s"
 msgstr "%s - lähem teave"
 
-#: ../pidgin/gtkdialogs.c:394
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15229,100 +10983,71 @@ msgstr ""
 "autoritele. Autorite täielik nimekiri asub failis 'COPYRIGHT'. Programmil "
 "pole mitte mingisugust garantiid.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:412
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin serveris irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "Praegused arendajad"
 
-#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Endised arendajad"
 
-#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
 msgstr "Endised hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Kunstnikud"
 
-#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Praegused tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Eelmised tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Silumisandmed"
 
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:966
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../pidgin/gtkdialogs.c:751 ../pidgin/gtkdialogs.c:890
-#: ../pidgin/gtkdialogs.c:971
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../pidgin/gtkdialogs.c:898
 msgid "Get User Info"
 msgstr "Kasutaja andmete hankimine"
 
-#: ../pidgin/gtkdialogs.c:900
 msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+"Please enter the username or alias of the person whose info you would like "
+"to view."
 msgstr ""
-"Palun sisesta isiku ekraaninimi või alias, kelle andmeid sa soovid vaadata."
+"Palun sisesta isiku kasutajanimi või alias, kelle andmeid sa soovid vaadata."
 
-#: ../pidgin/gtkdialogs.c:990
 msgid "View User Log"
 msgstr "Kasutaja logi vaatamine"
 
-#: ../pidgin/gtkdialogs.c:992
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Palun sisesta isiku ekraaninimi või alias, kelle logi sa soovid vaadata."
-
-#: ../pidgin/gtkdialogs.c:1012
 msgid "Alias Contact"
 msgstr "Aliase kontakt"
 
-#: ../pidgin/gtkdialogs.c:1013
 msgid "Enter an alias for this contact."
 msgstr "Sisesta sellele kontaktile alias."
 
-#: ../pidgin/gtkdialogs.c:1035
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Sisesta kasutajale %s alias."
 
-#: ../pidgin/gtkdialogs.c:1037
 msgid "Alias Buddy"
 msgstr "Sõbrale aliase määramine"
 
-#: ../pidgin/gtkdialogs.c:1058
 msgid "Alias Chat"
 msgstr "Vestluse alias"
 
-#: ../pidgin/gtkdialogs.c:1059
 msgid "Enter an alias for this chat."
 msgstr "Aliase lisamine vestlusele."
 
-#: ../pidgin/gtkdialogs.c:1098
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15333,15 +11058,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1106
 msgid "Remove Contact"
 msgstr "Kontakti eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1109
 msgid "_Remove Contact"
 msgstr "_Eemalda kontakt"
 
-#: ../pidgin/gtkdialogs.c:1140
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15349,15 +11071,12 @@ msgid ""
 msgstr ""
 "Paistab, et sa proovid ühendada gruppi %s grupiga %s. Kas soovid jätkata?"
 
-#: ../pidgin/gtkdialogs.c:1147
 msgid "Merge Groups"
 msgstr "Gruppide ühendamine"
 
-#: ../pidgin/gtkdialogs.c:1150
 msgid "_Merge Groups"
 msgstr "Ühenda _grupid"
 
-#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15366,15 +11085,12 @@ msgstr ""
 "Sa oled eemaldamas gruppi %s ja kõiki selle liikmeid oma sõbranimekirjast. "
 "Kas sa soovid seda teha?"
 
-#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Group"
 msgstr "Grupi eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Group"
 msgstr "_Eemalda grupp"
 
-#: ../pidgin/gtkdialogs.c:1239
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -15382,15 +11098,12 @@ msgstr ""
 "Sa oled eemaldamas kasutajat %s oma sõbranimekirjast. Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1242
 msgid "Remove Buddy"
 msgstr "Sõbra eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1245
 msgid "_Remove Buddy"
 msgstr "_Eemalda sõber"
 
-#: ../pidgin/gtkdialogs.c:1266
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15399,197 +11112,186 @@ msgstr ""
 "Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1269
 msgid "Remove Chat"
 msgstr "Vestluse eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1272
 msgid "_Remove Chat"
 msgstr "_Eemalda vestlus"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Parema hiireklõpsuga näed veel lugemata sõnumeid...\n"
 
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr "Muuda olekut"
+msgid "_Change Status"
+msgstr "_Muuda olekut"
+
+msgid "Show Buddy _List"
+msgstr "Näita _sõbranimekirja"
+
+msgid "_Unread Messages"
+msgstr "_Lugemata sõnumid"
 
-#: ../pidgin/gtkdocklet.c:681
-msgid "Show Buddy List"
-msgstr "Sõbraloendi näitamine"
+msgid "New _Message..."
+msgstr "Uus _sõnum..."
 
-#: ../pidgin/gtkdocklet.c:707
-msgid "New Message..."
-msgstr "Uus sõnum..."
+msgid "_Accounts"
+msgstr "_Kontod"
 
-#: ../pidgin/gtkdocklet.c:722
-msgid "Mute Sounds"
-msgstr "Vaigista helid"
+msgid "Plu_gins"
+msgstr "Plu_ginad"
 
-#: ../pidgin/gtkdocklet.c:729
-msgid "Blink on New Message"
-msgstr "Vilkumine uue sõnumi korral"
+msgid "Pr_eferences"
+msgstr "_Eelistused"
 
-#: ../pidgin/gtkdocklet.c:739
-msgid "Quit"
-msgstr "Lõpeta"
+msgid "Mute _Sounds"
+msgstr "Vaigista _helid"
+
+msgid "_Blink on New Message"
+msgstr "_Vilkumine uue sõnumi korral"
+
+msgid "_Quit"
+msgstr "_Lõpeta"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Alustamata"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Saaja:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Saatja:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Faili saaja:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Saatja:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "Selle faili avamiseks pole seadistustes rakendust määratud."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Faili avamisel tekkis viga."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Viga %s käivitamisel: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Viga %s käivitamisel"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Protsess tagastas veakoodi %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Failinimi:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Kohalik fail:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Kiirus:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Aega kulunud:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Aega jäänud:"
 
-#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "See aken sule_takse ülekannete lõppemisel"
 
-#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Lõpetatud ülekanded puhastatakse"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "Failiülekande ü_ksikasjad"
 
 #. Pause button
-#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "Pa_us"
 
 #. Resume button
-#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Jätka"
 
-#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Aseta _lihttekstina"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Puhasta vormindus"
 
-#: ../pidgin/gtkimhtml.c:1391
+msgid "Disable _smileys in selected text"
+msgstr "Keela valitud tekstis _tujunäod"
+
 msgid "Hyperlink color"
 msgstr "Hüperviida värv"
 
-#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "Hüperviitade joonistamise värv."
 
-#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr "Hüperviida värv fookuses"
 
-#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Hüperviitade joonistamise värv hiirekursori fookuse korral."
 
-#: ../pidgin/gtkimhtml.c:1399 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Nime värvus saadetud sõnumites"
 
-#: ../pidgin/gtkimhtml.c:1400
 msgid "Color to draw the name of a message you sent."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Nime värvus vastuvõetud sõnumites"
 
-#: ../pidgin/gtkimhtml.c:1404
 msgid "Color to draw the name of a message you received."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1407
 msgid "\"Attention\" Name Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1408
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1411 ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1412
 msgid "Color to draw the name of an action message."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1632
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Whisper Message Name Color"
+msgstr ""
+
+msgid "Typing notification color"
+msgstr "Tippimismärguande värvus"
+
+msgid "The color to use for the typing notification font"
+msgstr "Tippimismärguande kuvamiseks kasutatav värvus"
+
+msgid "Typing notification font"
+msgstr "Tippimismärguande kirjatüüp"
+
+msgid "The font to use for the typing notification"
+msgstr "Tippimismärguande kuvamiseks kasutatav kirjatüüp"
+
+msgid "Enable typing notification"
+msgstr "Tippimismärguande lubamine"
+
 msgid "_Copy Email Address"
 msgstr "_Kopeeri e-posti aadress"
 
-#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "_Ava viit veebisirvijas"
 
-#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "_Kopeeri viida asukoht"
 
-#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15599,7 +11301,6 @@ msgstr ""
 "\n"
 "Vaikimisi on selleks PNG."
 
-#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15608,7 +11309,6 @@ msgstr ""
 "Tundmatu failitüüp\n"
 "Vaikimisi on selleks PNG."
 
-#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15619,7 +11319,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15630,247 +11329,205 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "Pildi salvestamine"
 
-#: ../pidgin/gtkimhtml.c:3577
+#, c-format
 msgid "_Save Image..."
 msgstr "_Salvesta pilt..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:164
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "Lisa _kohandatud tujunägu..."
+
 msgid "Select Font"
 msgstr "Kirjatüübi valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Teksti värvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Taustavärvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Kirjeldus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 "Palun sisesta lisatava viida URL ja kirjeldus. Kirjeldus ei ole kohustuslik."
 
-#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Palun sisesta URL, mida soovid lisada."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "Viida lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "L_isa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Tõrge pildi salvestamisel: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Pildi lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:712
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
 msgid "Smile!"
 msgstr "Tujunäod"
 
-#: ../pidgin/gtkimhtmltoolbar.c:764
+msgid "_Manage custom smileys"
+msgstr "_Halda kohandatud tujunägusid"
+
 msgid "This theme has no available smileys."
 msgstr "Selles teemas pole tujunägusid"
 
-#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "Kir_jatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Rasvane"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Kursiiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Allajoonitud"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr "Läbijoonitud"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "Kirjatüübi suuruse suurendamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "Kirjatüübi suuruse vähendamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Font Face"
 msgstr "Kirjatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Background Color"
 msgstr "Taustavärvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Foreground Color"
 msgstr "Teksti värvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "Vorminduse algväärtustamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "Välksõnumipildi lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "Tujunäo lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<b>_Bold</b>"
 msgstr "<b>_Rasvane</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<u>_Underline</u>"
 msgstr "<u>_Allajoonitud</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Läbijoonitud</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>S_uurem</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
 msgstr "_Tavaline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Väiksem</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
 msgstr "Ki_rjatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "_Teksti värvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "Tau_stavärvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "_Pilt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "_Viit"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "_Rõhtjoon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1307
 msgid "_Smile!"
 msgstr "_Tujunägu!"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Tõrge logi kustutamisel"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Kontrolli õiguseid ja proovi uuesti."
 
-#: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
 
-#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr ""
 
-#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr ""
 
-#: ../pidgin/gtklog.c:324
 msgid "Delete Log?"
 msgstr "Kas kustutada logi?"
 
-#: ../pidgin/gtklog.c:335
 msgid "Delete Log..."
 msgstr "Kustuta logi..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr ""
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Vestlused kasutajaga %s, %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Sirvi logide kausta"
 
-#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Lähema teabe saamiseks kasuta `%s -h'.\n"
 
-#: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15881,8 +11538,9 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
@@ -15898,12 +11556,13 @@ msgstr ""
 "  -l, --login[=NIMI]     automaatne sisselogimine (valikuline parameeter "
 "NIMI\n"
 "                         määrab komadega eraldatud loendi abil kasutatavad\n"
-"                         kontod)\n"
+"                         kontod. Kui nimed on määramata, siis lubatakse "
+"ainult\n"
+"                         esimene konto)\n"
 "  --display=KUVA         kasutatava X-kuva määramine\n"
 "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
 "                         lõpetamine\n"
 
-#: ../pidgin/gtkmain.c:413
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15914,8 +11573,9 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15930,11 +11590,12 @@ msgstr ""
 "  -l, --login[=NIMI]     automaatne sisselogimine (valikuline parameeter "
 "NIMI\n"
 "                         määrab komadega eraldatud loendi abil kasutatavad\n"
-"                         kontod)\n"
+"                         kontod. Kui nimed on määramata, siis lubatakse "
+"ainult\n"
+"                         esimene konto)\n"
 "  -v, --version          käesoleva versiooni kuvamine ja programmi töö\n"
 "                         lõpetamine\n"
 
-#: ../pidgin/gtkmain.c:540
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -15958,210 +11619,164 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:731 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "Ava kõik sõnumid"
 
-#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sulle on e-sõnum!</span>"
 
-#: ../pidgin/gtknotify.c:551
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s sai %d uue sõnumi."
 msgstr[1] "%s sai %d uut sõnumit."
 
-#: ../pidgin/gtknotify.c:575
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d uus e-sõnum.</b>"
 msgstr[1] "<b>%d uut e-sõnumit.</b>"
 
-#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Sirvija käsk \"%s\" on vigane."
 
-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "URL-i pole võimalik avada"
 
-#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Viga \"%s\" käivitamisel: %s"
 
-#: ../pidgin/gtknotify.c:1173
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:266
 msgid "The following plugins will be unloaded."
 msgstr "Järgnevad pluginad laaditakse mälust välja."
 
-#: ../pidgin/gtkplugin.c:285
 msgid "Multiple plugins will be unloaded."
 msgstr "Mitu pluginat laaditakse mälust välja."
 
-#: ../pidgin/gtkplugin.c:289
 msgid "Unload Plugins"
 msgstr "Pluginate väljalaadimine"
 
-#: ../pidgin/gtkplugin.c:309
 msgid "Could not unload plugin"
 msgstr "Pluginat pole võimalik välja laadida"
 
-#: ../pidgin/gtkplugin.c:310
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:418
 #, c-format
 msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Autor:</span>\t%s\n"
-"<span weight=\"bold\">Veebisait:</span>\t\t%s\n"
-"<span weight=\"bold\">Failinimi:</span>\t\t%s"
-
-#: ../pidgin/gtkplugin.c:428
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Viga: %s\n"
-"Uuenduse jaoks kontrollu plugina veebisaiti.</span>"
+"<span foreground=\"red\" weight=\"bold\">Viga: %s\n"
+"Uuenduse jaoks kontrolli plugina veebisaiti.</span>"
+
+msgid "Author"
+msgstr "Autor"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>Programmeerija:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>Veebisait:</b> "
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Failinimi:</b>"
 
-#: ../pidgin/gtkplugin.c:606
 msgid "Configure Pl_ugin"
 msgstr "Seadista pl_uginat"
 
-#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugina üksikasjad</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Faili valimine"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Kellest märku antakse"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Sõbra _nimi:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "Lo_gib sisse"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "Logib _välja"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "_Eemaldub"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "Pöörd_ub eemalolekust tagasi"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Jääb _jõude"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Naaseb jõude_olekust"
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Alustab ti_ppimist"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Peab t_ippimisel pausi"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Lõpetab _tippimise"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Saada_b sõnumi"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Avatakse välksõnumi aken"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Kuvatakse teavituse _hüpikakent"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Saa_detakse sõnum"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "_Käivitatakse käsk"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Mängitakse _heli"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Sirvi..."
 
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "_Sirvi..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Eelvaade"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "_Märguanne ainult juhul, kui minu olekuks on \"pole saadaval\""
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Korduv"
 
-#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Kelle kohta"
 
-#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Tõrge tujunägude teema lahtipakkimisel"
 
-#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:646
 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."
@@ -16169,136 +11784,112 @@ msgstr ""
 "Vali allolevast loendist tujunägude teema, mida sa soovid kasutada. Uusi "
 "teemasid saab paigaldada lohistades neid teemade nimekirja."
 
-#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../pidgin/gtkprefs.c:843
+msgid "Keyboard Shortcuts"
+msgstr "Kiirklahvid"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Vestlused suletakse _Escape-klahvi vajutamisega"
+
 msgid "System Tray Icon"
 msgstr "Süsteemisalve ikoon"
 
-#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "Süsteemisalve _ikooni näidatakse:"
 
-#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "Lugemata sõnumite korral"
 
-#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "Vestlusakna peitmine"
 
-#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "Välksõnumivestlused _peidetakse:"
 
-#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "Kui olen eemal"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "Kaardid"
 
-#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "_Välksõnumeid ja vestlusi näidatakse kaartidega aknas"
 
-#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "Sakkidel näidatakse sul_gemisnuppu"
 
-#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_Asetus:"
 
-#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "Üleval"
 
-#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "All"
 
-#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "Vasakul"
 
-#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "Paremal"
 
-#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "Vertikaalselt vasakul"
 
-#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "Vertikaalselt paremal"
 
-#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "_Uued vestlused:"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "Sissetulevatel sõnumitel _näidatakse vormindust"
 
-#: ../pidgin/gtkprefs.c:946
 msgid "Close IMs immediately when the tab is closed"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "_Näidatakse üksikasjalisi andmeid"
 
-#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "Sõbrai_koonidel on animatsioon lubatud"
 
-#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "Sõpru _teavitatakse, kui sa oled neile sõnumit kirjutamas"
 
-#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "Õigekirjaprobleemidega sõnad tõstetakse _esile"
 
-#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "Kasutatakse pehmet kerimist"
 
-#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "Välksõnumite vastuvõtmisel vilgutatakse _aknaid"
 
-#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "Uute vestluste aknad _minimeeritakse"
 
-#: ../pidgin/gtkprefs.c:974
+msgid "Minimum input area height in lines:"
+msgstr ""
+
 msgid "Font"
 msgstr "Kirjatüüp"
 
-#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "Kasutatakse _teemast võetud kirjatüüpi"
 
-#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "Vestluse kir_jatüüp:"
 
-#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "Vaikimisi vormindus"
 
-#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16306,63 +11897,48 @@ msgstr ""
 "Nii paistab sinu väljuv sõnum juhul, kui sa kasutad vormindamist toetavat "
 "protokolli."
 
-#: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
 msgstr "Proksi seadistusprogrammi pole võimalik käivitada."
 
-#: ../pidgin/gtkprefs.c:1082
 msgid "Cannot start browser configuration program."
 msgstr "Veebisirvija seadistusprogrammi pole võimalik käivitada."
 
-#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
-#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Näide: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "IP-aadress tuvastatakse _automaatselt"
 
-#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "Avalik _IP:"
 
-#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "Pordid"
 
-#: ../pidgin/gtkprefs.c:1161
 msgid "_Enable automatic router port forwarding"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Kuulatavate portide vahemik määratakse käsitsi"
 
-#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "Al_gusport:"
 
-#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "_Lõpuport:"
 
-#: ../pidgin/gtkprefs.c:1182
 msgid "Proxy Server &amp; Browser"
 msgstr "Proksi server ja veebisirvija"
 
-#: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Proksi seadistamisprogrammi ei leitud.</b>"
 
-#: ../pidgin/gtkprefs.c:1198
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Veebisirvija seadistamisprogrammi ei leitud.</b>"
 
-#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16370,99 +11946,75 @@ msgstr ""
 "Proksi server ja veebisirvija on määratud\n"
 "GNOME eelistustes"
 
-#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "Seadista _proksit"
 
-#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "Seadista _veebisirvijat"
 
-#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "Proksi puudub"
 
-#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "Kasuta_ja:"
 
-#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1375
 msgid "Desktop Default"
 msgstr "Töölaua vaikeväärtus"
 
-#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "GNOME vaikimisi"
 
-#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "Veebisirvija valimine"
 
-#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "Si_rvija:"
 
-#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "_Viidad avatakse:"
 
-#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "Veebisirvija vaikimisi sätted"
 
-#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "Olemasolevasse aknasse"
 
-#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "Uuele kaardile"
 
-#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16471,63 +12023,54 @@ msgstr ""
 "_Käsitsi:\n"
 "(%s URL-i jaoks)"
 
-#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "Logi_vorming:"
 
-#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "Kõiki välksõnumeid _logitakse"
 
-#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "Kõiki _vestlusi logitakse"
 
-#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "Kõiki _olekumuutusi logitakse süsteemsesse logisse"
 
-#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "Heli valimine"
 
-#: ../pidgin/gtkprefs.c:1679
+#, c-format
 msgid "Quietest"
 msgstr "Vaikseim"
 
-#: ../pidgin/gtkprefs.c:1681
+#, c-format
 msgid "Quieter"
 msgstr "Vaiksem"
 
-#: ../pidgin/gtkprefs.c:1683
+#, c-format
 msgid "Quiet"
 msgstr "Vaikne"
 
-#: ../pidgin/gtkprefs.c:1687
+#, c-format
 msgid "Loud"
 msgstr "Valju"
 
-#: ../pidgin/gtkprefs.c:1689
+#, c-format
 msgid "Louder"
 msgstr "Valjem"
 
-#: ../pidgin/gtkprefs.c:1691
+#, c-format
 msgid "Loudest"
 msgstr "Kõige valjem"
 
-#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_Meetod"
 
-#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "Konsoolipiiks"
 
-#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "Helid puuduvad"
 
-#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16536,336 +12079,311 @@ msgstr ""
 "Helitegemise _käsk:\n"
 "(%s failinime jaoks)"
 
-#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "_Heli fokuseeritud vestluse korral"
 
-#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "Helid lubatakse:"
 
-#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "Valjus:"
 
-#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "Mängida"
 
-#: ../pidgin/gtkprefs.c:1948
+msgid "_Browse..."
+msgstr "_Sirvi..."
+
+msgid "_Reset"
+msgstr "_Algväärtusta"
+
 msgid "_Report idle time:"
 msgstr "_Jõudeoleku ajast teatatakse:"
 
-#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "Tulenevalt klaviatuuri ja hiire kasutamisest"
 
-#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_Automaatne vastamine:"
 
-#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "Kui olen eemal ja jõude"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "Automaatne eemaldumine"
 
-#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "Jõudeoleku puhul määratakse uus _olek"
 
-#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "Mitme _minuti möödudes jõudeolek määratakse:"
 
-#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "Uueks o_lekuks saab:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "Olek käivitamisel"
 
-#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "Kä_ivitamisel kasutatakse viimast olekut"
 
-#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "Käivitamisel _rakendatav olek:"
 
-#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "Liides"
 
-#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "Tujunägude teemad"
 
-#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "Veebisirvija"
 
-#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "Olek / jõude"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Lubada kõigil kasutajail minuga ühendust võtta"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
-msgstr "Lubada ainult minu sõbraloendis olevaid kasutajaid"
+msgstr "Lubada ainult minu sõbranimekirjas olevaid kasutajaid"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Lubada ainult allpool kuvatud kasutajaid"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Blokkida kõik kasutajad"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Blokkida ainult allpool kuvatud kasutajad"
 
-#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Privaatsus"
 
-#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Privaatsussätted rakenduvad koheselt."
 
-#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Privaatsus kontole:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
 msgstr "Eemalda _kõik"
 
-#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Kasutaja lubamine"
 
-#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Sisesta kasutaja, kellel sa lubad endaga ühendust võtta"
 
-#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Palun sisesta kasutaja nimi, kellele sa annad loa endaga ühendust võtta."
 
-#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "L_uba"
 
-#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Kas %s tohib sinuga ühendust võtta?"
 
-#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Kas sa lubad, et %s saab sinuga ühendust võtta?"
 
-#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Kasutaja blokkimine"
 
-#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Sisesta kasutaja, keda blokkida."
 
-#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Palun sisesta selle kasutaja tunnus, keda sa soovid blokkida."
 
-#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "Kas blokkida %s?"
 
-#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Oled sa kindel, et soovid %s blokkida?"
 
-#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Rakenda"
 
-#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "See fail on juba olemas"
 
-#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "Kas sa soovid seda üle kirjutada?"
 
-#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "Uue nime valimine"
 
-#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "Kataloogi valimine..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Hangi nimekiri"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Lisa vestlus"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Kas sa soovid kustutada valitud salvestatud olekud?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Kasuta"
 
-#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
-msgstr "Tiitel on juba kasutusel. Sa pead valima unikaalse tiitli."
+msgstr "Pealkiri on juba kasutusel. Sa pead valima unikaalse pealkirja."
 
-#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Teistsugune"
 
-#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Pealkiri:"
 
-#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_Olek:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "_Teistsuguse oleku kasutamine mõne konto jaoks"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Sal_vesta ja kasuta"
 
-#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:683
+msgid "Custom Smiley"
+msgstr "Kohandatud tujunägu"
+
+msgid "Duplicate Shortcut"
+msgstr "Dubleeriuv kiirklahv"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+
+msgid "More Data needed"
+msgstr ""
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr ""
+
+msgid "Please select an image for the smiley."
+msgstr "Palun vali tujunäo jaoks pilt."
+
+msgid "Edit Smiley"
+msgstr "Tujunäo muutmine"
+
+msgid "Add Smiley"
+msgstr "Tujunäo lisamine"
+
+msgid "Smiley _Image"
+msgstr "Tujunäo _pilt"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Tujunäo _kiirklahv"
+
+msgid "Smiley"
+msgstr "Tujunägu"
+
+msgid "Custom Smiley Manager"
+msgstr "Kohandatud tujunägude haldur"
+
 msgid "Waiting for network connection"
 msgstr "Võrguühenduse järel ootamine"
 
-#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "Uus olek..."
 
-#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "Salvestatud olekud..."
 
-#: ../pidgin/gtkutils.c:683
+msgid "Status Selector"
+msgstr "Olekuvalija"
+
 msgid "Google Talk"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "%s laadimisel tekkis järgnev viga: %s"
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "Tõrge pildi laadimisel"
 
-#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kausta %s pole võimalik saata."
 
-#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
-#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1585
 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 ""
 
-#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "Määra sõbraikooniks"
 
-#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Saada pildifail"
 
-#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Lisa sõnumisse"
 
-#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Kas sa soovid seda pilti määrata selle kasutaja sõbraikooniks?"
 
-#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
+"Sul on võimalik saata see pilt failiülekandega või määrata selle sõbra "
+"ikooniks."
 
-#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
+"Sul on võimalik see pilt sõnumisse lisada või määrata selle sõbra ikooniks."
 
 #. 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:1664
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1664
 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:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16876,108 +12394,83 @@ msgstr ""
 "<b>Faili suurus:</b> %s\n"
 "<b>Pildi suurus:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "Ikooni viga"
 
-#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "Ikooni pole võimalik määrata"
 
-#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Tõrge faili '%s' avamisel: %s"
 
-#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Tõrge pildi '%s' laadimisel: põhjus on teadmata, ilmselt on pildifail rikutud"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Faili salvestamine"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Värvuse valimine"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "_Sulge kaardid"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "Hangi _teavet"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Muuda"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Ava sõnum"
 
-#: ../pidgin/pidgintooltip.c:100
 msgid "Pidgin Tooltip"
 msgstr "Pidgini vihje"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin'i tujunäod"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr ""
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Selle valimine keelab graafilised tujunäod."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "puudub"
 
-#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "Vastamise tõenäosus:"
 
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "Statistika sätted"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "Vastuse suurim ajapiirang:"
 
-#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
-#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutit"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr "Suurim viimati-nähtud erinevus:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr "Lävi:"
 
@@ -16987,59 +12480,45 @@ msgstr "Lävi:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr "Kontakti saadavaloleku ennustamine"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr "Kontakti saadavaloleku ennustamise plugin."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:900
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
+msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Sõber on jõude"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Sõber on eemal"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Sõber on kaua eemal"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
-msgstr ""
+msgstr "Sõber on mobiilne"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Sõber pole ühendatud"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr ""
 
-#: ../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 ""
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr ""
 
@@ -17049,90 +12528,71 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Vestluse värvused"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Vestlusakende sõnumite värvuste kohandamine"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Veateated"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Esiletõstetud sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Süsteemsed sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Saadetud sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Vastuvõetud sõnumid"
 
-#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Värvuse valimine %s jaoks"
 
-#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Sissetulevat vormingut eiratakse"
 
-#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Rakendatakse jututubadele"
 
-#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Rakendatakse välksõnumitele"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Vestluste arvu järgi"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Vestluse asetamine"
 
 #. 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 "Vestluste arv akna kohta"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Välksõnumi- ja jututoaakende eraldamine, kui asetatakse numbrite järgi"
 
@@ -17142,19 +12602,16 @@ msgstr "Välksõnumi- ja jututoaakende eraldamine, kui asetatakse numbrite järg
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "EkstraAsetus"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Täiendavad valikud vestlusakende asetamisele."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -17163,20 +12620,16 @@ msgstr ""
 "välksõnumi- ja jututoaaknaid"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Hiirežestide sätted"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Keskmine hiirenupp"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Parempoolne hiirenupp"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr ""
 
@@ -17186,56 +12639,43 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Hiirežestid"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Hiirežestide toe tagamine"
 
 #. *  description
-#: ../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"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Välksõnumivahendid"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Vali isik aadressiraamatust või lisa uus."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Grupp:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Uus isik"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Vali sõber"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -17243,43 +12683,33 @@ msgstr ""
 "Vali aadressiraamatus olev kirje, millega seda sõpra siduda või loo uus isik."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Kasutaja üksikasjad"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send email"
 msgstr "E-kirja pole võimalik saata"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Evolutioni programmi pole võimalik PATH radadel leida."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An email address was not found for this buddy."
 msgstr "Selle sõbra e-posti aadressi ei leitud."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Lisa aadressiraamatusse"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send Email"
 msgstr "Saada e-kiri"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution'iga sidumise sätted"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Vali kõik kontod, mille sõbrad tuleb automaatselt lisada."
 
@@ -17289,7 +12719,6 @@ msgstr "Vali kõik kontod, mille sõbrad tuleb automaatselt lisada."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution'iga sidumine"
 
@@ -17297,37 +12726,28 @@ msgstr "Evolution'iga sidumine"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Plugin tagab integratsiooni Evolution'iga."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Palun sisesta isiku andmed."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Palun sisesta allolevasse vormi sõbra ekraaninimi ja konto liik."
+msgid "Please enter the buddy's username and account type below."
+msgstr "Palun sisesta allolevasse vormi sõbra kasutajanimi ja konto liik."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Konto liik:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Täiendav teave:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Eesnimi:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Perekonnanimi:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "Email:"
 msgstr "E-post:"
 
@@ -17337,7 +12757,6 @@ msgstr "E-post:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK signaalitestid"
 
@@ -17345,12 +12764,9 @@ msgstr "GTK signaalitestid"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
-msgstr ""
+msgstr "Kasutajaliidese signaalide korrektse töötamise testid."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17359,7 +12775,6 @@ msgstr ""
 "\n"
 "<b>Sõbra märkus:</b> %s"
 
-#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Ajalugu"
 
@@ -17369,7 +12784,6 @@ msgstr "Ajalugu"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Ikoonimine eemaldumisel"
 
@@ -17377,80 +12791,65 @@ msgstr "Ikoonimine eemaldumisel"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Sõbranimekirja ja vestlusakende ikooniks taandamine Sinu eemaldumisel."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "E-post kontrollija"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Uute kohalike e-kirjade kontrollimine."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Väikese kastikese lisamine sõbranimekirja näitamaks, kas sulle on uusi e-"
 "sõnumeid."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Markerjoon"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Joone tõmbamine vestluse uute ja vanade sõnumite vahele."
 
-#: ../pidgin/plugins/markerline.c:246
+msgid "Jump to markerline"
+msgstr ""
+
 msgid "Draw Markerline in "
 msgstr "Markerjoon joonistatakse "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Välksõnumiakendele"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Jututoaakendele"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Musikaline sõnumivahetus"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Käsu käivitamisel tekkis vastuolu:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Viga redaktori käivitamisel"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Leidis aset järgmine viga:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Musikalise sõnumivahetuse sätted"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Rakenda"
 
@@ -17462,86 +12861,73 @@ msgstr "_Rakenda"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Muusikalise sõnumivahetuse plugin ühise komponeerimise tarbeks."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 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 ""
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Teavitused kehtivad"
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "Ainult ju_hul, kui keegi ütleb Sinu ekraaninime"
+msgid "\t_Only when someone says your username"
+msgstr "Ainult ju_hul, kui keegi ütleb Sinu kasutajanime"
 
-#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fookuses olevatele akendele"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Teavitamisviisid"
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
-msgstr "Aknatiitli ette _lisatakse string:"
+msgstr "Akna pealkirja ette _lisatakse string:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
-msgstr "Aknatiitlisse lisatakse uute sõnumite _arv"
+msgstr "Akna pealkirja lisatakse uute sõnumite _arv"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "_X-i omadusele lisatakse uute sõnumite arv"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aknahalduri \"_URGENT\" vihje"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Vestlusaken tõstetakse _esile"
 
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr ""
+
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Teavituste eemaldamine"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Eemaldatakse vestlusakena sa_ttumisel fookusesse"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Eemaldatakse vestlusaknale _klõpsamisel"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Eemaldatakse vestlusaknasse ti_ppimisel"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Eemaldatakse sõ_numi edukal saatmisel"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -17551,7 +12937,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Sõnumitest teavitaja"
 
@@ -17559,7 +12944,6 @@ msgstr "Sõnumitest teavitaja"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Mitut sorti võimalusi lugemata sõnumitest teavitamiseks"
 
@@ -17569,19 +12953,16 @@ msgstr "Mitut sorti võimalusi lugemata sõnumitest teavitamiseks"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Pidgin'i näidisplugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Näidisplugin, mis teeb midagi - vaata kirjeldust."
 
 #. *  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"
@@ -17589,56 +12970,44 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Kursori värvus"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Teise kursori värvus"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Hüperviida värvus"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Nime värvus esiletõstetud sõnumites"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GTK puuvaate rõhteraldaja"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Vestluse kirje"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Päringudialoog"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Teavitusdialoog"
 
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Värvuse valimine"
 
-#: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Liidese kirjatüübi valimine"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Kirjatüübi valimine %s jaoks"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "GTK+ liidese kirjatüüp"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17662,48 +13031,37 @@ msgstr ""
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Liidese värvid"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Vidinate suurused"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc failitööriistad"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Kirjuta sätted %s%sgtkrc-2.0 faili"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Laadi gtkrc failid uuesti"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgini GTK+ teemajuhtija"
 
-#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Üldkasutatavatele gtkrc sätetele ligipääsu tagamine."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Toorsisend"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Toorsisendi saatmise lubamine tekstipõhistele protokollidele."
 
-#: ../pidgin/plugins/raw.c:178
 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."
@@ -17711,7 +13069,6 @@ msgstr ""
 "Lubab sul saata töötlemata sisendit tekstipõhistele protokollidele (XMPP, "
 "MSN, IRC, TOC). Saatmiseks vajuta sisendkastis 'Enter'. Jälgi silumisakent."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -17720,12 +13077,10 @@ msgstr ""
 "Sa kasutad programmi %s versiooni %s.  Hetkel on uusim versioon %s.  Seda on "
 "võimalik alla laadida aadressilt <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Muudatuste logi:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Uus versioon on saadaval"
 
@@ -17735,86 +13090,91 @@ msgstr "Uus versioon on saadaval"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Väljalasetest teavitaja"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Kontrollib korrapäraselt uusi väljalaskeid."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:1962
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Saatmisnupp"
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr "Vestlusakna saatmisnupp."
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+"Saatmisnupu lisamine vestlusakna sisestusala juurde. See on mõeldud "
+"kasutamiseks olukorras, kus klaviatuuri pole võimalik pruukida."
+
 msgid "Duplicate Correction"
 msgstr "Topeltparandus"
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Määratud sõna on juba paranduste nimekirjas olemas."
 
-#: ../pidgin/plugins/spellchk.c:2176
 msgid "Text Replacements"
 msgstr "Tekstiasendused"
 
-#: ../pidgin/plugins/spellchk.c:2199
 msgid "You type"
 msgstr "Sina tipid"
 
-#: ../pidgin/plugins/spellchk.c:2213
 msgid "You send"
 msgstr "Tekst saaadetakse kui"
 
-#: ../pidgin/plugins/spellchk.c:2227
 msgid "Whole words only"
 msgstr "Ainult terved sõnad"
 
-#: ../pidgin/plugins/spellchk.c:2239
 msgid "Case sensitive"
 msgstr "Tõstutundlik"
 
-#: ../pidgin/plugins/spellchk.c:2265
 msgid "Add a new text replacement"
 msgstr "Uue asenduse lisamine"
 
-#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _type:"
 msgstr "Sina _tipid:"
 
-#: ../pidgin/plugins/spellchk.c:2285
 msgid "You _send:"
 msgstr "Tekst saadetakse _kui:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "Arvestatakse suur- ja _väiketähtedega"
 
-#: ../pidgin/plugins/spellchk.c:2290
 msgid "Only replace _whole words"
 msgstr "Asendatakse ainult te_rved sõnad"
 
-#: ../pidgin/plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "Üldised tekstiasenduse valikud"
 
-#: ../pidgin/plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "Viimase saadetud sõna asenduse lubamine"
 
-#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "Tekstiasendaja"
 
-#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Asendab väljaminevates sõnumites teksti vastavalt kasutaja poolt määratud "
@@ -17826,7 +13186,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Sõbratiksuja"
 
@@ -17834,11 +13193,9 @@ msgstr "Sõbratiksuja"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Horisontalselt keriv versioon sõbranimekirjast."
 
-#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Ajatemplite kuvatamise sagedus"
 
@@ -17848,49 +13205,38 @@ msgstr "Ajatemplite kuvatamise sagedus"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Ajatempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "iChat'ilaadsete ajatemplite kuvamine"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "iChat'ilaadsete ajatemplite kuvamine iga N minuti järel."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Ajatempli vormingu valikud"
 
-#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "Kasutatakse _24-tunnist ajavormingut"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Kus aegu näidatakse:"
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "_Vestlused:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Viivitusega sõnumitele"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Viivitusega sõnumitele ja vestlustele"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Sõnu_milogid:"
 
@@ -17900,19 +13246,16 @@ msgstr "Sõnu_milogid:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Sõnumi ajatemplivormingud"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Sõnumite ajatemplite vormingute kohandamine."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -17920,44 +13263,32 @@ msgstr ""
 "Selle plugina abil saab kasutaja kohandada vestluse käigus edastatud "
 "sõnumite ajatemplite vorminguid."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Läbipaistmatus:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Välksõnumite aknad"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_Välksõnumiaknad on läbipaistvad"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Liuguri näitamine välksõnumiakendes"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Välksõnumi akna läbipaistvuse eemaldamine selle fokuseerimisel"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Alati pealmine"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Sõbranimekirja aken"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Sõbraaken on _läbipaistev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Sõbranimekirja akna läbipaistvuse eemaldamine selle fokuseerimisel"
 
@@ -17967,19 +13298,16 @@ msgstr "Sõbranimekirja akna läbipaistvuse eemaldamine selle fokuseerimisel"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Muutuv läbipaistvus sõbranimekirjale ja vestlustele."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -17991,54 +13319,43 @@ msgstr ""
 "\n"
 "* Märkus: Selle plugina jaoks on vajalik Windows 2000 või mõni uuem Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime versioon"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Käivitamine"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Programmi %s käivitamine Windowsi käivitamisel"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Dokitav sõbranimekiri"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "Sõbranimekirja _hoitakse pealmisena:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Ainult dokitud olekus"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Akna vilgutamine vestlussõnumite vastuvõtmisel"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windowsi Pidgini valikud"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows'i Pidgin'ile omased valikud."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Windows'i Pidgin'ile omasete valikute tagamine (näiteks sõbranimekirja "
 "dokkimie)."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Välja logitud.</font>"
 
@@ -18048,43 +13365,87 @@ msgstr "<font color='#777777'>Välja logitud.</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP konsool"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Konto: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>Pole XMPP-ga ühendatud</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Kood [0x%02X]: %s"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "Viga soklivalikute seadmisel"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Windows Live ID autentimine: Serveri vastusest pole võimalik "
+#~ "autentimistõendit leida"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Tõrge Windows Live ID autentimisel"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Viga sisselogimistõendi küsimisel"
+
+#~ msgid "TCP Address"
+#~ msgstr "TCP-aadress"
+
+#~ msgid "UDP Address"
+#~ msgstr "UDP-aadress"
+
+#~ msgid "Away Message"
+#~ msgstr "Eemaloleku sõnum"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr "<i>(vastuvõtmine)</i>"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-post"
+
+#~ msgid "E-mail"
+#~ msgstr "E-post"
+
+#~ msgid "Someone says your screen name in chat"
+#~ msgstr "Keegi ütleb vestluses sinu nime"
+
+#~ msgid ""
+#~ "This server requires plaintext authentication over an unencrypted "
+#~ "connection.  Allow this and continue authentication?"
+#~ msgstr ""
+#~ "See server nõuab avatekstilist autentimist üle krüptimata ühenduse.  Kas "
+#~ "seda peaks lubama ja autentimist jätkama?"
+
+#~ msgid "Use GSSAPI (Kerberos v5) for authentication"
+#~ msgstr "GSSAPI (Kerberos v5) kasutamine autentimiseks"
+
+#~ msgid "A_ccount:"
+#~ msgstr "_Konto:"
+
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Märguanne ainult juhul, kui ma pole saadaval"
 
@@ -18114,9 +13475,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Plugina mälust väljalaadimisel tekkisid vead."
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "OIM-serveriga pole võimalik ühenduda"
-
 #~ msgid "Sort by status"
 #~ msgstr "Sortimine oleku järgi"
 
@@ -18129,9 +13487,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "Add Buddy _Pounce"
 #~ msgstr "Lisa sõbra_märguanne"
 
-#~ msgid "Add a _Buddy"
-#~ msgstr "Lisa _sõber"
-
 #~ msgid "Add a C_hat"
 #~ msgstr "Lisa _jututuba"
 
@@ -18141,9 +13496,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "_Send To"
 #~ msgstr "Kellele _saata"
 
-#~ msgid "_Smiley"
-#~ msgstr "_Tujunägu"
-
 #~ msgid "Conversation History"
 #~ msgstr "Vestluste ajalugu"
 
@@ -18208,15 +13560,6 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "Insert image"
 #~ msgstr "Pildi lisamine"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Sulle on e-kiri!</span>\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "The specified buddy was not found in the Evolution Contacts."
 #~ msgstr "Määratud sõpra ei leitud evolutioni kontaktide hulgas."
 
@@ -18236,57 +13579,12 @@ msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 #~ msgid "Group not removed"
 #~ msgstr "Gruppi ei eemaldatud"
 
-#~ msgid "Jabber Account"
-#~ msgstr "Jabberi konto"
-
 #~ msgid "<b>%s:</b> %s<br>"
 #~ msgstr "<b>%s:</b> %s<br>"
 
 #~ msgid "<b>Idle for:</b> %s<br>"
 #~ msgstr "<b>Tegevuseta:</b> %s<br>"
 
-#~ msgid "Client:"
-#~ msgstr "Klient:"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "Vigane Jabber'i ID"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Jabber'i parooli muutmine"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Jabber protokolli plugin"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "Kasutaja %s soovib lisada %s oma sõbraloendisse."
-
-#~ msgid "_Authorize"
-#~ msgstr "_Autoriseeri"
-
-#~ msgid "_Deny"
-#~ msgstr "_Keela"
-
-#~ msgid "Invalid Username"
-#~ msgstr "Vigane kasutajanimi"
-
-#~ msgid "<b>Alias:</b> %s<br>"
-#~ msgstr "<b>Alias:</b> %s<br>"
-
-#~ msgid "<b>%s:</b> "
-#~ msgstr "<b>%s:</b> "
-
-#~ msgid "<br><b>Personal</b><br>%s"
-#~ msgstr "<br><b>Isiklik</b><br>%s"
-
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>Äri</b><br>%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 "Kasutaja %s (%s) soovib lisada %s oma sõbraloendisse."
-
 #~ msgid "Invalid password"
 #~ msgstr "Vigane parool"
 
diff --git a/po/fi.po b/po/fi.po
index 8327e76651..3065c51131 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 16:01+0300\n"
-"PO-Revision-Date: 2008-08-06 16:01+0300\n"
+"POT-Creation-Date: 2008-08-11 12:39+0300\n"
+"PO-Revision-Date: 2008-08-11 12:39+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -7290,13 +7290,6 @@ msgstr ""
 "Huomaa, että olet samalla Qunin luoja, \n"
 "Tämä toiminto poistaa lopulta tämän Qunin."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Koodi [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "Ryhmätoimintovirhe"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Haluatko hyväksyä pyynnön?"
@@ -7496,6 +7489,28 @@ msgid "Unable to login"
 msgstr "Ei voi kirjautua"
 
 #, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+"Vastaus %s(0x%02X )\n"
+"Lähetetty %s(0x%02X )\n"
+"Huoneen tunniste %d, vastaus [0x%02X]: \n"
+"%s"
+
+msgid "Failed room reply"
+msgstr "Epäonnistunut huoneen vastaus"
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Sinä et ole ryhmän \"%s\" jäsen\n"
+
+msgid "Can not decrypt login reply"
+msgstr "Kirjautumisvastauksen salausta ei voi purkaa"
+
+#, c-format
 msgid "Invalid token reply code, 0x%02X"
 msgstr "Epäkelpo poletin vastauskoodi, 0x%02X"
 
@@ -9870,6 +9885,12 @@ msgstr "+++ %s on jouten"
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -13672,6 +13693,12 @@ msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Koodi [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Ryhmätoimintovirhe"
+
 #~ msgid "Error setting socket options"
 #~ msgstr "Virhe asetettaessa pistokevalintoja"
 
@@ -13709,9 +13736,6 @@ msgstr ""
 #~ msgid "UDP Address"
 #~ msgstr "UDP-osoite"
 
-#~ msgid "Login failed, no reply"
-#~ msgstr "Kirjautuminen epäonnistui, ei vastausta"
-
 #~ msgid "Screen name:"
 #~ msgstr "Näyttönimi:"
 
diff --git a/po/he.po b/po/he.po
index 502f9aa7eb..5b0d00a767 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 08:57-0400\n"
-"PO-Revision-Date: 2008-05-09 00:15+0200\n"
+"POT-Creation-Date: 2008-08-15 11:38-0400\n"
+"PO-Revision-Date: 2008-08-10 01:11+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -94,6 +94,10 @@ msgstr "סיסמא:"
 msgid "Alias:"
 msgstr "תיאור:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "צור חשבון זה על השרת"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -320,6 +324,7 @@ msgstr "החלף סימון"
 msgid "Nickname"
 msgstr "כינוי"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "חוסר פעילות"
@@ -397,6 +402,9 @@ msgstr "הצטרף לצ'אט..."
 msgid "View Log..."
 msgstr "הצג יומן-רישום..."
 
+msgid "View All Logs"
+msgstr "הצג רישומים"
+
 msgid "Show"
 msgstr "הצג"
 
@@ -589,6 +597,19 @@ msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מ
 msgid "Send To"
 msgstr "שלח אל"
 
+msgid "Invite message"
+msgstr "הודעת הזמנה"
+
+msgid "Invite"
+msgstr "הזמן"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"יש להזין את שם המשתמש שברצונך להזמין,\n"
+"יחד עם הודעת הזמנה אופציונלית."
+
 msgid "Conversation"
 msgstr "שיחה"
 
@@ -601,6 +622,9 @@ msgstr "הצג חתימות-זמן"
 msgid "Add Buddy Pounce..."
 msgstr "הוסף תגובה לפעולת איש קשר..."
 
+msgid "Invite..."
+msgstr "הזמן..."
+
 msgid "Enable Logging"
 msgstr "אפשר רישום"
 
@@ -610,9 +634,11 @@ msgstr "אפשר צלילים"
 msgid "<AUTO-REPLY> "
 msgstr "<מענה-אוטומטי> "
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "רשימת משתמשים:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "רשימה של %d משתמש:\n"
+msgstr[1] "רשימה של %d משתמשים:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "אפשרויות ניפוי הבאגים הנתמכות הן:  version"
@@ -627,6 +653,18 @@ msgstr ""
 "התשמש ב-\"help &lt;פקודה&gt;\" לקבלת עזרה על פקודה ספציפית.\n"
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s אינו מחלקת מסרים תקפה. יש לראות את המידע בתוך '/help msgcolor' לרשימה של "
+"מחלקות-מסרים תקפות."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s אינו צבע תקף. יש לראות את '/help msgcolor' לצבעים תקפים."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -667,6 +705,19 @@ msgstr "prefs: הצג את חלון ההעדפות."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: הצג את חלון המצבים-השמורים."
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;מחלקה&gt; &lt;צבע-תוכן&gt; &lt;רקע&gt;: קבע צבע עבור מחלקות "
+"שונות של הודעות בחלון השיחה.<br>    &lt;מחלקה&gt;: receive, send, highlight, "
+"action, timestamp<br>    &lt;צבע-תוכן/רקע&gt;: black, red, green, blue, "
+"white, gray, darkgray, magenta, cyan, default<br><br>לדוגמא:<br>    msgcolor "
+"send cyan default"
+
 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
 
@@ -687,8 +738,10 @@ msgid "Pause"
 msgstr "השהייה"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "העברות קבצים - %d%% מתוך %d קבצים"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "העברות קבצים - %d%% מתוך %d קובץ"
+msgstr[1] "העברות קבצים - %d%% מתוך %d קבצים"
 
 #. Create the window.
 msgid "File Transfers"
@@ -797,6 +850,9 @@ msgstr "שיחות בתוך %s"
 msgid "Conversations with %s"
 msgstr "%s שיחות עם"
 
+msgid "All Conversations"
+msgstr "כל השיחות"
+
 msgid "System Log"
 msgstr "דו\"ח מערכת"
 
@@ -834,9 +890,6 @@ msgstr "המשך"
 msgid "IM"
 msgstr "הודעה"
 
-msgid "Invite"
-msgstr "הזמן"
-
 msgid "(none)"
 msgstr "(ללא)"
 
@@ -1040,6 +1093,7 @@ msgstr "%s התרחק/ה מהמחשב. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s שלך לך הודעה. (%s)"
 
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "אירעה פעילות לא מוכרת. אנא דווח על כך!"
 
@@ -1401,6 +1455,7 @@ msgid ""
 "conversation into the current conversation."
 msgstr "כאשר חלון שיחה חדש נפתח, תוסף זה יכניס את השיחה האחרונה לראש החלון."
 
+#, c-format
 msgid "Online"
 msgstr "מחובר"
 
@@ -1732,6 +1787,7 @@ msgstr ""
 "שגיאה בקריאה מתהליך ה-resolver:\n"
 "%s"
 
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "קבלת סיום-קובץ בעת קריאה מתהליך ה-resolver"
 
@@ -1821,6 +1877,7 @@ msgstr "מתחיל את ההעברה של %s מ-%s"
 msgid "Transfer of file %s complete"
 msgstr "העברה של קובץ %s הושלמה"
 
+#, c-format
 msgid "File transfer complete"
 msgstr "הושלמה העברת הקובץ"
 
@@ -1828,6 +1885,7 @@ msgstr "הושלמה העברת הקובץ"
 msgid "You canceled the transfer of %s"
 msgstr "ביטלת את העברת %s"
 
+#, c-format
 msgid "File transfer cancelled"
 msgstr "העברת הקובץ בוטלה"
 
@@ -2016,6 +2074,7 @@ msgstr "(%s) %s <מענה-אוטומטי>: %s\n"
 msgid "You are using %s, but this plugin requires %s."
 msgstr "את/ה משתמש/ת ב- %s, אבל תוסף זה דורש %s."
 
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "תוסף זה לא הגדיר מזהה."
 
@@ -2027,8 +2086,9 @@ msgstr "אי-התאמה במספר הקסם של התוסף %d (צריך להי�
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "אי-התאמה בגירסת ABI %d.%d.x (צריך %d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "התוסף לא מיישם את כל הפונקציות הדרושות"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr "התוסף לא מיישם את כל הפונקציות הדרושות (list_icon, login וכן close)"
 
 #, c-format
 msgid ""
@@ -2106,6 +2166,9 @@ msgstr ""
 "הצג התרעה לאחר שהעברת קובץ שאושר אוטומטית הסתיימה\n"
 "(רק כאשר אין שיחה עם השולח)"
 
+msgid "Create a new directory for each user"
+msgstr "צור ספרייה חדשה עבור כל משתמש"
+
 msgid "Notes"
 msgstr "הערות"
 
@@ -2677,13 +2740,11 @@ msgstr ""
 "ActiveTCL מתוך http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
-"חבילת בונג'ור של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging למידע נוסף."
+"חבילת בונג'ור של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d."
+"pidgin.im/BonjourWindows למידע נוסף."
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "לא ניתן להקשיב לתקשורת-הודעות נכנסת.\n"
@@ -2737,9 +2798,6 @@ msgstr "לא ניתן לשלוח את ההודעה, לא היה אפשר להת�
 msgid "Cannot open socket"
 msgstr "אין אפשרות לפתוח שקע"
 
-msgid "Error setting socket options"
-msgstr "שגיאה בקביעת הגדרות השקע"
-
 msgid "Could not bind socket to port"
 msgstr "לא ניתן לקבע את השקע ליציאה"
 
@@ -2788,6 +2846,9 @@ msgstr "רשימת אנשי הקשר נטענה בהצלחה!"
 msgid "Save buddylist..."
 msgstr "שמור את רשימת אנשי הקשר..."
 
+msgid "Load buddylist from file..."
+msgstr "טען את רשימת אנשי הקשר מקובץ..."
+
 msgid "Fill in the registration fields."
 msgstr "יש למלא את שדות ההרשמה."
 
@@ -2885,6 +2946,7 @@ msgstr "זמין"
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
+#, c-format
 msgid "Away"
 msgstr "רחוק מהמחשב"
 
@@ -2963,9 +3025,6 @@ msgstr "מחק את רשימת אנשי קשר מהשרת"
 msgid "Save buddylist to file..."
 msgstr "שמור את רשימת אנשי הקשר לקובץ..."
 
-msgid "Load buddylist from file..."
-msgstr "טען את רשימת אנשי הקשר מקובץ..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -3081,6 +3140,9 @@ msgstr "י_ציאה"
 msgid "Encodings"
 msgstr "קידוד"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "זהה אוטומטית מסרים נכנסים בקידוד UTF-8"
+
 msgid "Real name"
 msgstr "שם אמיתי"
 
@@ -3095,8 +3157,8 @@ msgid "Bad mode"
 msgstr "מצב לא תקין"
 
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "חרם על %s על-ידי %s, נקבע לפני %ld שניות"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "חרם על %s על-ידי %s, נקבע לפני %s"
 
 #, c-format
 msgid "Ban on %s"
@@ -3261,6 +3323,9 @@ msgid ""
 msgstr ""
 "away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <שם> <הודעה>: שלך הודעת ctcp לאותו כינוי."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: שלח פקודה אל chanserv"
 
@@ -3508,6 +3573,8 @@ msgstr "מיקוד"
 msgid "Country"
 msgstr "מדינה"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "טלפון"
 
@@ -3693,12 +3760,12 @@ msgstr "בדיקת קפיצות"
 msgid "Capabilities"
 msgstr "יכולות"
 
-msgid "Resource"
-msgstr "משאב"
-
 msgid "Priority"
 msgstr "עדיפות"
 
+msgid "Resource"
+msgstr "משאב"
+
 msgid "Middle Name"
 msgstr "שם אמצעי"
 
@@ -3745,6 +3812,7 @@ msgstr "פטפטן"
 msgid "Extended Away"
 msgstr "העדרות ממושכת"
 
+#, c-format
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
 
@@ -4383,7 +4451,7 @@ msgid "XMPP Message Error"
 msgstr "הודעת שגיאת XMPP"
 
 #, c-format
-msgid " (Code %s)"
+msgid "(Code %s)"
 msgstr "(קוד %s)"
 
 msgid "XML Parse error"
@@ -4408,14 +4476,14 @@ msgid "_Accept Defaults"
 msgstr "קבל את ברירות המחדל"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "שגיאה בשיחה %s"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "שגיאה בהצטרפות לצ'אט %s"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "שגיאה בשיחה %s"
+
+#, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "לא ניתן לשלוח את הקובץ אל %s, המשתמש לא תומך בהעברות קבצים"
 
@@ -4495,162 +4563,215 @@ msgid ""
 "to be added?"
 msgstr "%s הרשימה המקומית אך לא ברשימה שעל השרת. האם ברצונך להוסיף איש קשר זה?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "לא ניתן לפענח הודעה"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "שגיאת תחביר (כנראה באג בתוכנה)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "כתובת דוא\"ל לא תקפה"
 
+#, c-format
 msgid "User does not exist"
 msgstr "המשתמש לא קיים"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "חסר שם מלא לדומיין"
 
+#, c-format
 msgid "Already logged in"
 msgstr "כבר מחובר"
 
+#, c-format
 msgid "Invalid username"
 msgstr "שם משתמש לא חוקי"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "שם ידידותי שגוי"
 
+#, c-format
 msgid "List full"
 msgstr "הרשימה מלאה"
 
+#, c-format
 msgid "Already there"
 msgstr "כבר שם"
 
+#, c-format
 msgid "Not on list"
 msgstr "לא נמצא ברשימה"
 
+#, c-format
 msgid "User is offline"
 msgstr "המשתמש לא מחובר"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "כבר במצב זה"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "כבר ברשימה ההפוכה"
 
+#, c-format
 msgid "Too many groups"
 msgstr "יותר מידי קבוצות"
 
+#, c-format
 msgid "Invalid group"
 msgstr "קבוצה לא תקינה"
 
+#, c-format
 msgid "User not in group"
 msgstr "המשתמש לא שייך לקבוצה"
 
+#, c-format
 msgid "Group name too long"
 msgstr "שם הקבוצה הרוך מדי"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "לא ניתן להסיר את קבוצה אפס"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "ניסיון להוסיף איש קשר לקבוצה שאינה קיימת"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "תקלה במרכזייה"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "כשל בהתרעת העברה"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "שדות נחוצים חסרים"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "יותר מדי תוצאות עבור FND"
 
+#, c-format
 msgid "Not logged in"
 msgstr "לא מחובר"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "השירות אינו זמין כרגע"
 
+#, c-format
 msgid "Database server error"
 msgstr "שגיאת שרת נתונים"
 
+#, c-format
 msgid "Command disabled"
 msgstr "הפקודה בוטלה"
 
+#, c-format
 msgid "File operation error"
 msgstr "שגיאת גישה לקבצים"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "שגיאה גישה לזכרון"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "ערך CHL שגוי נמסר לשרת"
 
+#, c-format
 msgid "Server busy"
 msgstr "שרת עסוק"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "שרת לא זמין"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "שרת התרעות-אחרים לא פועל"
 
+#, c-format
 msgid "Database connect error"
 msgstr "שגיאה בחיבור למסד הנתונים"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "השרת נכבה (כולם החוצה)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "שגיאה ביצירת החיבור"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "פרמטרים ל-CVR הם לא מוכרים או אסורים"
 
+#, c-format
 msgid "Unable to write"
 msgstr "לא ניתן לכתוב"
 
+#, c-format
 msgid "Session overload"
 msgstr "טעינת על תהליך פעולה"
 
+#, c-format
 msgid "User is too active"
 msgstr "המשתמש פעיל מדי"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "יש יותר מדיי חיבורים."
 
+#, c-format
 msgid "Passport not verified"
 msgstr "זיהוי לא נבדק"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "קובץ החבר שגוי"
 
+#, c-format
 msgid "Not expected"
 msgstr "לא היה צפוי"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "השם הידידותי משתנה מהר מדי"
 
+#, c-format
 msgid "Server too busy"
 msgstr "השרת עסוק מדי"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "האימות נכשל"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "לא ניתן לבצע את הפעולה במצב לא מקוון"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "לא מקבל משתמשים חדשים"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "פספורט ילדים ללא הסכמת הורים"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "חשבון הפספורט לא אומת עדיין"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "כרטיס לא תקין"
 
@@ -4673,6 +4794,9 @@ msgstr "%s סימנ/ה לך להזיז ת'עניינים!"
 msgid "Nudging %s..."
 msgstr "נו כבר, %s..."
 
+msgid "Email Address..."
+msgstr "כתובת דוא\"ל..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "השם הידידותי החדש שלך ל-MSN ארוך מדי."
 
@@ -4707,8 +4831,20 @@ msgstr "אפשר"
 msgid "Disallow"
 msgstr "אל תאפשר"
 
-msgid "This Hotmail account may not be active."
-msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "טקסט חסום עבור %s"
+
+msgid "No text is blocked for this account."
+msgstr "אין טקסט חסום עבור חשבון זה."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "שרתי MSN כרגע חוסמים את הביטוי הרגוליים הבאים:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "לחשבון זה אין דוא\"ל פעיל."
 
 msgid "Send a mobile message."
 msgstr "שלח בתור הודעה לנייד."
@@ -4767,6 +4903,9 @@ msgstr "אפשר/בטל מכשירים ניידים..."
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "אפשר/בטל הודעות למכשירים ניידים..."
 
+msgid "View Blocked Text..."
+msgstr "הצג טקסט חסום..."
+
 msgid "Open Hotmail Inbox"
 msgstr "פתח את תיבת הדואר של Hotmail"
 
@@ -4965,14 +5104,8 @@ msgstr "nudge: שלח דחיפה לאיש קשר כדי להשיג את תשומ
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "אישור מזהה Windows Live: לא ניתן להתחבר"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr "אימות מזהה Windows Live: לא ניתן למצוא סמל אימות בתגובת השרת"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "אימות מזהה Windows Live נכשלה"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "אישוש מול Windows Live ID:הודעה לא תקפה"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5019,6 +5152,9 @@ msgstr "%s אינו חשבון פספורט תקף."
 msgid "Service Temporarily Unavailable."
 msgstr "השירות אינו זמין כרגע."
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "הודעת לנייד לא נשלחה מכיוון שהיא ארוכה מדי."
+
 msgid "Unable to rename group"
 msgstr "אין אפשרות לשנות את שם הקבוצה"
 
@@ -5051,6 +5187,22 @@ msgstr[1] ""
 "\n"
 "לאחר שהתחזוקה הושלמה, תוכל/י להתחבר מחדש."
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"ההודעה לא נשלחה משום שהמערכת לא זמינה. בדרך-כלל זה קורה כשהמשתמש חסום או לא "
+"קיים."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "ההודעה לא נשלחה מכיוון שההודעות נשלחות מהר מדי."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "ההודעה לא נשלחה מכיוון שקרתה הודעת-קידוד לא מוכרת."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "ההודעה לא נשלחה מכיוון שקרתה שגיאה לא מוכרת."
+
 msgid "Unable to connect"
 msgstr "לא ניתן להתחבר"
 
@@ -5165,6 +5317,9 @@ msgstr "אין אפשרות להוסיף \"%s\"."
 msgid "The username specified is invalid."
 msgstr "שם המשתמש שהוזן אינו חוקי."
 
+msgid "This Hotmail account may not be active."
+msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
+
 msgid "Has you"
 msgstr "יש אותך"
 
@@ -5203,8 +5358,10 @@ msgid "Logging in"
 msgstr "מתחבר"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "אבד החיבור אל השרת (לא נשלח מידע תוך %d שניות)"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניה)"
+msgstr[1] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניות)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5301,9 +5458,15 @@ msgstr "חברי בהודעות מידיות"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr "%d אנשי-קשר הוספו או עודכנו מהשרת (כולל אנשי-קשר כבר ברשימה על השרת)"
+msgstr[0] ""
+"%d איש-קשר נוסף או עודכן מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
+msgstr[1] ""
+"%d אנשי-קשר נוספו או עודכנו מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
 
 msgid "Add contacts from server"
 msgstr "הוסף אנשי-קשר מהשרת"
@@ -5766,6 +5929,7 @@ msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת ה�
 msgid "Error. SSL support is not installed."
 msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
 
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ועידה זו נסגרה. לא ניתן לשלוח עוד הודעות."
 
@@ -5916,11 +6080,11 @@ msgstr "אין די הרשאות"
 msgid "In local permit/deny"
 msgstr "באישור/שלילה מקומיים"
 
-msgid "Too evil (sender)"
-msgstr "השולח מרושע מדי"
+msgid "Warning level too high (sender)"
+msgstr "רמת אזהרה גבוהה מדי (שולח("
 
-msgid "Too evil (receiver)"
-msgstr "המקבל מרושע מדי"
+msgid "Warning level too high (receiver)"
+msgstr "רמת אזהרה גבוהה מדי (מקבל)"
 
 msgid "User temporarily unavailable"
 msgstr "המשתמש אינו זמין כרגע"
@@ -6022,18 +6186,26 @@ msgstr "שידור חי"
 msgid "Camera"
 msgstr "מצלמה"
 
+msgid "Screen Sharing"
+msgstr "שיתוף מסך"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
+#, c-format
 msgid "Not Available"
 msgstr "לא זמין"
 
+#, c-format
 msgid "Occupied"
 msgstr "עסוק"
 
+#, c-format
 msgid "Web Aware"
 msgstr "מודע רשת"
 
+#, c-format
 msgid "Invisible"
 msgstr "בלתי נראה"
 
@@ -6106,7 +6278,6 @@ msgstr ""
 "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
 "תיאלץ להמתין אפילו יותר."
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s"
@@ -6150,6 +6321,7 @@ msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעיד�
 msgid "Unable to get a valid login hash."
 msgstr "לא מצליח להשיג קוד התחברות תקף."
 
+#. allow multple logins?
 msgid "Password sent"
 msgstr "הסיסמא נשלחה"
 
@@ -6258,16 +6430,19 @@ msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שמהירות הש�
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שמהירות השליחה מופרזת."
 
 #, 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 מכיוון שהוא רע מדי."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."
+msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."
 
 #, 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 מכיוון שאת/ה רע מדי."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."
+msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6297,9 +6472,6 @@ msgstr "מחובר מאז"
 msgid "Member Since"
 msgstr "חבר מאז"
 
-msgid "Available Message"
-msgstr "הודעת זמינות"
-
 msgid "Your AIM connection may be lost."
 msgstr "החיבור AIM שלך אולי יתנתק."
 
@@ -6326,12 +6498,17 @@ msgstr "פלאפון"
 msgid "Personal Web Page"
 msgstr "דף אינטרנט אישי"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "מידע נוסף"
 
 msgid "Zip Code"
 msgstr "מיקוד"
 
+msgid "Work Information"
+msgstr "פרטי עבודה"
+
 msgid "Division"
 msgstr "מחלקה"
 
@@ -6341,9 +6518,6 @@ msgstr "משרה"
 msgid "Web Page"
 msgstr "דף אינטרנט"
 
-msgid "Work Information"
-msgstr "פרטי עבודה"
-
 msgid "Pop-Up Message"
 msgstr "הודעה קופצת"
 
@@ -6536,12 +6710,6 @@ msgstr "החלפה:"
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "הודעת התמונה לא נשלחה. לא ניתן לשלוח תמונות לצ'אטים ב-AIM."
 
-msgid "Away Message"
-msgstr "הודעת ריחוק מהמחשב"
-
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(שולף)</i>"
-
 msgid "iTunes Music Store Link"
 msgstr "לינק לחנות המוזיקה iTunes"
 
@@ -6666,6 +6834,9 @@ msgstr ""
 "ישירות (איטי יותר, אבל לא חושף את\n"
 "כתובת המחשב שלך)"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "אפשר חיבורים מרובים מקביל"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "מבקש מ-%s להתחבר אלינו אל %s:%hu לתקשורת ישירה להודעות."
@@ -6674,6 +6845,7 @@ msgstr "מבקש מ-%s להתחבר אלינו אל %s:%hu לתקשורת ישי
 msgid "Attempting to connect to %s:%hu."
 msgstr "מנסה להתחבר אל %s:%hu."
 
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "מנסה להתחבר דרך שרת תיווך..."
 
@@ -6967,13 +7139,6 @@ msgstr ""
 "יש לשים לב, כי אם את/ה היוצר/ת, \n"
 "פעולה זו תביא בסופו של דבר להסרת ה-Qun."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "קוד [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "שגיאה בפעולת-קבוצה"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "האם ברצונך לאשר את הבקשה?"
@@ -7002,34 +7167,39 @@ msgstr "הודעת מערכת"
 msgid "Failed to send IM."
 msgstr "כישלון בשליחת הודעה."
 
-msgid "Keep alive error"
-msgstr "שגיאה בהשאר-חי"
+#, c-format
+msgid "Unknown-%d"
+msgstr "לא ידוע-%d"
 
-msgid "Error requesting login token"
-msgstr "שגיאה בבקשת אסימון כניסה"
+msgid "Level"
+msgstr "רמה"
 
-msgid "Unable to login. Check debug log."
-msgstr "לא ניתן להיכנס. יש לבדוק ביומן רישום הבאגים"
+msgid "Member"
+msgstr "חבר"
 
-msgid "Unable to login"
-msgstr "לא ניתן להתחבר"
+msgid " VIP"
+msgstr " אח\"מ"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "לא ניתן להתחבר"
+msgid " TCP"
+msgstr " TCP"
 
-#, c-format
-msgid "Unknown-%d"
-msgstr "לא ידוע-%d"
+msgid " FromMobile"
+msgstr " מתוךנייד"
 
-msgid "TCP Address"
-msgstr "כתובת TCP"
+msgid " BindMobile"
+msgstr " קשרנייד"
 
-msgid "UDP Address"
-msgstr "כתובת UDP"
+msgid " Video"
+msgstr " וידאו"
 
-msgid "Level"
-msgstr "רמה"
+msgid " Space"
+msgstr " ספייס"
+
+msgid "Flag"
+msgstr "דגל"
+
+msgid "Ver"
+msgstr "גרסא"
 
 msgid "Invalid name"
 msgstr "שם משתמש שגוי"
@@ -7043,12 +7213,16 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>עידכון אחרון</b>: %s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>שרת</b>: %s: %d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>סוג החיבור</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>כתובת השרת</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>שם מחשב אמיתי</b>: %s: %d<br>\n"
 
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
@@ -7100,12 +7274,91 @@ msgstr "פרוטוקול QQ\tתוסף"
 msgid "Connect using TCP"
 msgstr "מתחבר בעזרת TCP"
 
+msgid "resend interval(s)"
+msgstr "פרק זמן בין שליחות חוזרות"
+
+msgid "Keep alive interval(s)"
+msgstr "פרקי-זמן להודעות הישאר-בחיים"
+
+msgid "Update interval(s)"
+msgstr "פרק זמן בין עידכונים"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "אורך סמל לא תקף, %d"
+
+msgid "Keep alive error"
+msgstr "שגיאה בהשאר-חי"
+
+msgid "Failed to connect server"
+msgstr "כישלון בהתחברות לשרת"
+
 msgid "Socket error"
 msgstr "שגיאת שקע"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"אבדה התקשורת עם שרת:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "אין אפשרות לקרוא מן השקע"
 
+msgid "Write Error"
+msgstr "שגיאה בכתיבה"
+
+msgid "Connection lost"
+msgstr "החיבור אבד"
+
+msgid "Couldn't resolve host"
+msgstr "לא ניתן למצוא כתובת שרת"
+
+msgid "hostname is NULL or port is 0"
+msgstr "שם המחשב ריק, או מספר השקע 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "מתחבר עם שרת %s, ניסיונות %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "לא ניתן להתחבר"
+
+msgid "Could not resolve hostname"
+msgstr "לא ניתן למצוא כתובת שרת"
+
+msgid "Unable to login. Check debug log."
+msgstr "לא ניתן להיכנס. יש לבדוק ביומן רישום הבאגים"
+
+msgid "Unable to login"
+msgstr "לא ניתן להתחבר"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "לא ניתן להתחבר, אין תשובה"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "את/ה [%d] נוספת אל הקבוצה \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "קוד-תגובה שגוי, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d סרב לקבל את הקובץ %s"
@@ -7117,12 +7370,6 @@ msgstr "שליחת קובץ"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ביטל את העברת %s"
 
-msgid "Connection lost"
-msgstr "החיבור אבד"
-
-msgid "Login failed, no reply"
-msgstr "לא ניתן להתחבר, אין תשובה"
-
 msgid "Do you want to add this buddy?"
 msgstr "האם ברצונך להוסיף את המשתמש הזה?"
 
@@ -7159,6 +7406,14 @@ msgstr "הודעה: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s אינו ברשימת אנשי-הקשר שלך"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "הודעה מאת: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "החיבור נסגר (כתיבה)"
 
@@ -7742,6 +7997,7 @@ msgstr "<br><b>HMAC של הערוץ:</b> %s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>נושא הערוץ:</b> %s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>מצב הערוץ:</b> "
 
@@ -7766,6 +8022,7 @@ msgstr "סיסמת הערוץ"
 msgid "Channel Public Keys List"
 msgstr "רשימת המפתחות הציבוריים של הערוץ"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8151,9 +8408,14 @@ msgstr "לא ניתן לאתחל את פרוטוקול SILC"
 msgid "Error loading SILC key pair"
 msgstr "שגיאה בטעינת זוג מפתחות SILC"
 
+#, c-format
+msgid "Download %s: %s"
+msgstr "הורדת %s: %s"
+
 msgid "Your Current Mood"
 msgstr "מצב הרוח הנוכחי שלך"
 
+#, c-format
 msgid "Normal"
 msgstr "רגיל"
 
@@ -8521,33 +8783,43 @@ msgstr "לוח-לבן"
 msgid "No server statistics available"
 msgstr "אין סטטיסטיקות זמינות לשרת"
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "שגיאה: אי-תאימות גירסאות, יש לשדרג את תוכנה הלקוח שלך"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "שגיאה: הצד המרוחק לא בוטח/תומך במפתח הציבורי שלך"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "שגיאה: בצד המרוחק לא תומך בקבוצת ה-KE שהוצעה"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "שגיאה: הצד המרוחק לא תומך בהצפנה שהוצעה"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "שגיאה: הצד המרוחק לא תומך ב-PKCS שהוצע"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "שגיאה: הצד המרוחק לא תומך בפונקציית ההאש שהוצעה"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "שגיאה: הצד המרוחק לא תומך ב-HMAC שהוצע"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "שגיאה: חתימה שגוייה"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "שגיאה: cookie שגוי"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "שגיאה: האימות נכשל"
 
@@ -8573,12 +8845,6 @@ msgstr "תגובת שרת לא ידועה."
 msgid "Could not create listen socket"
 msgstr "אין אפשרות ליצור שקע-קשב"
 
-msgid "Couldn't resolve host"
-msgstr "לא ניתן למצוא כתובת שרת"
-
-msgid "Could not resolve hostname"
-msgstr "לא ניתן למצוא כתובת שרת"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "אסור לשמות משתמשים של SIP להכיל רווחים או סמלי @"
 
@@ -8647,6 +8913,7 @@ msgstr "%s אינו מחובר כרגע."
 msgid "Warning of %s not allowed."
 msgstr "אזהרה של %s  אינה מותרת."
 
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "אבדה הודעה; אתה עובר על הגבלת המהירות של השרת."
 
@@ -8666,30 +8933,39 @@ msgstr "פספסת הודעה מ-%s כיוון שהיא הייתה ארוכה מ
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "פספסת הודעה מ-%s כיוון שהיא נשלחה מהר מדי."
 
+#, c-format
 msgid "Failure."
 msgstr "כישלון."
 
+#, c-format
 msgid "Too many matches."
 msgstr "יותר מידי תוצאות"
 
+#, c-format
 msgid "Need more qualifiers."
 msgstr "החיפוש זקוק ליותר מגדירים."
 
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "שירות המדריך אינו זמין זמנית."
 
+#, c-format
 msgid "Email lookup restricted."
 msgstr "חיפוש הדוא\"ל מוגבל."
 
+#, c-format
 msgid "Keyword ignored."
 msgstr "יתעלם ממילת המפתח."
 
+#, c-format
 msgid "No keywords."
 msgstr "אין מילות מפתח."
 
+#, c-format
 msgid "User has no directory information."
 msgstr "אין מידע עבור משתמש זה"
 
+#, c-format
 msgid "Country not supported."
 msgstr "המדינה אינה נתמכת."
 
@@ -8697,15 +8973,19 @@ msgstr "המדינה אינה נתמכת."
 msgid "Failure unknown: %s."
 msgstr "כשל מוכר: %s"
 
+#, c-format
 msgid "Incorrect username or password."
 msgstr "שם משתמש או סיסמא שגויים."
 
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "השירות אינו זמין זמנית."
 
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "רמת האזהרה שלך גבוהה מדיי כרגע מכדי להיכנס למערכת."
 
+#, c-format
 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."
@@ -9007,9 +9287,6 @@ msgstr "לא ניתן לברר את מספר החיבור לקובץ."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s מציע/ה לשלוח אליך אוסף של %d קבצים.\n"
 
-msgid "Write Error"
-msgstr "שגיאה בכתיבה"
-
 msgid "Yahoo! Japan Profile"
 msgstr "פרופיל Yahoo! יפן"
 
@@ -9290,6 +9567,14 @@ msgstr "שגיאה במציאת הכתובת של %s"
 msgid "Could not resolve host name"
 msgstr "לא ניתן למצוא כתובת שרת"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "מבקש/ת את תשומת-הלב של %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s ביקש את תשומת לבך!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9319,14 +9604,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s ידוע כעת בשם %s.\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "מבקש/ת את תשומת-הלב של %s..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s ביקש את תשומת לבך!"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9341,6 +9618,20 @@ msgstr "%s הזמין את %s לחדר הצ'אט %s\n"
 msgid "Accept chat invitation?"
 msgstr "לקבל הזמנה לצ'אט?"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "קיצור-דרך"
+
+msgid "The text-shortcut for the smiley"
+msgstr "קיצור-דרך טקסטואלי עבור החייכן"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "תמונה שמורה"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "תמונה מאוכסנת. (זה יהיה חייב להספיק כרגע)"
+
 msgid "SSL Connection Failed"
 msgstr "התחברות SSL נכשלה"
 
@@ -9396,6 +9687,12 @@ msgstr "+++ %s חסר פעילות"
 msgid "+++ %s became unidle"
 msgstr "+++ %s החל בפעילות"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9490,21 +9787,30 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "החיבור נותק ע\"י תוכנות אחרות במחשבך."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "השרת המרוחק סגר את החיבור."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "אזל הזמן המוקצב לחיבור."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "החיבור סורב."
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "כתובת כבר בשימוש."
+
 msgid "Internet Messenger"
 msgstr "למסרים באינטרנט"
 
@@ -9612,8 +9918,8 @@ msgstr "הוספת חשבון"
 msgid "_Basic"
 msgstr "_בסיסי"
 
-msgid "Create this new account on the server"
-msgstr "יצירת חשבון חדש זה על השרת"
+msgid "Create _this new account on the server"
+msgstr "צור חשבון חדש זה על השרת"
 
 msgid "_Advanced"
 msgstr "_מתקדם"
@@ -9711,6 +10017,12 @@ msgstr "_שם נוסף..."
 msgid "_Remove"
 msgstr "_הסר"
 
+msgid "Set Custom Icon"
+msgstr "קבע צלמית משלי"
+
+msgid "Remove Custom Icon"
+msgstr "הסר תמונה שנקבעה"
+
 msgid "Add _Buddy..."
 msgstr "הוסף איש קשר..."
 
@@ -9808,8 +10120,8 @@ msgstr "/אנשי קשר/_יציאה"
 msgid "/_Accounts"
 msgstr "/_חשבונות"
 
-msgid "/Accounts/Manage"
-msgstr "/חשבונות/נהל"
+msgid "/Accounts/Manage Accounts"
+msgstr "/חשבונות/נהל חשבונות"
 
 #. Tools
 msgid "/_Tools"
@@ -9830,6 +10142,9 @@ msgstr "/כלים/_העדפות"
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
+msgid "/Tools/Smile_y"
+msgstr "/כלים/_חייכן"
+
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/העברת _קבצים..."
 
@@ -9992,13 +10307,13 @@ 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>ברוכים הבאים ל-%s!</span>\n"
 "\n"
 "אין ברשותך חשבונות מופעלים. ניתן להפעיל את החשבונות שלך מתוך חלון "
-"<b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה "
+"<b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה לך "
 "אפשרות להתחבר, לקבוע את המצב שלך, ולדבר עם חבריך."
 
 #. set the Show Offline Buddies option. must be done
@@ -10057,6 +10372,12 @@ msgstr "ה_סתר צ'אט כאשר החלון נסגר."
 msgid "Please enter the name of the group to be added."
 msgstr "יש להזין את שם הקבוצה החדשה."
 
+msgid "Enable Account"
+msgstr "הפעל חשבון"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/חשבונות/הפעל חשבון"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/חשבונות/"
 
@@ -10069,12 +10390,6 @@ msgstr "לא ניתן לבצע פעולות"
 msgid "_Disable"
 msgstr "_בטל"
 
-msgid "Enable Account"
-msgstr "הפעל חשבון"
-
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/חשבונות/הפעל חשבון"
-
 msgid "/Tools"
 msgstr "/_כלים"
 
@@ -10156,9 +10471,6 @@ msgstr "קבע תמונה..."
 msgid "Change Size"
 msgstr "שנה גודל"
 
-msgid "Remove Custom Icon"
-msgstr "הסר תמונה שנקבעה"
-
 msgid "Show All"
 msgstr "הצג הכל"
 
@@ -10425,12 +10737,13 @@ msgstr "שגיאה "
 msgid "Fatal Error"
 msgstr "שגיאה קטלנית"
 
-msgid "lead developer"
-msgstr "מפתח ראשי"
-
 msgid "developer"
 msgstr "מפתח"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "קא-הינג צ'אונג"
+
 msgid "support"
 msgstr "תמיכה"
 
@@ -10462,6 +10775,9 @@ msgstr "מפתח XMPP"
 msgid "original author"
 msgstr "מתכנת מקורי"
 
+msgid "lead developer"
+msgstr "מפתח ראשי"
+
 msgid "Afrikaans"
 msgstr "אפריקאנס"
 
@@ -10597,6 +10913,9 @@ msgstr "הולנדית, פלמית"
 msgid "Norwegian Nynorsk"
 msgstr "נורבגית חדשה"
 
+msgid "Occitan"
+msgstr "אוקסיטנית"
+
 msgid "Punjabi"
 msgstr "פונג'אבי"
 
@@ -10694,6 +11013,7 @@ msgstr ""
 "את הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה "
 "זו.<BR><BR>"
 
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ב- irc.freenode.net<BR><BR>"
 
@@ -10827,23 +11147,35 @@ msgstr "הס_ר שיחה"
 msgid "Right-click for more unread messages...\n"
 msgstr "לחיצה ימנית לעוד הודעות שלא נקראו...\n"
 
-msgid "Change Status"
-msgstr "שנה מצב"
+msgid "_Change Status"
+msgstr "ש_נה מצב"
+
+msgid "Show Buddy _List"
+msgstr "הצג את _רשימת אנשי קשר"
 
-msgid "Show Buddy List"
-msgstr "הצג את רשימת אנשי קשר"
+msgid "_Unread Messages"
+msgstr "הודעות ש_לא נקראו"
 
-msgid "New Message..."
-msgstr "הודעה חדשה..."
+msgid "New _Message..."
+msgstr "הודעה _חדשה..."
 
-msgid "Mute Sounds"
-msgstr "השתק צלילים"
+msgid "_Accounts"
+msgstr "_חשבונות"
 
-msgid "Blink on New Message"
-msgstr "הבהב על כל הודעה חדשה"
+msgid "Plu_gins"
+msgstr "תו_ספים"
 
-msgid "Quit"
-msgstr "יציאה"
+msgid "Pr_eferences"
+msgstr "ה_עדפות"
+
+msgid "Mute _Sounds"
+msgstr "ה_שתק צלילים"
+
+msgid "_Blink on New Message"
+msgstr "ה_בהב על כל הודעה חדשה"
+
+msgid "_Quit"
+msgstr "י_ציאה"
 
 msgid "Not started"
 msgstr "לא הותחל"
@@ -10903,6 +11235,14 @@ msgstr "_נקה קבצים שהועברו"
 msgid "File transfer _details"
 msgstr "פרטי העברות קבצים"
 
+#. Pause button
+msgid "_Pause"
+msgstr "השהייה"
+
+#. Resume button
+msgid "_Resume"
+msgstr "ה_משך"
+
 msgid "Paste as Plain _Text"
 msgstr "הדבק בתור _טקסט רגיל"
 
@@ -10948,6 +11288,12 @@ msgstr "צבע עבור הודעות-פעולה"
 msgid "Color to draw the name of an action message."
 msgstr "הצבע עבור שם של הודעות-פעולה."
 
+msgid "Action Message Name Color for Whispered Message"
+msgstr "צבע עבור שמות הודעות-פעולה להודעות שנלחשות"
+
+msgid "Whisper Message Name Color"
+msgstr "צבע עבור שם הודעה שנלחשה"
+
 msgid "Typing notification color"
 msgstr "צבע התרעת-הקלדה"
 
@@ -11013,9 +11359,14 @@ msgstr ""
 msgid "Save Image"
 msgstr "שמור תמונה"
 
+#, c-format
 msgid "_Save Image..."
 msgstr "שמור _תמונה..."
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "הוסף סמייליים שלי..."
+
 msgid "Select Font"
 msgstr "בחירת גופן"
 
@@ -11052,9 +11403,20 @@ msgstr "כישלון בעת שמירת התמונה: %s\n"
 msgid "Insert Image"
 msgstr "הכנס תמונה"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"החייכן אינו פעיל בגלל שחייכן שלך כבר קיים לקיצור-הדרך הזה:\n"
+"%s"
+
 msgid "Smile!"
 msgstr "חייך!"
 
+msgid "_Manage custom smileys"
+msgstr "נהל סמייליים שלי"
+
 msgid "This theme has no available smileys."
 msgstr "לסט מוטיבים זה אין חייכנים."
 
@@ -11707,21 +12069,27 @@ msgstr "רשום את כל שינויי הסטטוס ליומן המערכת"
 msgid "Sound Selection"
 msgstr "בחירת הצליל"
 
+#, c-format
 msgid "Quietest"
 msgstr "הכי שקט"
 
+#, c-format
 msgid "Quieter"
 msgstr "יותר שקט"
 
+#, c-format
 msgid "Quiet"
 msgstr "שקט"
 
+#, c-format
 msgid "Loud"
 msgstr "רועש"
 
+#, c-format
 msgid "Louder"
 msgstr "יותר רועש"
 
+#, c-format
 msgid "Loudest"
 msgstr "הכי רועש"
 
@@ -11754,6 +12122,12 @@ msgstr "עוצמת-שמע:"
 msgid "Play"
 msgstr "נגן"
 
+msgid "_Browse..."
+msgstr "עיו_ן..."
+
+msgid "_Reset"
+msgstr "_אפס"
+
 msgid "_Report idle time:"
 msgstr "_דווח זמן חוסר פעילות:"
 
@@ -11923,6 +12297,45 @@ msgstr "שמור והשתמש"
 msgid "Status for %s"
 msgstr "מצב עבור %s"
 
+msgid "Custom Smiley"
+msgstr "חייכן שלך"
+
+msgid "Duplicate Shortcut"
+msgstr "כפילות בקיצורי-הדרך"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr "חייכן שלך כבר קיים לקיצור-הדרך שנבחר. יש לבחור קיצור-דרך אחר."
+
+msgid "More Data needed"
+msgstr "נחוץ מידע נוסף"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
+
+msgid "Please select an image for the smiley."
+msgstr "יש לבחור תמונה עבור החייכן."
+
+msgid "Edit Smiley"
+msgstr "_ערוך חייכן"
+
+msgid "Add Smiley"
+msgstr "הוס_ף חייכן"
+
+msgid "Smiley _Image"
+msgstr "_תמונת חייכן"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "קיצורים ל_חייכנים"
+
+msgid "Smiley"
+msgstr "חייכן"
+
+msgid "Custom Smiley Manager"
+msgstr "מנהל החייכנים שלך"
+
 msgid "Waiting for network connection"
 msgstr "ממתין לחיבור לרשת"
 
@@ -12055,9 +12468,6 @@ msgstr "_ערוך"
 msgid "_Open Mail"
 msgstr "_פתח דואר"
 
-msgid "_Pause"
-msgstr "השהייה"
-
 msgid "Pidgin Tooltip"
 msgstr "מידעון פידג'ין"
 
@@ -12073,10 +12483,6 @@ msgstr "בבחירת זה מבוטלים סמלי-הרגשות הגרפיים."
 msgid "none"
 msgstr "ללא"
 
-#, fuzzy
-msgid "Display Statistics"
-msgstr "סטטיסטיקות של השרת"
-
 msgid "Response Probability:"
 msgstr "התסברות תגובה:"
 
@@ -12632,6 +13038,7 @@ msgstr "חלון התרעות"
 msgid "Select Color"
 msgstr "בחירת צבע"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "בחירת גופן ממשק"
 
@@ -12854,6 +13261,7 @@ msgstr "הצג חותמות זמן מסוג iChat כל N דקות."
 msgid "Timestamp Format Options"
 msgstr "אפשרויות חותמת-זמן"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr " אלץ שימוש בחותמת-זמן על בסיס 24-שעות"
 
@@ -13022,15 +13430,54 @@ msgstr "שלח וקבל סטנזות XMPP גולמיות."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
 
-#~ msgid "_Resume"
-#~ msgstr "ה_משך"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "קוד [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "שגיאה בפעולת-קבוצה"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "שגיאה בקביעת הגדרות השקע"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr "אימות מזהה Windows Live: לא ניתן למצוא סמל אימות בתגובת השרת"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "אימות מזהה Windows Live נכשלה"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "השולח מרושע מדי"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "המקבל מרושע מדי"
+
+#~ msgid "Available Message"
+#~ msgstr "הודעת זמינות"
+
+#~ msgid "Away Message"
+#~ msgstr "הודעת ריחוק מהמחשב"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(שולף)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "שגיאה בבקשת אסימון כניסה"
+
+#~ msgid "TCP Address"
+#~ msgstr "כתובת TCP"
+
+#~ msgid "UDP Address"
+#~ msgstr "כתובת UDP"
+
+#, fuzzy
+#~ msgid "Display Statistics"
+#~ msgstr "סטטיסטיקות של השרת"
 
 #~ msgid "Screen name:"
 #~ msgstr "שם לתצוגה:"
 
-#~ msgid "Screen Name"
-#~ msgstr "שם לתצוגה"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "מישהו מזכיר את שמך בצ'אט"
 
diff --git a/po/hu.po b/po/hu.po
index ba242f85b9..6be112ab7f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,10 +7,10 @@
 # Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin 2.3\n"
+"Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-13 13:15+0200\n"
-"PO-Revision-Date: 2008-05-13 13:12+0200\n"
+"POT-Creation-Date: 2008-08-14 11:31+0200\n"
+"PO-Revision-Date: 2008-08-14 11:29+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@fsf.hu>\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s\n"
-"Használat: %s [KAPCSOLÓ]...\n"
+"Használat: %s [KAPCSOLÓ]…\n"
 "\n"
 "  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
 "  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
@@ -97,6 +97,10 @@ msgstr "Jelszó:"
 msgid "Alias:"
 msgstr "Álnév:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Ezen fiók létrehozása a kiszolgálón"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -262,7 +266,7 @@ msgid "Information"
 msgstr "Információk"
 
 msgid "Retrieving..."
-msgstr "Lekérés..."
+msgstr "Lekérés…"
 
 msgid "Get Info"
 msgstr "Információ lekérése"
@@ -333,10 +337,10 @@ msgid "On Mobile"
 msgstr "Mobilon"
 
 msgid "New..."
-msgstr "Új..."
+msgstr "Új…"
 
 msgid "Saved..."
-msgstr "Mentett..."
+msgstr "Mentett…"
 
 msgid "Plugins"
 msgstr "Bővítmények"
@@ -394,16 +398,19 @@ msgid "Options"
 msgstr "Beállítások"
 
 msgid "Send IM..."
-msgstr "Üzenet küldése..."
+msgstr "Üzenet küldése…"
 
 msgid "Block/Unblock..."
-msgstr "Tiltás/Tiltás feloldása..."
+msgstr "Tiltás/Tiltás feloldása…"
 
 msgid "Join Chat..."
-msgstr "Csatlakozás csevegéshez..."
+msgstr "Csatlakozás csevegéshez…"
 
 msgid "View Log..."
-msgstr "Napló megtekintése..."
+msgstr "Napló megtekintése…"
+
+msgid "View All Logs"
+msgstr "Minden napló megtekintése"
 
 msgid "Show"
 msgstr "Megjelenítés"
@@ -585,7 +592,7 @@ msgid ""
 "%s is typing..."
 msgstr ""
 "\n"
-"%s gépel..."
+"%s gépel…"
 
 msgid "You have left this chat."
 msgstr "Elhagyta ezt a csevegést."
@@ -602,6 +609,19 @@ msgstr ""
 msgid "Send To"
 msgstr "Küldés ennek"
 
+msgid "Invite message"
+msgstr "Meghívóüzenet"
+
+msgid "Invite"
+msgstr "Meghívás"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Adja meg a meghívandó partner nevét,\n"
+"egy elhagyható meghívóüzenettel együtt."
+
 msgid "Conversation"
 msgstr "Társalgás"
 
@@ -612,7 +632,10 @@ msgid "Show Timestamps"
 msgstr "Időbélyegek"
 
 msgid "Add Buddy Pounce..."
-msgstr "Partnerfigyelmeztetés felvétele..."
+msgstr "Partnerfigyelmeztetés felvétele…"
+
+msgid "Invite..."
+msgstr "Meghívás…"
 
 msgid "Enable Logging"
 msgstr "Naplózás engedélyezése"
@@ -623,9 +646,11 @@ msgstr "Hangok engedélyezése"
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATIKUS VÁLASZ> "
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "Felhasználólista:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "%d felhasználó listája:\n"
+msgstr[1] "%d felhasználó listája:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "A támogatott hibakeresési parancsok:  version"
@@ -641,6 +666,19 @@ msgstr ""
 "megtekintéséhez.\n"
 "Ebben a kontextusban a következő parancsok állnak rendelkezésre:\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s nem érvényes üzenetosztály. Az érvényes üzenetosztályokért lásd a „help "
+"msgcolor” kimenetét."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s nem érvényes szín. Az érvényes színekért lásd a „help msgcolor” kimenetét."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -685,6 +723,19 @@ msgstr "prefs: A beállítások ablak megjelenítése."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: A mentett állapotok ablak megjelenítése."
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;osztály&gt; &lt;előtér&gt; &lt;háttér&gt;: Különböző "
+"üzenetosztályok színeinek beállítása a társalgásablakban.<br>    &lt;"
+"osztály&gt;: receive, send, highlight, action, timestamp<br>    &lt;előtér/"
+"háttér&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, "
+"default<br> <br> PÉLDA:<br>    msgcolor send cyan default"
+
 msgid "Unable to open file."
 msgstr "Nem lehet megnyitni a fájlt."
 
@@ -705,8 +756,10 @@ msgid "Pause"
 msgstr "Szünet"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Fájlátvitelek – %2$d fájl %1$d százaléka"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Fájlátvitelek – %2$d fájl %1$d százaléka"
+msgstr[1] "Fájlátvitelek – %2$d fájl %1$d százaléka"
 
 #. Create the window.
 msgid "File Transfers"
@@ -821,11 +874,14 @@ msgstr "Társalgások ezen: %s"
 msgid "Conversations with %s"
 msgstr "Társalgások a következővel: %s"
 
+msgid "All Conversations"
+msgstr "Minden társalgás"
+
 msgid "System Log"
 msgstr "Rendszernapló"
 
 msgid "Emails"
-msgstr "Emailek"
+msgstr "E-mailek"
 
 msgid "You have mail!"
 msgstr "Levele érkezett!"
@@ -843,7 +899,7 @@ msgstr[0] "%s (%s) %d új üzenetet kapott."
 msgstr[1] "%s (%s) %d új üzenetet kapott."
 
 msgid "New Mail"
-msgstr "Új email"
+msgstr "Új e-mail"
 
 #, c-format
 msgid "Info for %s"
@@ -858,9 +914,6 @@ msgstr "Folytatás"
 msgid "IM"
 msgstr "Azonnali üzenet"
 
-msgid "Invite"
-msgstr "Meghívás"
-
 msgid "(none)"
 msgstr "(nincs)"
 
@@ -917,7 +970,7 @@ 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."
 
 msgid "Install Plugin..."
-msgstr "Bővítmény telepítése..."
+msgstr "Bővítmény telepítése…"
 
 msgid "Configure Plugin"
 msgstr "Bővítmény beállítása"
@@ -951,7 +1004,7 @@ msgstr "Partner neve:"
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "Figyelmeztetés, ha a partner..."
+msgstr "Figyelmeztetés, ha a partner…"
 
 msgid "Signs on"
 msgstr "Bejelentkezik"
@@ -1127,13 +1180,13 @@ msgid "Not implemented yet."
 msgstr "Még nincs megvalósítva."
 
 msgid "Save File..."
-msgstr "Fájl mentése..."
+msgstr "Fájl mentése…"
 
 msgid "Open File..."
-msgstr "Fájl megnyitása..."
+msgstr "Fájl megnyitása…"
 
 msgid "Choose Location..."
-msgstr "Válasszon helyet..."
+msgstr "Válasszon helyet…"
 
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Az Enter megnyomásával több szobát találhat ebben a kategóriában."
@@ -1185,7 +1238,7 @@ msgid "(default)"
 msgstr "(alapértelmezett)"
 
 msgid "Select Sound File ..."
-msgstr "Válasszon hangfájlt..."
+msgstr "Válasszon hangfájlt…"
 
 msgid "Sound Preferences"
 msgstr "Hangbeállítások"
@@ -1255,7 +1308,7 @@ msgid "Reset"
 msgstr "Visszaállítás"
 
 msgid "Choose..."
-msgstr "Kiválasztás..."
+msgstr "Kiválasztás…"
 
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1301,7 +1354,7 @@ msgid "Please enter a different title for the status."
 msgstr "Adjon meg másik címet az állapothoz."
 
 msgid "Substatus"
-msgstr "Alállapot"
+msgstr "Részállapot"
 
 msgid "Status:"
 msgstr "Állapot:"
@@ -1578,7 +1631,7 @@ msgid "Reject"
 msgstr "Visszautasítás"
 
 msgid "_View Certificate..."
-msgstr "_Tanúsítvány megjelenítése..."
+msgstr "_Tanúsítvány megjelenítése…"
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
@@ -2087,8 +2140,11 @@ msgstr "A bővítmény típusa nem egyezik: %d (szükséges: %d"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Az ABI verziója nem egyezik: %d.%d.x (szükséges: %d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "A bővítmény nem valósítja meg az összes kívánt függvényt"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"A bővítmény nem valósítja meg az összes kívánt függvényt (list_icon, login "
+"és close)"
 
 #, c-format
 msgid ""
@@ -2149,7 +2205,7 @@ msgid "Auto Reject"
 msgstr "Automatikus visszautasítás"
 
 msgid "Autoaccept File Transfers..."
-msgstr "Fájlátvitelek automatikus elfogadása..."
+msgstr "Fájlátvitelek automatikus elfogadása…"
 
 #. XXX: Is there a better way than this? There really should be.
 msgid ""
@@ -2171,14 +2227,17 @@ msgstr ""
 "befejeződésekor\n"
 "(csak ha nem társalog a küldővel)"
 
+msgid "Create a new directory for each user"
+msgstr "Új könyvtár létrehozása minden felhasználóhoz"
+
 msgid "Notes"
 msgstr "Megjegyzések"
 
 msgid "Enter your notes below..."
-msgstr "Írja be alább a jegyzetet..."
+msgstr "Írja be alább a jegyzetet…"
 
 msgid "Edit Notes..."
-msgstr "Jegyzetek szerkesztése..."
+msgstr "Jegyzetek szerkesztése…"
 
 #. *< major version
 #. *< minor version
@@ -2586,7 +2645,7 @@ msgstr ""
 "működik."
 
 msgid "You feel a disturbance in the force..."
-msgstr "Zavart érez az erőben..."
+msgstr "Zavart érez az erőben…"
 
 msgid "Only enable for users on the buddy list"
 msgstr "Csak a partnerlistán szereplő felhasználók számára"
@@ -2750,13 +2809,11 @@ msgstr ""
 "akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
 "Az Apple Bonjour For Windows eszközkészlet nem található, további "
-"információkat a http://developer.pidgin.im/wiki/Using%"
-"20Pidgin#CanIusePidginforBonjourLink-LocalMessaging oldalon találhat."
+"információkat a http://d.pidgin.im/BonjourWindows oldalon találhat."
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Nem lehetséges a bejövő azonnali üzenő kapcsolatokat figyelni\n"
@@ -2774,7 +2831,7 @@ msgid "Last name"
 msgstr "Vezetéknév"
 
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
 msgid "AIM Account"
 msgstr "AIM fiók"
@@ -2811,9 +2868,6 @@ msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
 msgid "Cannot open socket"
 msgstr "Nem nyitható meg a foglalat"
 
-msgid "Error setting socket options"
-msgstr "Hiba a foglalat tulajdonságainak beállításakor"
-
 msgid "Could not bind socket to port"
 msgstr "Nem köthető a foglalat a porthoz"
 
@@ -2840,7 +2894,7 @@ msgid "Unable to fetch the token.\n"
 msgstr "Nem tölthető le a jelsor.\n"
 
 msgid "Save Buddylist..."
-msgstr "Partnerlista mentése..."
+msgstr "Partnerlista mentése…"
 
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A partnerlistája üres, semmi nem került a fájlba."
@@ -2856,13 +2910,16 @@ msgid "Couldn't load buddylist"
 msgstr "Nem tölthető be a partnerlista"
 
 msgid "Load Buddylist..."
-msgstr "Partnerlista betöltése..."
+msgstr "Partnerlista betöltése…"
 
 msgid "Buddylist loaded successfully!"
 msgstr "A partnerlista betöltése sikeres!"
 
 msgid "Save buddylist..."
-msgstr "Partnerlista mentése..."
+msgstr "Partnerlista mentése…"
+
+msgid "Load buddylist from file..."
+msgstr "Partnerlista betöltése fájlból…"
 
 msgid "Fill in the registration fields."
 msgstr "Töltse ki a regisztrációs mezőket."
@@ -2953,7 +3010,7 @@ msgid "Select a chat for buddy: %s"
 msgstr "Válasszon egy csevegést a következő partnerhez: %s"
 
 msgid "Add to chat..."
-msgstr "Felvétel csevegéshez..."
+msgstr "Felvétel csevegéshez…"
 
 msgid "Available"
 msgstr "Elérhető"
@@ -3023,10 +3080,10 @@ msgid "Not connected to the server."
 msgstr "Nincs kapcsolat a kiszolgálóval."
 
 msgid "Find buddies..."
-msgstr "Partnerek keresése..."
+msgstr "Partnerek keresése…"
 
 msgid "Change password..."
-msgstr "Jelszó módosítása..."
+msgstr "Jelszó módosítása…"
 
 msgid "Upload buddylist to Server"
 msgstr "Partnerlista feltöltése a kiszolgálóra"
@@ -3038,10 +3095,7 @@ msgid "Delete buddylist from Server"
 msgstr "Partnerlista törlése a kiszolgálóról"
 
 msgid "Save buddylist to file..."
-msgstr "Partnerlista mentése fájlba..."
-
-msgid "Load buddylist from file..."
-msgstr "Partnerlista betöltése fájlból..."
+msgstr "Partnerlista mentése fájlba…"
 
 #. magic
 #. major_version
@@ -3158,6 +3212,9 @@ msgstr "Port"
 msgid "Encodings"
 msgstr "Kódolások"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "Bejövő UTF-8 automatikus felismerése"
+
 msgid "Real name"
 msgstr "Valódi név"
 
@@ -3172,8 +3229,8 @@ msgid "Bad mode"
 msgstr "Rossz üzemmód"
 
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "%1$s %3$ld másodperce kitiltva %2$s által"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "%1$s %3$s másodperce kitiltva %2$s által"
 
 #, c-format
 msgid "Ban on %s"
@@ -3343,6 +3400,9 @@ 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."
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <becenév> <üzenet>: ctcp üzenet küldése a becenévnek."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: parancs küldése a chanserv kiszolgálónak"
 
@@ -3350,7 +3410,7 @@ 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 "
+"deop &lt;becenév1&gt; [becenév2] …:  A csatorna-operátor állapot elvétele "
 "valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 msgid ""
@@ -3358,7 +3418,7 @@ msgid ""
 "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 "
+"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."
 
@@ -3373,16 +3433,15 @@ 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."
+"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 ""
 "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."
+"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 ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
@@ -3436,8 +3495,8 @@ 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."
+"op &lt;becenév1&gt; [becenév2] …:  Csatornaoperátori jogok adása valakinek. "
+"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
@@ -3476,7 +3535,7 @@ msgstr ""
 "üzenettel."
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
+msgstr "quote […]:  Nyers parancs küldése a kiszolgálónak."
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
@@ -3503,7 +3562,7 @@ 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 "
+"voice &lt;becenév1&gt; [becenév2] …:  Csatorna hang állapot megadása "
 "valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 msgid ""
@@ -3609,6 +3668,8 @@ msgstr "Irányítószám"
 msgid "Country"
 msgstr "Ország"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefonszám"
 
@@ -3799,12 +3860,12 @@ msgstr "Ugrásellenőrzés"
 msgid "Capabilities"
 msgstr "Képességek"
 
-msgid "Resource"
-msgstr "Erőforrás"
-
 msgid "Priority"
 msgstr "Prioritás"
 
+msgid "Resource"
+msgstr "Erőforrás"
+
 msgid "Middle Name"
 msgstr "Középső név"
 
@@ -3889,7 +3950,7 @@ msgstr ""
 "Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
 
 msgid "Email Address"
-msgstr "Email cím"
+msgstr "E-mail cím"
 
 msgid "Search for XMPP users"
 msgstr "XMPP felhasználók keresése"
@@ -4168,15 +4229,15 @@ msgid "Please enter your new password"
 msgstr "Adja meg az új jelszavát"
 
 msgid "Set User Info..."
-msgstr "Felhasználói információk beállítása..."
+msgstr "Felhasználói információk beállítása…"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
-msgstr "Jelszó módosítása..."
+msgstr "Jelszó módosítása…"
 
 #. }
 msgid "Search for Users..."
-msgstr "Felhasználók keresése..."
+msgstr "Felhasználók keresése…"
 
 msgid "Bad Request"
 msgstr "Hibás kérés"
@@ -4376,7 +4437,7 @@ msgstr "%s megcsörgette!"
 
 #, c-format
 msgid "Buzzing %s..."
-msgstr "%s csörgetése..."
+msgstr "%s csörgetése…"
 
 msgid "config:  Configure a chat room."
 msgstr "config:   Csevegőszoba beállítása."
@@ -4493,8 +4554,8 @@ msgid "XMPP Message Error"
 msgstr "XMPP üzenethiba"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (%s kód)"
+msgid "(Code %s)"
+msgstr "(%s kód)"
 
 msgid "XML Parse error"
 msgstr "XML elemzési hiba"
@@ -4519,14 +4580,14 @@ msgid "_Accept Defaults"
 msgstr "Alapértel_mezések elfogadása"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Hiba a(z) %s csevegésben"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "Hiba a(z) %s csevegéshez csatlakozás közben"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "Hiba a(z) %s csevegésben"
+
+#, 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 "
@@ -4566,7 +4627,7 @@ msgid "Set"
 msgstr "Beállítás"
 
 msgid "Set Mood..."
-msgstr "Hangulat beállítása..."
+msgstr "Hangulat beállítása…"
 
 msgid "Set User Nickname"
 msgstr "Felhasználói becenév beállítása"
@@ -4582,7 +4643,7 @@ msgstr ""
 "válasszon ennek megfelelően."
 
 msgid "Set Nickname..."
-msgstr "Becenév beállítása..."
+msgstr "Becenév beállítása…"
 
 msgid "Actions"
 msgstr "Műveletek"
@@ -4623,7 +4684,7 @@ msgstr "Szintaktikai hiba (valószínűleg klienshiba)"
 
 #, c-format
 msgid "Invalid email address"
-msgstr "Érvénytelen email cím"
+msgstr "Érvénytelen e-mail cím"
 
 #, c-format
 msgid "User does not exist"
@@ -4842,7 +4903,10 @@ msgstr "%s megbökte!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr "%s bökése..."
+msgstr "%s bökése…"
+
+msgid "Email Address..."
+msgstr "E-mail cím…"
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Az új MSN beceneve túl hosszú."
@@ -4878,8 +4942,22 @@ msgstr "Engedélyezés"
 msgid "Disallow"
 msgstr "Tiltás"
 
-msgid "This Hotmail account may not be active."
-msgstr "Lehetséges, hogy ez a Hotmail fiók nem aktív."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "%s tiltott szövege"
+
+msgid "No text is blocked for this account."
+msgstr "Nincs tiltott szöveg ehhez a fiókhoz."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"Az MSN kiszolgálók jelenleg a következő reguláris kifejezéseket tiltják:<br/>"
+"%s"
+
+msgid "This account does not have email enabled."
+msgstr "Ehhez a fiókhoz nincs engedélyezve az e-mail."
 
 msgid "Send a mobile message."
 msgstr "Mobilüzenet küldése."
@@ -4921,22 +4999,25 @@ msgid "Album"
 msgstr "Album"
 
 msgid "Set Friendly Name..."
-msgstr "Becenév beállítása..."
+msgstr "Becenév beállítása…"
 
 msgid "Set Home Phone Number..."
-msgstr "Otthoni telefonszám beállítása..."
+msgstr "Otthoni telefonszám beállítása…"
 
 msgid "Set Work Phone Number..."
-msgstr "Munkahelyi telefonszám beállítása..."
+msgstr "Munkahelyi telefonszám beállítása…"
 
 msgid "Set Mobile Phone Number..."
-msgstr "Mobiltelefonszám beállítása..."
+msgstr "Mobiltelefonszám beállítása…"
 
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Mobileszközök engedélyezése/tiltása..."
+msgstr "Mobileszközök engedélyezése/tiltása…"
 
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Mobiloldalak engedélyezése/tiltása..."
+msgstr "Mobiloldalak engedélyezése/tiltása…"
+
+msgid "View Blocked Text..."
+msgstr "Tiltott szöveg megjelenítése…"
 
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail bejövő levelek megnyitása"
@@ -5031,7 +5112,7 @@ msgid "Home Fax"
 msgstr "Otthoni fax"
 
 msgid "Personal Email"
-msgstr "Saját email"
+msgstr "Saját e-mail"
 
 msgid "Personal IM"
 msgstr "Saját azonnali üzenő"
@@ -5074,7 +5155,7 @@ msgid "Work Fax"
 msgstr "Munkahelyi fax"
 
 msgid "Work Email"
-msgstr "Munkahelyi email"
+msgstr "Munkahelyi e-mail"
 
 msgid "Work IM"
 msgstr "Munkahelyi azonnali üzenő"
@@ -5141,16 +5222,8 @@ msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live azonosító hitelesítése: nem lehet kapcsolódni"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Windows Live azonosító hitelesítése: nem található hitelesítési jelsor a "
-"kiszolgáló válaszában"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live azonosító hitelesítése meghiúsult"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live azonosító hitelesítése: érvénytelen válasz"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5197,6 +5270,9 @@ msgstr "%s érvénytelen passport fiók."
 msgid "Service Temporarily Unavailable."
 msgstr "A szolgáltatás átmenetileg nem érhető el."
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "A mobilüzenet nem küldhető el, mert túl hosszú."
+
 msgid "Unable to rename group"
 msgstr "Nem lehet átnevezni a csoportot"
 
@@ -5231,6 +5307,22 @@ msgstr[1] ""
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Az üzenet nem küldhető el, mivel a rendszer nem érhető el. Ez normális "
+"esetben akkor történik, ha a felhasználó le van tiltva vagy nem létezik."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Az üzenet nem küldhető el, mivel túl gyorsan küldi az üzeneteket."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Az üzenet nem küldhető el, mivel ismeretlen kódolási hiba történt."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Az üzenet nem küldhető el, mivel ismeretlen hiba történt."
+
 msgid "Unable to connect"
 msgstr "Nem lehet kapcsolódni"
 
@@ -5351,6 +5443,9 @@ msgstr "Nem lehet hozzáadni a következőt: „%s”."
 msgid "The username specified is invalid."
 msgstr "A megadott felhasználónév érvénytelen."
 
+msgid "This Hotmail account may not be active."
+msgstr "Lehetséges, hogy ez a Hotmail fiók nem aktív."
+
 msgid "Has you"
 msgstr "Szerepel-e a listáján"
 
@@ -5390,8 +5485,12 @@ msgid "Logging in"
 msgstr "Bejelentkezés"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+"A kapcsolat elveszett a kiszolgálóhoz (nem érkezett adat %d másodpercen "
+"belül)"
+msgstr[1] ""
 "A kapcsolat elveszett a kiszolgálóhoz (nem érkezett adat %d másodpercen "
 "belül)"
 
@@ -5490,9 +5589,15 @@ msgstr "IM barátok"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"%d partner került felvételre vagy frissítésre a kiszolgálóról (beleértve a "
+"kiszolgálóoldali listán már jelen lévő partnereket)"
+msgstr[1] ""
 "%d partner került felvételre vagy frissítésre a kiszolgálóról (beleértve a "
 "kiszolgálóoldali listán már jelen lévő partnereket)"
 
@@ -5507,10 +5612,10 @@ msgstr "A barátok importálása sikertelen"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "Emberek keresése..."
+msgstr "Emberek keresése…"
 
 msgid "Change IM name..."
-msgstr "IM név módosítása..."
+msgstr "IM név módosítása…"
 
 msgid "myim URL handler"
 msgstr "myim URL kezelő"
@@ -5596,7 +5701,7 @@ msgstr "%s megütötte!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr "%s megütése..."
+msgstr "%s megütése…"
 
 # fixme: valami ilyesmi...
 #. Whack means "to hit or strike someone with a sharp blow"
@@ -5609,7 +5714,7 @@ msgstr "%s lecsapta!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr "%s lecsapása..."
+msgstr "%s lecsapása…"
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
@@ -5623,7 +5728,7 @@ msgstr "%s leégette!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr "%s égetése..."
+msgstr "%s égetése…"
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
@@ -5635,7 +5740,7 @@ msgstr "%s megcsókolta!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr "%s megcsókolása..."
+msgstr "%s megcsókolása…"
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
@@ -5647,7 +5752,7 @@ msgstr "%s megölelte!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr "%s ölelése..."
+msgstr "%s ölelése…"
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
@@ -5659,7 +5764,7 @@ msgstr "%s egy pofont küld!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr "%s pofozása..."
+msgstr "%s pofozása…"
 
 # fixme: hát ez ezt jelenti ;)
 #. Goose means "to pinch someone on their butt"
@@ -5672,7 +5777,7 @@ msgstr "%s seggberúgta!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "%s seggberúgása..."
+msgstr "%s seggberúgása…"
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
@@ -5686,7 +5791,7 @@ msgstr "%s egy ötöst ad!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr "%s ötöst kap..."
+msgstr "%s ötöst kap…"
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -5700,7 +5805,7 @@ msgstr "%s megtréfálta!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr "%s megtréfálása..."
+msgstr "%s megtréfálása…"
 
 # fixme: elvileg ezt jelenti...
 #. Raspberry is a slang term for the vibrating sound made
@@ -5719,7 +5824,7 @@ msgstr "%s nyelvet öltött!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr "Nyelvöltés erre: %s..."
+msgstr "Nyelvöltés erre: %s…"
 
 msgid "Required parameters not passed in"
 msgstr "A szükséges paraméterek átadása sikertelen"
@@ -5925,13 +6030,13 @@ msgid "GroupWise Conference %d"
 msgstr "GroupWise konferencia %d"
 
 msgid "Authenticating..."
-msgstr "Hitelesítés..."
+msgstr "Hitelesítés…"
 
 msgid "Unable to connect to server."
 msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
 
 msgid "Waiting for response..."
-msgstr "Várakozás válaszra..."
+msgstr "Várakozás válaszra…"
 
 #, c-format
 msgid "%s has been invited to this conversation."
@@ -6123,11 +6228,11 @@ msgstr "Elégtelen jogosultságok"
 msgid "In local permit/deny"
 msgstr "A helyi engedélyezés/letiltás listában"
 
-msgid "Too evil (sender)"
-msgstr "Túl rosszindulatú (küldő)"
+msgid "Warning level too high (sender)"
+msgstr "A figyelmeztetési szint túl magas (küldő)"
 
-msgid "Too evil (receiver)"
-msgstr "Túl rosszindulatú (fogadó)"
+msgid "Warning level too high (receiver)"
+msgstr "A figyelmeztetési szint túl magas (fogadó)"
 
 msgid "User temporarily unavailable"
 msgstr "A felhasználó átmenetileg nem érhető el"
@@ -6230,6 +6335,9 @@ msgstr "Élő videó"
 msgid "Camera"
 msgstr "Fényképezőgép"
 
+msgid "Screen Sharing"
+msgstr "Képernyőmegosztás"
+
 #, c-format
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
@@ -6292,7 +6400,7 @@ msgid ""
 "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óneveknek érvényes email címnek kell lennie, vagy "
+"érvénytelen. A felhasználóneveknek érvényes e-mail címnek kell lennie, vagy "
 "betűvel kell kezdődniük és betűket, számokat, szóközöket, vagy csak számokat "
 "tartalmazhatnak."
 
@@ -6320,7 +6428,6 @@ 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."
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6368,6 +6475,7 @@ msgstr ""
 msgid "Unable to get a valid login hash."
 msgstr "Nem kérhető le érvényes belépő hash."
 
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Jelszó elküldve"
 
@@ -6439,7 +6547,7 @@ msgid ""
 "Message is:\n"
 "%s"
 msgstr ""
-"ICQ email érkezett a következőtől: %s [%s]\n"
+"ICQ e-mail érkezett a következőtől: %s [%s]\n"
 "\n"
 "Az üzenet:\n"
 "%s"
@@ -6489,24 +6597,27 @@ msgstr[1] ""
 "gyakoriságának a korlátját."
 
 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
-"rosszindulatú volt."
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó "
+"figyelmeztetési szintje túl magas volt."
 msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
-"rosszindulatú volt."
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó "
+"figyelmeztetési szintje túl magas volt."
 
 #, 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."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
-"volt."
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert az Ön figyelmeztetési "
+"szintje túl magas."
 msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
-"volt."
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert az Ön figyelmeztetési "
+"szintje túl magas."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6536,9 +6647,6 @@ msgstr "Kapcsolódva ezóta"
 msgid "Member Since"
 msgstr "Tagság kezdete"
 
-msgid "Available Message"
-msgstr "Elérhetőségi üzenet"
-
 msgid "Your AIM connection may be lost."
 msgstr "Az AIM kapcsolata megszakadhatott."
 
@@ -6567,12 +6675,17 @@ msgstr "Mobiltelefon"
 msgid "Personal Web Page"
 msgstr "Saját weboldal"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "További információ"
 
 msgid "Zip Code"
 msgstr "Irányítószám"
 
+msgid "Work Information"
+msgstr "Munkahelyi adatok"
+
 msgid "Division"
 msgstr "Részleg"
 
@@ -6582,9 +6695,6 @@ msgstr "Pozíció"
 msgid "Web Page"
 msgstr "Weboldal"
 
-msgid "Work Information"
-msgstr "Munkahelyi adatok"
-
 msgid "Pop-Up Message"
 msgstr "Felbukkanó üzenet"
 
@@ -6596,7 +6706,7 @@ msgstr[1] "A következő felhasználónevek a következőhöz vannak rendelve: %
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Nem található eredmény a(z) %s email címre"
+msgstr "Nem található eredmény a(z) %s e-mail címre"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
@@ -6632,7 +6742,7 @@ msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az email címet, mert egy kérés már "
+"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."
 
 #, c-format
@@ -6640,7 +6750,7 @@ msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az email címet, mert a megadott "
+"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."
 
 #, c-format
@@ -6648,7 +6758,7 @@ msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az email címet, mert a megadott "
+"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
 "cím érvénytelen."
 
 #, c-format
@@ -6660,7 +6770,7 @@ msgstr "Hiba a fiókinformációk módosításakor"
 
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "%s email címe a következő: %s"
+msgstr "%s e-mail címe a következő: %s"
 
 msgid "Account Info"
 msgstr "Fiókinformációk"
@@ -6722,7 +6832,7 @@ msgid ""
 "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 érvényes email címnek kell lenniük, vagy betűvel kell "
+"felhasználóneveknek érvényes e-mail címnek kell lenniük, vagy betűvel kell "
 "kezdődniük, és betűket, számokat és szóközöket, vagy csak számokból "
 "állhatnak."
 
@@ -6798,12 +6908,6 @@ 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."
 
-msgid "Away Message"
-msgstr "Távol üzenet"
-
-msgid "<i>(retrieving)</i>"
-msgstr "<i>(lekérés)</i>"
-
 msgid "iTunes Music Store Link"
 msgstr "iTunes zenebolt hivatkozás"
 
@@ -6877,19 +6981,19 @@ msgstr ""
 "kattintva a nevükön, és az „Engedélyezés újra kérése” választásával"
 
 msgid "Find Buddy by Email"
-msgstr "Partnerek keresése email cím szerint"
+msgstr "Partnerek keresése e-mail cím szerint"
 
 msgid "Search for a buddy by email address"
-msgstr "Partner keresése email cím alapján"
+msgstr "Partner keresése e-mail cím alapján"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Adja meg annak a partnernek az email címét, akit keres."
+msgstr "Adja meg annak a partnernek az e-mail címét, akit keres."
 
 msgid "_Search"
 msgstr "_Keresés"
 
 msgid "Set User Info (web)..."
-msgstr "Felhasználói információk beállítása (web)..."
+msgstr "Felhasználói információk beállítása (web)…"
 
 msgid "Change Password (web)"
 msgstr "Jelszó módosítása (web)"
@@ -6899,23 +7003,23 @@ msgstr "Üzenettovábbítás beállítása (web)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "Magánszféra-beállítások..."
+msgstr "Magánszféra-beállítások…"
 
 #. AIM actions
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
 
 msgid "Display Currently Registered Email Address"
-msgstr "A jelenleg regisztrált email cím megjelenítése"
+msgstr "A jelenleg regisztrált e-mail cím megjelenítése"
 
 msgid "Change Currently Registered Email Address..."
-msgstr "A jelenleg regisztrált email cím módosítása..."
+msgstr "A jelenleg regisztrált e-mail cím módosítása…"
 
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Engedélyezésre váró partnerek megjelenítése"
 
 msgid "Search for Buddy by Email Address..."
-msgstr "Partner keresése email cím szerint..."
+msgstr "Partner keresése e-mail cím szerint…"
 
 msgid "Search for Buddy by Information"
 msgstr "Partner keresése információ alapján"
@@ -6929,6 +7033,9 @@ msgstr ""
 "használata fájlátvitelhez (lassabb,\n"
 "de nem jeleníti meg az IP címet)"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "Több párhuzamos bejelentkezés engedélyezése"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
@@ -7098,7 +7205,7 @@ msgstr "Kérés visszautasítása"
 
 #. title
 msgid "Sorry, you are not my type..."
-msgstr "Bocs, nem vagy az esetem..."
+msgstr "Bocs, nem vagy az esetem…"
 
 msgid "Add buddy with auth request failed"
 msgstr "A partner felvétele felhatalmazási kéréssel meghiúsult"
@@ -7235,13 +7342,6 @@ msgstr ""
 "Ne feledje, ha Ön hozta létre,\n"
 "akkor ez a művelet törli a Qun-t."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Kód: [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "Csoportművelet-hiba"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Jóvá kívánja hagyni a kérést?"
@@ -7270,34 +7370,39 @@ msgstr "Rendszerüzenet"
 msgid "Failed to send IM."
 msgstr "Az azonnali üzenet küldése meghiúsult."
 
-msgid "Keep alive error"
-msgstr "Kapcsolat-fenntartási hiba"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Ismeretlen-%d"
 
-msgid "Error requesting login token"
-msgstr "Hiba a bejelentkezési jelsor lekérésekor"
+msgid "Level"
+msgstr "Szint"
 
-msgid "Unable to login. Check debug log."
-msgstr "Nem lehet bejelentkezni. Nézze meg a hibakeresési naplót."
+msgid "Member"
+msgstr "Tag"
 
-msgid "Unable to login"
-msgstr "Nem lehet bejelentkezni"
+msgid " VIP"
+msgstr " VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Nem lehet kapcsolódni."
+msgid " TCP"
+msgstr " TCP"
 
-#, c-format
-msgid "Unknown-%d"
-msgstr "Ismeretlen-%d"
+msgid " FromMobile"
+msgstr " Mobilról"
 
-msgid "TCP Address"
-msgstr "TCP cím"
+msgid " BindMobile"
+msgstr " Mobilkapcsolat"
 
-msgid "UDP Address"
-msgstr "UDP cím"
+msgid " Video"
+msgstr " Videó"
 
-msgid "Level"
-msgstr "Szint"
+msgid " Space"
+msgstr " Hely"
+
+msgid "Flag"
+msgstr "Jelző"
+
+msgid "Ver"
+msgstr "Ver"
 
 msgid "Invalid name"
 msgstr "Érvénytelen név"
@@ -7311,12 +7416,16 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Utolsó frissítés</b>: %s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Kiszolgáló</b>: %s: %d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Kapcsolat módja</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>Kiszolgáló IP</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Valódi gépnév</b>: %s: %d<br>\n"
 
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
@@ -7368,12 +7477,94 @@ msgstr "QQ protokoll\tbővítmény"
 msgid "Connect using TCP"
 msgstr "Kapcsolódás TCP segítségével"
 
+msgid "resend interval(s)"
+msgstr "újraküldési időköz"
+
+msgid "Keep alive interval(s)"
+msgstr "Kapcsolat-fenntartási időköz"
+
+msgid "Update interval(s)"
+msgstr "Frissítési időköz"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Érvénytelen jelsorhossz: %d"
+
+msgid "Keep alive error"
+msgstr "Kapcsolat-fenntartási hiba"
+
+msgid "Failed to connect server"
+msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni"
+
 msgid "Socket error"
 msgstr "Foglalathiba"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Elveszett a kapcsolat a kiszolgálóhoz:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "A foglalatból nem lehet olvasni"
 
+msgid "Write Error"
+msgstr "Írási hiba"
+
+msgid "Connection lost"
+msgstr "A kapcsolat elveszett"
+
+msgid "Couldn't resolve host"
+msgstr "Nem sikerült a kiszolgáló feloldása"
+
+msgid "hostname is NULL or port is 0"
+msgstr "a gépnév üres vagy a port 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Kapcsolódási a(z) %s kiszolgálóhoz, újrapróbálkozás: %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Nem lehet kapcsolódni."
+
+msgid "Could not resolve hostname"
+msgstr "A gépnév nem oldható fel"
+
+msgid "Unable to login. Check debug log."
+msgstr "Nem lehet bejelentkezni. Nézze meg a hibakeresési naplót."
+
+msgid "Unable to login"
+msgstr "Nem lehet bejelentkezni"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+"Válasz: %s(0x%02X )\n"
+"Elküldve: %s(0x%02X )\n"
+"Szobaazonosító: %d, válasz: [0x%02X]: \n"
+"%s"
+
+msgid "Failed room reply"
+msgstr "A szobaválasz sikertelen"
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Ön nem tagja a következő csoportnak: „%s”\n"
+
+msgid "Can not decrypt login reply"
+msgstr "Nem fejthető vissza a bejelentkezési válasz"
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Érvénytelen jelsorválaszkód, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d visszautasította a következő fájlt: %s"
@@ -7385,12 +7576,6 @@ msgstr "Fájlküldés"
 msgid "%d canceled the transfer of %s"
 msgstr "%d megszakította a(z) %s átvitelét"
 
-msgid "Connection lost"
-msgstr "A kapcsolat elveszett"
-
-msgid "Login failed, no reply"
-msgstr "A bejelentkezés meghiúsult, nincs válasz"
-
 msgid "Do you want to add this buddy?"
 msgstr "Fel kívánja venni ezt a partnert?"
 
@@ -7427,6 +7612,14 @@ msgstr "Üzenet: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s nincs a partnerlistáján"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "Értesítés a következőtől: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Kapcsolat lezárva (írás)"
 
@@ -7446,7 +7639,7 @@ msgid "Notes Address Book Information"
 msgstr "Notes címjegyzék-információk"
 
 msgid "Invite Group to Conference..."
-msgstr "Csoport meghívása konferenciára..."
+msgstr "Csoport meghívása konferenciára…"
 
 msgid "Get Notes Address Book Info"
 msgstr "Notes címjegyzék-információk lekérése"
@@ -7545,7 +7738,7 @@ msgid "Available Conferences"
 msgstr "Elérhető konferenciák"
 
 msgid "Create New Conference..."
-msgstr "Új konferencia létrehozása..."
+msgstr "Új konferencia létrehozása…"
 
 msgid "Invite user to a conference"
 msgstr "Felhasználó meghívása konferenciára"
@@ -7564,7 +7757,7 @@ msgid "Invite to Conference"
 msgstr "Meghívás konferenciára"
 
 msgid "Invite to Conference..."
-msgstr "Meghívás konferenciára..."
+msgstr "Meghívás konferenciára…"
 
 msgid "Send TEST Announcement"
 msgstr "TESZT bejelentés küldése"
@@ -7757,16 +7950,16 @@ msgid "User Search"
 msgstr "Felhasználó keresése"
 
 msgid "Import Sametime List..."
-msgstr "Sametime lista importálása..."
+msgstr "Sametime lista importálása…"
 
 msgid "Export Sametime List..."
-msgstr "Sametime lista exportálása..."
+msgstr "Sametime lista exportálása…"
 
 msgid "Add Notes Address Book Group..."
-msgstr "Notes címjegyzékcsoport hozzáadása..."
+msgstr "Notes címjegyzékcsoport hozzáadása…"
 
 msgid "User Search..."
-msgstr "Felhasználó keresése..."
+msgstr "Felhasználó keresése…"
 
 msgid "Force login (ignore server redirects)"
 msgstr "Bejelentkezés kényszerítése (kiszolgáló átirányítások mellőzése)"
@@ -7868,7 +8061,7 @@ msgstr ""
 
 #. Open file selector to select the public key.
 msgid "Open..."
-msgstr "Megnyitás..."
+msgstr "Megnyitás…"
 
 #, c-format
 msgid "The %s buddy is not present in the network"
@@ -7882,7 +8075,7 @@ msgstr ""
 "az Importálásra."
 
 msgid "_Import..."
-msgstr "_Importálás..."
+msgstr "_Importálás…"
 
 msgid "Select correct user"
 msgstr "Megfelelő felhasználó kiválasztása"
@@ -7977,7 +8170,7 @@ msgid "IM with Password"
 msgstr "Azonnali üzenet jelszóval"
 
 msgid "Get Public Key..."
-msgstr "Nyilvános kulcs letöltése..."
+msgstr "Nyilvános kulcs letöltése…"
 
 msgid "Kill User"
 msgstr "Felhasználó kidobása"
@@ -8040,7 +8233,7 @@ msgstr "Csatorna nyilvános kulcsának hozzáadása"
 
 #. Add new public key
 msgid "Open Public Key..."
-msgstr "Nyilvános kulcs megnyitása..."
+msgstr "Nyilvános kulcs megnyitása…"
 
 msgid "Channel Passphrase"
 msgstr "Csatorna jelmondata"
@@ -8269,7 +8462,7 @@ msgid "Public Key Babbleprint"
 msgstr "Nyilvános kulcs blablakódja"
 
 msgid "_More..."
-msgstr "_Több..."
+msgstr "_Több…"
 
 msgid "Detach From Server"
 msgstr "Leválás a kiszolgálóról"
@@ -8400,7 +8593,7 @@ msgid "Verify Public Key"
 msgstr "Nyilvános kulcs ellenőrzése"
 
 msgid "_View..."
-msgstr "_Nézet..."
+msgstr "_Nézet…"
 
 msgid "Unsupported public key type"
 msgstr "Nem támogatott típusú nyilvános kulcs"
@@ -8445,6 +8638,10 @@ msgstr "Nem lehet inicializálni a SILC protokollt"
 msgid "Error loading SILC key pair"
 msgstr "Hiba a SILC kulcspár betöltésekor"
 
+#, c-format
+msgid "Download %s: %s"
+msgstr "%s letöltése: %s"
+
 msgid "Your Current Mood"
 msgstr "Az Ön jelenlegi hangulata"
 
@@ -8541,7 +8738,7 @@ msgid "View Message of the Day"
 msgstr "A nap üzenetének megtekintése"
 
 msgid "Create SILC Key Pair..."
-msgstr "SILC kulcspár létrehozása..."
+msgstr "SILC kulcspár létrehozása…"
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
@@ -8742,7 +8939,7 @@ msgid "Digitally sign and verify all messages"
 msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 
 msgid "Creating SILC key pair..."
-msgstr "SILC kulcspár létrehozása..."
+msgstr "SILC kulcspár létrehozása…"
 
 msgid "Cannot create SILC key pair\n"
 msgstr "Nem hozható létre SILC kulcspár\n"
@@ -8760,7 +8957,7 @@ msgstr "Felhasználónév: \t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "Email: \t\t%s\n"
+msgstr "E-mail: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -8903,12 +9100,6 @@ msgstr "Ismeretlen kiszolgálóválasz."
 msgid "Could not create listen socket"
 msgstr "Nem sikerült létrehozni a figyelő foglalatot"
 
-msgid "Couldn't resolve host"
-msgstr "Nem sikerült a kiszolgáló feloldása"
-
-msgid "Could not resolve hostname"
-msgstr "A gépnév nem oldható fel"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "A SIP felhasználónevek nem tartalmazhatnak üreshely-karaktert vagy @ "
@@ -9020,7 +9211,7 @@ msgstr "Könyvtárszolgáltatás átmenetileg nem érhető el."
 
 #, c-format
 msgid "Email lookup restricted."
-msgstr "Email keresés korlátozva."
+msgstr "E-mail keresés korlátozva."
 
 #, c-format
 msgid "Keyword ignored."
@@ -9077,7 +9268,7 @@ msgid "Connection Closed"
 msgstr "Kapcsolat lezárva"
 
 msgid "Waiting for reply..."
-msgstr "Várakozás válaszra..."
+msgstr "Várakozás válaszra…"
 
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "A TOC ismét működőképes. Mostantól újra küldhet üzeneteket."
@@ -9108,7 +9299,7 @@ msgid "Could not write file header.  The file will not be transferred."
 msgstr "A fájl fejlécét nem sikerült kiírni. A fájl nem lesz elküldve."
 
 msgid "Save As..."
-msgstr "Mentés másként..."
+msgstr "Mentés másként…"
 
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -9285,10 +9476,10 @@ msgid "Join whom in chat?"
 msgstr "Kihez csatlakozik a csevegésben?"
 
 msgid "Activate ID..."
-msgstr "Azonosító aktiválása..."
+msgstr "Azonosító aktiválása…"
 
 msgid "Join User in Chat..."
-msgstr "Felhasználó csatlakoztatása csevegéshez..."
+msgstr "Felhasználó csatlakoztatása csevegéshez…"
 
 msgid "Open Inbox"
 msgstr "Bejövő levelek megnyitása"
@@ -9364,9 +9555,6 @@ msgstr "Nem lehet a fájlleírót létrehozni."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s felajánlja egy %d fájlból álló csoport elküldését.\n"
 
-msgid "Write Error"
-msgstr "Írási hiba"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japán profil"
 
@@ -9666,6 +9854,14 @@ msgstr "Hiba %s feloldásakor"
 msgid "Could not resolve host name"
 msgstr "A gépnév nem oldható fel"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s figyelmének kérése…"
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s a figyelmét kéri!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9695,14 +9891,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s ezentúl %s néven szerepel.\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "%s figyelmének kérése..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s a figyelmét kéri!"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9717,6 +9905,20 @@ msgstr "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 msgid "Accept chat invitation?"
 msgstr "Elfogadja a meghívást a csevegésre?"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "Billentyűparancs"
+
+msgid "The text-shortcut for the smiley"
+msgstr "A hangulatjel szöveges billentyűparancsa"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Tárolt kép"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Tárolt kép"
+
 msgid "SSL Connection Failed"
 msgstr "Az SSL kapcsolat meghiúsult"
 
@@ -9772,6 +9974,12 @@ msgstr "+++ %s inaktív lett"
 msgid "+++ %s became unidle"
 msgstr "+++ %s már nem inaktív"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9789,7 +9997,7 @@ msgstr ""
 "régi fájl %s~ néven lett elmentve."
 
 msgid "Calculating..."
-msgstr "Számítás..."
+msgstr "Számítás…"
 
 msgid "Unknown."
 msgstr "Ismeretlen."
@@ -9886,6 +10094,11 @@ msgstr "A kapcsolat túllépte az időkorlátot."
 msgid "Connection refused."
 msgstr "Kapcsolat visszautasítva."
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "A cím már használatban van."
+
 msgid "Internet Messenger"
 msgstr "Azonnali üzenetküldés"
 
@@ -9993,8 +10206,8 @@ msgstr "Fiók hozzáadása"
 msgid "_Basic"
 msgstr "_Alap"
 
-msgid "Create this new account on the server"
-msgstr "Ezen új fiók létrehozása a kiszolgálón"
+msgid "Create _this new account on the server"
+msgstr "Ezen új fió_k létrehozása a kiszolgálón"
 
 msgid "_Advanced"
 msgstr "_Haladó"
@@ -10077,10 +10290,10 @@ msgid "I_M"
 msgstr "Ü_zenet"
 
 msgid "_Send File..."
-msgstr "_Fájl küldése..."
+msgstr "_Fájl küldése…"
 
 msgid "Add Buddy _Pounce..."
-msgstr "_Partnerfigyelmeztetés felvétele..."
+msgstr "_Partnerfigyelmeztetés felvétele…"
 
 msgid "View _Log"
 msgstr "Nap_ló megtekintése"
@@ -10092,16 +10305,22 @@ msgid "Show when offline"
 msgstr "Megjelenítés, ha elérhető"
 
 msgid "_Alias..."
-msgstr "Ál_név..."
+msgstr "Ál_név…"
 
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
+msgid "Set Custom Icon"
+msgstr "Egyéni ikon beállítása"
+
+msgid "Remove Custom Icon"
+msgstr "Egyéni ikon eltávolítása"
+
 msgid "Add _Buddy..."
-msgstr "P_artner felvétele..."
+msgstr "P_artner felvétele…"
 
 msgid "Add C_hat..."
-msgstr "Cse_vegés felvétele..."
+msgstr "Cse_vegés felvétele…"
 
 msgid "_Delete Group"
 msgstr "_Csoport törlése"
@@ -10120,7 +10339,7 @@ msgid "Persistent"
 msgstr "Állandó"
 
 msgid "_Edit Settings..."
-msgstr "B_eállítások szerkesztése..."
+msgstr "B_eállítások szerkesztése…"
 
 msgid "_Collapse"
 msgstr "Összecs_ukás"
@@ -10148,16 +10367,16 @@ msgid "/_Buddies"
 msgstr "/_Partnerek"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/Partnerek/Új azonnal_i üzenet..."
+msgstr "/Partnerek/Új azonnal_i üzenet…"
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Partnerek/_Csatlakozás csevegéshez..."
+msgstr "/Partnerek/_Csatlakozás csevegéshez…"
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Partnerek/_Felhasználó adatainak lekérése..."
+msgstr "/Partnerek/_Felhasználó adatainak lekérése…"
 
 msgid "/Buddies/View User _Log..."
-msgstr "/Partnerek/Felhasználó _naplójának lekérése..."
+msgstr "/Partnerek/Felhasználó _naplójának lekérése…"
 
 msgid "/Buddies/Sh_ow"
 msgstr "/Partnerek/Me_gjelenítés"
@@ -10181,13 +10400,13 @@ msgid "/Buddies/_Sort Buddies"
 msgstr "/Partnerek/Part_nerek rendezése"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Partnerek/_Partner felvétele..."
+msgstr "/Partnerek/_Partner felvétele…"
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/Partnerek/Cse_vegés felvétele..."
+msgstr "/Partnerek/Cse_vegés felvétele…"
 
 msgid "/Buddies/Add _Group..."
-msgstr "/Partnerek/C_soport felvétele..."
+msgstr "/Partnerek/C_soport felvétele…"
 
 msgid "/Buddies/_Quit"
 msgstr "/Partnerek/_Kilépés"
@@ -10196,8 +10415,8 @@ msgstr "/Partnerek/_Kilépés"
 msgid "/_Accounts"
 msgstr "/_Fiókok"
 
-msgid "/Accounts/Manage"
-msgstr "/Fiókok/Kezelés"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Fiókok/Fiókok kezelése"
 
 #. Tools
 msgid "/_Tools"
@@ -10218,6 +10437,9 @@ msgstr "/Eszközök/_Beállítások"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eszközök/Ma_gánszféra"
 
+msgid "/Tools/Smile_y"
+msgstr "/Eszközök/Mosol_y"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Eszközök/_Fájlátvitelek"
 
@@ -10253,7 +10475,7 @@ msgid ""
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Tulajdonosok:</b> %d"
+"<b>Jelenlévők:</b> %d"
 
 #, c-format
 msgid ""
@@ -10300,22 +10522,22 @@ msgid "Idle %dm"
 msgstr "Inaktív (%d p)"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/Partnerek/Új azonnali üzenet..."
+msgstr "/Partnerek/Új azonnali üzenet…"
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/Partnerek/Csatlakozás csevegéshez..."
+msgstr "/Partnerek/Csatlakozás csevegéshez…"
 
 msgid "/Buddies/Get User Info..."
-msgstr "/Partnerek/Felhasználó adatainak lekérése..."
+msgstr "/Partnerek/Felhasználó adatainak lekérése…"
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/Partnerek/Partner felvétele..."
+msgstr "/Partnerek/Partner felvétele…"
 
 msgid "/Buddies/Add Chat..."
-msgstr "/Partnerek/Csevegés felvétele..."
+msgstr "/Partnerek/Csevegés felvétele…"
 
 msgid "/Buddies/Add Group..."
-msgstr "/Partnerek/Csoport felvétele..."
+msgstr "/Partnerek/Csoport felvétele…"
 
 msgid "/Tools/Privacy"
 msgstr "/Eszközök/Magánszféra"
@@ -10380,15 +10602,15 @@ 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Üdvözli a %s!</span>\n"
 "\n"
-"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Kezelé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 -> Fiókok "
+"kezelése</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
@@ -10449,6 +10671,12 @@ msgstr "Cse_vegés elrejtése az ablak bezárásakor."
 msgid "Please enter the name of the group to be added."
 msgstr "Adja meg a felvenni kívánt csoport nevét."
 
+msgid "Enable Account"
+msgstr "Fiók engedélyezése"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Fiókok/Fiók engedélyezése"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Fiókok/"
 
@@ -10461,12 +10689,6 @@ msgstr "Nem állnak rendelkezésre műveletek"
 msgid "_Disable"
 msgstr "_Tiltás"
 
-msgid "Enable Account"
-msgstr "Fiók engedélyezése"
-
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Fiókok/Fiók engedélyezése"
-
 msgid "/Tools"
 msgstr "/Eszközök"
 
@@ -10544,17 +10766,14 @@ msgid "Hide Icon"
 msgstr "Ikon elrejtése"
 
 msgid "Save Icon As..."
-msgstr "Ikon mentése másként..."
+msgstr "Ikon mentése másként…"
 
 msgid "Set Custom Icon..."
-msgstr "Egyéni ikon beállítása..."
+msgstr "Egyéni ikon beállítása…"
 
 msgid "Change Size"
 msgstr "Méret módosítása"
 
-msgid "Remove Custom Icon"
-msgstr "Egyéni ikon eltávolítása"
-
 msgid "Show All"
 msgstr "Összes megjelenítése"
 
@@ -10563,55 +10782,55 @@ msgid "/_Conversation"
 msgstr "/_Társalgás"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Társalgás/Új azonnali ü_zenet..."
+msgstr "/Társalgás/Új azonnali ü_zenet…"
 
 msgid "/Conversation/_Find..."
-msgstr "/Társalgás/Ker_esés..."
+msgstr "/Társalgás/Ker_esés…"
 
 msgid "/Conversation/View _Log"
 msgstr "/Társalgás/Nap_ló megtekintése"
 
 msgid "/Conversation/_Save As..."
-msgstr "/Társalgás/_Mentés másként..."
+msgstr "/Társalgás/_Mentés másként…"
 
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Társalgás/Elő_zmények törlése"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/Társalgás/Fájl kül_dése..."
+msgstr "/Társalgás/Fájl kül_dése…"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele..."
+msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele…"
 
 msgid "/Conversation/_Get Info"
 msgstr "/Társalgás/_Információ lekérése"
 
 msgid "/Conversation/In_vite..."
-msgstr "/Társalgás/Me_ghívás..."
+msgstr "/Társalgás/Me_ghívás…"
 
 msgid "/Conversation/M_ore"
 msgstr "/Társalgás/_Több"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/Társalgás/Ál_név..."
+msgstr "/Társalgás/Ál_név…"
 
 msgid "/Conversation/_Block..."
-msgstr "/Társalgás/_Tiltás..."
+msgstr "/Társalgás/_Tiltás…"
 
 msgid "/Conversation/_Unblock..."
-msgstr "/Társalgás/_Tiltás feloldása..."
+msgstr "/Társalgás/_Tiltás feloldása…"
 
 msgid "/Conversation/_Add..."
-msgstr "/Társalgás/_Hozzáadás..."
+msgstr "/Társalgás/_Hozzáadás…"
 
 msgid "/Conversation/_Remove..."
-msgstr "/Társalgás/_Eltávolítás..."
+msgstr "/Társalgás/_Eltávolítás…"
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Társalgás/_Hivatkozás beszúrása..."
+msgstr "/Társalgás/_Hivatkozás beszúrása…"
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Társalgás/Ké_p beszúrása..."
+msgstr "/Társalgás/Ké_p beszúrása…"
 
 msgid "/Conversation/_Close"
 msgstr "/Társalgás/_Bezárás"
@@ -10650,37 +10869,37 @@ msgid "/Conversation/View Log"
 msgstr "/Társalgás/Napló megtekintése"
 
 msgid "/Conversation/Send File..."
-msgstr "/Társalgás/Fájl küldése..."
+msgstr "/Társalgás/Fájl küldése…"
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Társalgás/Partnerfigyelmeztetés felvétele..."
+msgstr "/Társalgás/Partnerfigyelmeztetés felvétele…"
 
 msgid "/Conversation/Get Info"
 msgstr "/Társalgás/Információ lekérése"
 
 msgid "/Conversation/Invite..."
-msgstr "/Társalgás/Meghívás..."
+msgstr "/Társalgás/Meghívás…"
 
 msgid "/Conversation/Alias..."
-msgstr "/Társalgás/Álnév..."
+msgstr "/Társalgás/Álnév…"
 
 msgid "/Conversation/Block..."
-msgstr "/Társalgás/Tiltás..."
+msgstr "/Társalgás/Tiltás…"
 
 msgid "/Conversation/Unblock..."
-msgstr "/Társalgás/Tiltás feloldása..."
+msgstr "/Társalgás/Tiltás feloldása…"
 
 msgid "/Conversation/Add..."
-msgstr "/Társalgás/Hozzáadás..."
+msgstr "/Társalgás/Hozzáadás…"
 
 msgid "/Conversation/Remove..."
-msgstr "/Társalgás/Eltávolítás..."
+msgstr "/Társalgás/Eltávolítás…"
 
 msgid "/Conversation/Insert Link..."
-msgstr "/Társalgás/Hivatkozás beszúrása..."
+msgstr "/Társalgás/Hivatkozás beszúrása…"
 
 msgid "/Conversation/Insert Image..."
-msgstr "/Társalgás/Kép beszúrása..."
+msgstr "/Társalgás/Kép beszúrása…"
 
 msgid "/Options/Enable Logging"
 msgstr "/Beállítások/Naplózás engedélyezése"
@@ -10695,7 +10914,7 @@ msgid "/Options/Show Timestamps"
 msgstr "/Beállítások/Időbélyegek mutatása"
 
 msgid "User is typing..."
-msgstr "A felhasználó gépel..."
+msgstr "A felhasználó gépel…"
 
 #, c-format
 msgid ""
@@ -10821,12 +11040,13 @@ msgstr "Hiba "
 msgid "Fatal Error"
 msgstr "Végzetes hiba"
 
-msgid "lead developer"
-msgstr "vezető fejlesztő"
-
 msgid "developer"
 msgstr "fejlesztő"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "támogató"
 
@@ -10858,6 +11078,9 @@ msgstr "XMPP fejlesztő"
 msgid "original author"
 msgstr "eredeti szerző"
 
+msgid "lead developer"
+msgstr "vezető fejlesztő"
+
 msgid "Afrikaans"
 msgstr "afrikaans"
 
@@ -10993,6 +11216,9 @@ msgstr "Holland, flamand"
 msgid "Norwegian Nynorsk"
 msgstr "Norvég Nynorsk"
 
+msgid "Occitan"
+msgstr "Okcitán"
+
 msgid "Punjabi"
 msgstr "Pandzsábi"
 
@@ -11231,25 +11457,37 @@ msgid "_Remove Chat"
 msgstr "_Csevegés eltávolítása"
 
 msgid "Right-click for more unread messages...\n"
-msgstr "További olvasatlan üzenetekért kattintson a jobb egérgombbal...\n"
+msgstr "További olvasatlan üzenetekért kattintson a jobb egérgombbal…\n"
+
+msgid "_Change Status"
+msgstr "Álla_pot módosítása"
+
+msgid "Show Buddy _List"
+msgstr "Partnerlista m_utatása"
+
+msgid "_Unread Messages"
+msgstr "_Olvasatlan üzenetek"
+
+msgid "New _Message..."
+msgstr "Új ü_zenet…"
 
-msgid "Change Status"
-msgstr "Állapot módosítása"
+msgid "_Accounts"
+msgstr "_Fiókok"
 
-msgid "Show Buddy List"
-msgstr "Partnerlista mutatása"
+msgid "Plu_gins"
+msgstr "Bővít_mények"
 
-msgid "New Message..."
-msgstr "Új üzenet..."
+msgid "Pr_eferences"
+msgstr "_Beállítások"
 
-msgid "Mute Sounds"
-msgstr "Hangok némítása"
+msgid "Mute _Sounds"
+msgstr "_Hangok némítása"
 
-msgid "Blink on New Message"
-msgstr "Villogjon új üzenetkor"
+msgid "_Blink on New Message"
+msgstr "_Villogjon új üzenetkor"
 
-msgid "Quit"
-msgstr "Kilépés"
+msgid "_Quit"
+msgstr "_Kilépés"
 
 msgid "Not started"
 msgstr "Nem indult el"
@@ -11363,6 +11601,12 @@ msgstr "Műveletüzenet névszíne"
 msgid "Color to draw the name of an action message."
 msgstr "Műveletüzenet nevének rajzszíne."
 
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Műveletüzenet névszíne suttogott üzenethez"
+
+msgid "Whisper Message Name Color"
+msgstr "Suttogott üzenet névszíne"
+
 msgid "Typing notification color"
 msgstr "Gépelésértesítés színe"
 
@@ -11379,7 +11623,7 @@ msgid "Enable typing notification"
 msgstr "Gépelésértesítés engedélyezése"
 
 msgid "_Copy Email Address"
-msgstr "Email cím _másolása"
+msgstr "E-mail cím _másolása"
 
 msgid "_Open Link in Browser"
 msgstr "Hivatk_ozás megnyitása böngészőben"
@@ -11430,7 +11674,11 @@ msgstr "Kép mentése"
 
 #, c-format
 msgid "_Save Image..."
-msgstr "Kép menté_se..."
+msgstr "Kép menté_se…"
+
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Egyéni hangulatjel hozzáadása…"
 
 msgid "Select Font"
 msgstr "Betűkészlet kiválasztása"
@@ -11469,9 +11717,21 @@ msgstr "A kép tárolása nem sikerült: %s\n"
 msgid "Insert Image"
 msgstr "Kép beszúrása"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Ez a hangulatjel letiltva, mivel már létezik egyéni hangulatjel ehhez a "
+"billentyűparancshoz:\n"
+" %s"
+
 msgid "Smile!"
 msgstr "Mosolyt!"
 
+msgid "_Manage custom smileys"
+msgstr "Egyéni hangulatjelek _kezelése"
+
 msgid "This theme has no available smileys."
 msgstr "Ehhez a témához nem állnak rendelkezésre hangulatjelek."
 
@@ -11598,7 +11858,7 @@ msgid "Delete Log?"
 msgstr "Törli a naplót?"
 
 msgid "Delete Log..."
-msgstr "Napló törlése..."
+msgstr "Napló törlése…"
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -11634,7 +11894,7 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"Használat: %s [KAPCSOLÓ]...\n"
+"Használat: %s [KAPCSOLÓ]…\n"
 "\n"
 "  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
 "  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
@@ -11662,7 +11922,7 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"Használat: %s [KAPCSOLÓ]...\n"
+"Használat: %s [KAPCSOLÓ]…\n"
 "\n"
 "  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
 "  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
@@ -11732,8 +11992,8 @@ msgstr[1] "%s %d új üzenetet kapott."
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>%d új email.</b>"
-msgstr[1] "<b>%d új email.</b>"
+msgstr[0] "<b>%d új e-mail.</b>"
+msgstr[1] "<b>%d új e-mail.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -11851,10 +12111,10 @@ msgid "P_lay a sound"
 msgstr "Hang _lejátszása"
 
 msgid "Brows_e..."
-msgstr "_Tallózás..."
+msgstr "_Tallózás…"
 
 msgid "Br_owse..."
-msgstr "_Tallózás..."
+msgstr "_Tallózás…"
 
 msgid "Pre_view"
 msgstr "_Előnézet"
@@ -12188,6 +12448,12 @@ msgstr "Hangerő:"
 msgid "Play"
 msgstr "Lejátszás"
 
+msgid "_Browse..."
+msgstr "_Tallózás…"
+
+msgid "_Reset"
+msgstr "_Visszaállítás"
+
 msgid "_Report idle time:"
 msgstr "_Inaktivitás idejének jelentése:"
 
@@ -12318,7 +12584,7 @@ msgid "Choose New Name"
 msgstr "Új név választása"
 
 msgid "Select Folder..."
-msgstr "Válasszon mappát..."
+msgstr "Válasszon mappát…"
 
 #. list button
 msgid "_Get List"
@@ -12359,14 +12625,55 @@ msgstr "Menté_s és használat"
 msgid "Status for %s"
 msgstr "%s állapota"
 
+msgid "Custom Smiley"
+msgstr "Egyéni hangulatjel"
+
+msgid "Duplicate Shortcut"
+msgstr "Kettőzött billentyűparancs"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Már létezik egyéni hangulatjel a kiválasztott billentyűparancshoz. Adjon meg "
+"másik billentyűparancsot."
+
+msgid "More Data needed"
+msgstr "További adatok szükségesek"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Adja meg a hangulatjelhez társítandó billentyűparancsot."
+
+msgid "Please select an image for the smiley."
+msgstr "Válassza ki a képet a hangulatjelhez."
+
+msgid "Edit Smiley"
+msgstr "Hangulatjel szerkesztése"
+
+msgid "Add Smiley"
+msgstr "Hangulatjel hozzáadása"
+
+msgid "Smiley _Image"
+msgstr "Hangulatjel _kép"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "_Hangulatjel billentyűparancsa"
+
+msgid "Smiley"
+msgstr "Hangulatjel"
+
+msgid "Custom Smiley Manager"
+msgstr "Egyénihangulatjel-kezelő"
+
 msgid "Waiting for network connection"
 msgstr "Várakozás a hálózati kapcsolatra"
 
 msgid "New status..."
-msgstr "Új állapot..."
+msgstr "Új állapot…"
 
 msgid "Saved statuses..."
-msgstr "Mentett állapotok..."
+msgstr "Mentett állapotok…"
 
 msgid "Status Selector"
 msgstr "Állapotválasztó"
@@ -12571,7 +12878,7 @@ msgid "Buddy is offline"
 msgstr "A partner offline"
 
 msgid "Point values to use when..."
-msgstr "Pontértékek használata, ha..."
+msgstr "Pontértékek használata, ha…"
 
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
@@ -12584,7 +12891,7 @@ msgid "Use last buddy when scores are equal"
 msgstr "Az utolsó partner használata, ha a pontszámok azonosak"
 
 msgid "Point values to use for account..."
-msgstr "Fiókhoz használandó pontértékek..."
+msgstr "Fiókhoz használandó pontértékek…"
 
 #. *< type
 #. *< ui_requirement
@@ -12769,7 +13076,7 @@ msgid "_Associate Buddy"
 msgstr "_Partner összerendelése"
 
 msgid "Unable to send email"
-msgstr "Nem küldhető email"
+msgstr "Nem küldhető e-mail"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
@@ -12777,13 +13084,13 @@ msgstr ""
 "útvonalon."
 
 msgid "An email address was not found for this buddy."
-msgstr "Nem található email cím ehhez a partnerhez."
+msgstr "Nem található e-mail cím ehhez a partnerhez."
 
 msgid "Add to Address Book"
 msgstr "Hozzáadás a címjegyzékhez"
 
 msgid "Send Email"
-msgstr "Email küldése"
+msgstr "E-mail küldése"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -12831,7 +13138,7 @@ msgid "Last name:"
 msgstr "Vezetéknév:"
 
 msgid "Email:"
-msgstr "Email:"
+msgstr "E-mail:"
 
 #. *< type
 #. *< ui_requirement
@@ -13322,7 +13629,7 @@ msgid "_Force 24-hour time format"
 msgstr "24 órás i_dőformátum kényszerítése"
 
 msgid "Show dates in..."
-msgstr "Dátumok megjelenítése..."
+msgstr "Dátumok megjelenítése…"
 
 msgid "Co_nversations:"
 msgstr "_Társalgások:"
diff --git a/po/it.po b/po/it.po
index b49a2d6875..e8bc2ec5ee 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,15 +1,15 @@
 # Pidgin Italian translation
 # Copyright (C) 2002, Salvatore di Maggio <titanicus@libero.it>
-# Copyright (C) 2003-2007, Claudio Satriano <satriano@na.infn.it>
+# Copyright (C) 2003-2008, Claudio Satriano <satriano@na.infn.it>
 #
-# This file is distributed under the same license as the Gaim package.
+# This file is distributed under the same license as the Pidgin package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-12 19:28+0100\n"
-"PO-Revision-Date: 2007-11-12 19:45+0100\n"
+"POT-Creation-Date: 2008-08-15 12:11-0400\n"
+"PO-Revision-Date: 2008-08-14 15:03+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -17,19 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../finch/finch.c:64
-#: ../finch/finch.c:301
-#: ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -47,873 +43,434 @@ msgstr ""
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
-"  -n, --nologin       non effettuare il login automatico  -v, --version       mostra la versione attuale ed esce\n"
-
-#: ../finch/finch.c:328
-#: ../pidgin/gtkmain.c:730
-#, 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 si è imbattuto in un errore nella migrazione delle tue impostazioni da %s a %s. Prova a verificare e completare la migrazione a mano. Per piacere, riporta questo errore su http://developer.pidgin.im"
-
-#: ../finch/gntaccount.c:124
-#: ../finch/gntaccount.c:484
-#: ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433
-#: ../finch/gntblist.c:446
-#: ../finch/gntplugin.c:189
-#: ../finch/gntplugin.c:237
-#: ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1553
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576
-#: ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
+"  -n, --nologin       non effettuare il login automatico  -v, --"
+"version       mostra la versione attuale ed esce\n"
+
+#, 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 si è imbattuto in un errore nella migrazione delle tue impostazioni da %s "
+"a %s. Prova a verificare e completare la migrazione a mano. Per piacere, "
+"riporta questo errore su http://developer.pidgin.im"
+
 msgid "Error"
 msgstr "Errore"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "L'account non è stato aggiunto"
 
-#: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
+msgid "Username of an account must be non-empty."
 msgstr "Il nome utente per un account non può essere vuoto."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notifica i nuovi messaggi di posta"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Ricorda la password"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Non c'è nessun plugin per i protocolli installato."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Hai probabilmente dimenticato il comando 'make install'.)"
 
-#: ../finch/gntaccount.c:496
-#: ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4492
 msgid "Modify Account"
 msgstr "Modifica l'account"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nuovo account"
 
-#: ../finch/gntaccount.c:521
-#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
-msgid "Screen name:"
+msgid "Username:"
 msgstr "Nome utente:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Password:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Crea questo account sul server"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575
-#: ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889
-#: ../finch/gntblist.c:344
-#: ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456
-#: ../finch/gntblist.c:803
-#: ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101
-#: ../finch/gntblist.c:2224
-#: ../finch/gntblist.c:2287
-#: ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:475
-#: ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1105
-#: ../libpurple/account.c:1394
-#: ../libpurple/account.c:1429
-#: ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508
-#: ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804
-#: ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2426
-#: ../libpurple/protocols/jabber/buddy.c:2462
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1035
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/jabber/jabber.c:1746
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:202
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291
-#: ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325
-#: ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363
-#: ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6144
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/silc.c:966
-#: ../libpurple/protocols/silc/silc.c:1174
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:943
-#: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-#: ../libpurple/protocols/yahoo/yahoo.c:3520
-#: ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:6639
-#: ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:787
-#: ../pidgin/gtkdialogs.c:926
-#: ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1038
-#: ../pidgin/gtkdialogs.c:1062
-#: ../pidgin/gtkdialogs.c:1084
-#: ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1173
-#: ../pidgin/gtkdialogs.c:1229
-#: ../pidgin/gtkdialogs.c:1268
-#: ../pidgin/gtkdialogs.c:1295
-#: ../pidgin/gtkimhtmltoolbar.c:437
-#: ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289
-#: ../pidgin/gtkpounce.c:1121
-#: ../pidgin/gtkprivacy.c:565
-#: ../pidgin/gtkprivacy.c:581
-#: ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
-#: ../pidgin/gtkrequest.c:321
-#: ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Annulla"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579
-#: ../finch/gntcertmgr.c:311
-#: ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:475
-#: ../finch/gntpounce.c:478
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055
-#: ../finch/gntstatus.c:488
-#: ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1428
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727
-#: ../pidgin/gtkdebug.c:754
-#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "Salva"
 
-#: ../finch/gntaccount.c:632
-#: ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333
-#: ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro di voler eliminare %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Cancella account"
 
 #. Delete button
-#: ../finch/gntaccount.c:637
-#: ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319
-#: ../finch/gntpounce.c:679
-#: ../finch/gntpounce.c:742
-#: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1912
-#: ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1120
-#: ../pidgin/gtkrequest.c:324
-#: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../finch/gntaccount.c:669
-#: ../finch/gntblist.c:2121
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331
-#: ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Account"
 
-#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puoi abilitare/disabilitare gli account dalla seguente lista."
 
 #. Add button
-#: ../finch/gntaccount.c:698
-#: ../finch/gntaccount.c:888
-#: ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456
-#: ../finch/gntblist.c:2379
-#: ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:385
-#: ../finch/gntpounce.c:726
-#: ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5532
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:6638
-#: ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "Aggiungi"
 
 #. Modify button
-#: ../finch/gntaccount.c:703
-#: ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../finch/gntaccount.c:811
-#: ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha aggiunto %s alla sua lista contatti%s%s"
 
-#: ../finch/gntaccount.c:884
-#: ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Vuoi aggiungere il contatto alla tua lista?"
 
-#: ../finch/gntaccount.c:944
-#: ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s vuole aggiungere %s alla sua lista dei contatti%s%s"
 
-#: ../finch/gntaccount.c:969
-#: ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999
-#: ../pidgin/gtkaccount.c:2580
-#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Autorizzare l'utente?"
 
-#: ../finch/gntaccount.c:976
-#: ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2581
-#: ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Autorizza"
 
-#: ../finch/gntaccount.c:977
-#: ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582
-#: ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Blocca"
 
-#: ../finch/gntblist.c:289
-msgid "You must provide a screename for the buddy."
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"In linea: %d\n"
+"Totale: %d"
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Account: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Visto l'ultima volta: %s fa"
+
+msgid "Default"
+msgstr "Predefinito"
+
+msgid "You must provide a username for the buddy."
 msgstr "Devi scegliere un nome utente per il contatto."
 
-#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "Devi scegliere un gruppo."
 
-#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "Selezionare un account."
 
-#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "L'account selezionato non è in linea."
 
-#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "Errore nell'aggiunta del contatto"
 
-#: ../finch/gntblist.c:325
-#: ../libpurple/protocols/oscar/oscar.c:2898
-#: ../pidgin/gtkaccount.c:1986
-#: ../pidgin/gtksavedstatuses.c:986
-msgid "Screen Name"
+msgid "Username"
 msgstr "Nome utente"
 
-#: ../finch/gntblist.c:328
-#: ../finch/gntblist.c:410
-#: ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1551
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:1037
-#: ../pidgin/gtkdialogs.c:1061
-#: ../pidgin/gtkdialogs.c:1083
-#: ../pidgin/gtkrequest.c:328
-msgid "Alias"
-msgstr "Alias"
+msgid "Alias (optional)"
+msgstr "Alias (opzionale)"
 
-#: ../finch/gntblist.c:331
-#: ../finch/gntblist.c:413
-msgid "Group"
-msgstr "Gruppo"
+msgid "Add in group"
+msgstr "Aggiungi nel gruppo"
 
-#: ../finch/gntblist.c:335
-#: ../finch/gntblist.c:401
-#: ../finch/gntblist.c:1305
-#: ../finch/gntblist.c:2210
-#: ../finch/gntblist.c:2274
-#: ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3242
-#: ../pidgin/gtknotify.c:512
-#: ../pidgin/gtkpounce.c:1288
-#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Account"
 
-#: ../finch/gntblist.c:341
-#: ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
-#: ../pidgin/gtkblist.c:6140
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Aggiungi un contatto"
 
-#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "Inserisci le informazioni sul contatto."
 
-#: ../finch/gntblist.c:370
-#: ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Chat"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407
-#: ../finch/gntblist.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:951
-#: ../libpurple/protocols/jabber/jabber.c:954
-#: ../libpurple/protocols/msn/msn.c:1732
-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44
-#: ../pidgin/gtkplugin.c:608
-#: ../pidgin/gtkroomlist.c:931
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:416
-#: ../finch/gntblist.c:819
+msgid "Alias"
+msgstr "Alias"
+
+msgid "Group"
+msgstr "Gruppo"
+
 msgid "Auto-join"
 msgstr "Entra automaticamente"
 
-#: ../finch/gntblist.c:419
-#: ../finch/gntblist.c:854
-#: ../pidgin/gtkblist.c:6524
 msgid "Add Chat"
 msgstr "Aggiungi una chat"
 
-#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
-msgstr "Puoi inserire maggiori informazioni successivamente dal menù contestuale."
+msgstr ""
+"Puoi inserire maggiori informazioni successivamente dal menù contestuale."
 
-#: ../finch/gntblist.c:433
-#: ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Errore nell'aggiunta del gruppo"
 
-#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "Specificare un nome per il gruppo da aggiungere."
 
-#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "Esiste già una gruppo con questo nome."
 
-#: ../finch/gntblist.c:454
-#: ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530
-#: ../pidgin/gtkblist.c:6635
 msgid "Add Group"
 msgstr "Aggiungi un gruppo"
 
-#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "Inserisci il nome del gruppo"
 
-#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "Modifica la chat"
 
-#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "Aggiorna i campi obbligatori."
 
-#: ../finch/gntblist.c:803
-#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "Modifica le impostazioni"
 
-#: ../finch/gntblist.c:864
-#: ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "Informazione"
 
-#: ../finch/gntblist.c:864
-#: ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "Scaricamento in corso..."
 
-#: ../finch/gntblist.c:904
-#: ../finch/gntconv.c:528
-#: ../libpurple/protocols/silc/chat.c:903
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "Aggiungi un allarme"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915
-#: ../finch/gntconv.c:540
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654
-#: ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Invia file"
 
-#: ../finch/gntblist.c:919
+msgid "Blocked"
+msgstr "Bloccato"
+
 msgid "View Log"
 msgstr "Mostra il log"
 
-#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Inserire un nuovo nome per %s"
 
-#: ../finch/gntblist.c:1002
-#: ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Rinomina"
 
-#: ../finch/gntblist.c:1002
 msgid "Set Alias"
 msgstr "Imposta un alias"
 
-#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "Inserisci una stringa vuota per resettare il nome."
 
-#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "La rimozione di questo gruppo comporterà l'eliminazione di tutti i contatti appartenenti al gruppo"
+msgstr ""
+"La rimozione di questo gruppo comporterà l'eliminazione di tutti i contatti "
+"appartenenti al gruppo"
 
-#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "La rimozione di questo gruppo comporterà l'eliminazione di tutti i contatti appartenenti al gruppo"
+msgstr ""
+"La rimozione di questo gruppo comporterà l'eliminazione di tutti i contatti "
+"appartenenti al gruppo"
 
-#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Sei sicuro di voler rimuovere %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "Conferma rimozione"
 
-#: ../finch/gntblist.c:1100
-#: ../finch/gntblist.c:1252
-#: ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710
-#: ../pidgin/gtkrequest.c:326
-#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226
-#: ../finch/gntblist.c:2432
-#: ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83
-#: ../pidgin/gtkblist.c:2908
-#: ../pidgin/gtkblist.c:4898
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista contatti"
 
-#: ../finch/gntblist.c:1257
-#, fuzzy
 msgid "Place tagged"
-msgstr "Posti in cui hai vissuto"
+msgstr "Luogo etichettato"
 
-#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
-msgstr ""
+msgstr "Mostra/nascondi etichetta"
 
 #. General
-#: ../finch/gntblist.c:1298
-#: ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052
-#: ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2409
-#: ../libpurple/protocols/jabber/jabber.c:964
-#: ../libpurple/protocols/jabber/jabber.c:1573
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/msn/msn.c:1559
-#: ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
-#: ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "Nickname"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1320
-#: ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611
-#: ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2842
-#: ../libpurple/protocols/oscar/oscar.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3108
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3294
-#: ../pidgin/gtkblist.c:3700
-#: ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "Inattivo"
 
-#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr "Al cellulare"
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"In linea: %d\n"
-"Totale: %d"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Account: %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Visto l'ultima volta: %s fa"
-
-#: ../finch/gntblist.c:1704
-#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nuovo..."
 
-#: ../finch/gntblist.c:1711
-#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Salvato..."
 
-#: ../finch/gntblist.c:2089
-#: ../finch/gntplugin.c:345
-#: ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716
-#: ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../finch/gntblist.c:2218
-#: ../pidgin/gtkdialogs.c:781
-msgid "New Instant Message"
-msgstr "Nuovo messaggio immediato"
+msgid "Block/Unblock"
+msgstr "Blocca/Sblocca"
 
-#: ../finch/gntblist.c:2220
-#: ../pidgin/gtkdialogs.c:783
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Inserisci il nome utente o l'alias della persona alla quale vuoi inviare un messaggio immediato."
+msgid "Block"
+msgstr "Blocca"
+
+msgid "Unblock"
+msgstr "Sblocca"
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"Inserisci il nome utente o l'alias della persona che vuoi bloccare/sbloccare."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223
-#: ../finch/gntcertmgr.c:90
-#: ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80
-#: ../libpurple/account.c:1104
-#: ../libpurple/account.c:1393
-#: ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1745
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290
-#: ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324
-#: ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6143
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
-#: ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:786
-#: ../pidgin/gtkdialogs.c:925
-#: ../pidgin/gtkdialogs.c:1017
-#: ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2270
-#, fuzzy
+msgid "New Instant Message"
+msgstr "Nuovo messaggio immediato"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+"Inserisci il nome utente o l'alias della persona alla quale vuoi inviare un "
+"messaggio immediato."
+
 msgid "Channel"
-msgstr "_Canale:"
+msgstr "Canale"
 
-#: ../finch/gntblist.c:2282
-#: ../pidgin/gtkblist.c:940
 msgid "Join a Chat"
 msgstr "Entra in chat"
 
-#: ../finch/gntblist.c:2284
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "Immetti l'URL del collegamento che vuoi inserire."
+msgstr "Immetti il nome della chat nella quale vuoi entrare."
 
-#: ../finch/gntblist.c:2286
-#: ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Entra"
 
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Inserisci il nome utente o l'alias della persona della quale vuoi vedere il "
+"log."
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324
-#: ../finch/gntpounce.c:460
-#: ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Invia MI..."
 
-#: ../finch/gntblist.c:2335
+msgid "Block/Unblock..."
+msgstr "Blocca/Sblocca..."
+
 msgid "Join Chat..."
 msgstr "Entra in chat..."
 
-#: ../finch/gntblist.c:2340
+msgid "View Log..."
+msgstr "Mostra log..."
+
+msgid "View All Logs"
+msgstr "Mostra tutti i log"
+
 msgid "Show"
 msgstr "Mostra"
 
-#: ../finch/gntblist.c:2345
 msgid "Empty groups"
 msgstr "Gruppi vuoti"
 
-#: ../finch/gntblist.c:2352
 msgid "Offline buddies"
 msgstr "Contatti non in linea"
 
-#: ../finch/gntblist.c:2359
 msgid "Sort"
 msgstr "Ordina"
 
-#: ../finch/gntblist.c:2364
 msgid "By Status"
 msgstr "Per stato"
 
-#: ../finch/gntblist.c:2369
-#: ../pidgin/gtkblist.c:4191
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../finch/gntblist.c:2374
 msgid "By Log Size"
 msgstr "Per dimensione del log"
 
-#: ../finch/gntcertmgr.c:86
-#: ../pidgin/gtkcertmgr.c:188
+msgid "Buddy"
+msgstr "Contatto"
+
+msgid "Chat"
+msgstr "Chat"
+
+msgid "Grouping"
+msgstr "Raggruppamento"
+
 msgid "Certificate Import"
 msgstr "Importazione certificato"
 
-#: ../finch/gntcertmgr.c:87
-#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Specifica un nome host"
 
-#: ../finch/gntcertmgr.c:88
-#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Immetti il nome dell'host al quale è associato questo certificato."
 
-#: ../finch/gntcertmgr.c:97
-#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 "Impossibile importare il file %s.\n"
-"Assicurati che il file abbia i permessi di lettura e che sia in formato PEM.\n"
+"Assicurati che il file abbia i permessi di lettura e che sia in formato "
+"PEM.\n"
 
-#: ../finch/gntcertmgr.c:99
-#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Errore nell'importazione del certificato"
 
-#: ../finch/gntcertmgr.c:100
-#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Importazione del certificato X.509 fallita"
 
-#: ../finch/gntcertmgr.c:110
-#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Scegli un certificato PEM"
 
-#: ../finch/gntcertmgr.c:127
-#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -922,27 +479,19 @@ msgstr ""
 "Esportazione nel file %s fallita.\n"
 "Controlla di avere i permessi di scrittura per il percorso scelto\n"
 
-#: ../finch/gntcertmgr.c:129
-#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Errore nell'esportazione del certificato"
 
-#: ../finch/gntcertmgr.c:130
-#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Esportazione del certificato X.509 fallita"
 
-#: ../finch/gntcertmgr.c:159
-#: ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr "Esporta certificato PEM X.509"
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificato per %s"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -955,128 +504,91 @@ msgstr ""
 "Impronta SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr "Certificato host SSL"
 
-#: ../finch/gntcertmgr.c:233
-#: ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Cancellare il certificato di %s?"
 
-#: ../finch/gntcertmgr.c:236
-#: ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr "Conferma cancellazione certificato"
 
-#: ../finch/gntcertmgr.c:293
-#: ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
 msgstr "Gestione certificati"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298
-#: ../libpurple/protocols/bonjour/bonjour.c:670
-#: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nome host"
 
-#: ../finch/gntcertmgr.c:315
-#: ../finch/gntnotify.c:388
-#: ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:840
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324
-#: ../finch/gntft.c:237
-#: ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:213
-#: ../finch/gntplugin.c:406
-#: ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
-#: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s si è disconnesso."
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"Finch non proverà a riconnettere l'account finché l'errore non sarà corretto dall'utente e l'account riabilitato."
+"Finch non proverà a riconnettere l'account finché l'errore non sarà corretto "
+"dall'utente e l'account riabilitato."
 
-#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "Riabilita l'account"
 
-#: ../finch/gntconv.c:137
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"Questo account è stato disconnesso e non sei più in chat. Rientrerai "
+"automaticamente nella chat non appena l'account si riconnetterà."
+
 msgid "No such command."
 msgstr "Comando inesistente."
 
-#: ../finch/gntconv.c:141
-#: ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Errore di sintassi: È stato digitato un numero sbagliato di argomenti per questo comando."
+msgstr ""
+"Errore di sintassi: È stato digitato un numero sbagliato di argomenti per "
+"questo comando."
 
-#: ../finch/gntconv.c:146
-#: ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Il comando non ha funzionato per un motivo sconosciuto."
 
-#: ../finch/gntconv.c:151
-#: ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Il comando funziona solo per le chat, non per i MI."
 
-#: ../finch/gntconv.c:154
-#: ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Il comando funziona solo per i MI, non per le chat."
 
-#: ../finch/gntconv.c:158
-#: ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Il comando non funziona con questo protocollo."
 
-#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
 msgstr "Il messaggio non è stato inviato perché non sei connesso."
 
-#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:273
-#: ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -1085,70 +597,72 @@ msgstr ""
 "\n"
 "%s sta scrivendo..."
 
-#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "Hai lasciato questa chat."
 
-#: ../finch/gntconv.c:408
-#: ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Log avviato. Sarà effettuato il log dei nuovi messaggi di questa conversazione."
+msgstr ""
+"Log avviato. Sarà effettuato il log dei nuovi messaggi di questa "
+"conversazione."
 
-#: ../finch/gntconv.c:414
-#: ../pidgin/gtkconv.c:1424
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Log fermato. Non sarà effettuato il log dei nuovi messaggi di questa conversazione."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Log fermato. Non sarà effettuato il log dei nuovi messaggi di questa "
+"conversazione."
 
-#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "Invia a"
 
-#: ../finch/gntconv.c:507
+msgid "Invite message"
+msgstr "Messaggio di invito"
+
+msgid "Invite"
+msgstr "Invita"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Inserisci il nome del contatto che vuoi invitare,\n"
+"insieme a un messaggio di invito (opzionale)."
+
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "/Conversazione/Cancella lo storico"
 
-#: ../finch/gntconv.c:517
-#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Mostra i timestamp"
 
-#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "Aggiungi un allarme..."
 
-#: ../finch/gntconv.c:548
+msgid "Invite..."
+msgstr "Invita..."
+
 msgid "Enable Logging"
 msgstr "Abilita il log"
 
-#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
 msgstr "Abilita i suoni"
 
-#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<RISPOSTA AUTOMATICA>"
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:883
-msgid "List of users:\n"
-msgstr "Elenco degli utenti:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lista di %d utente:\n"
+msgstr[1] "Lista di %d utenti:\n"
 
-#: ../finch/gntconv.c:1045
-#: ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Le opzioni di debug supportate sono: version"
 
-#: ../finch/gntconv.c:1081
-#: ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Comando inesistente (in questo contesto)."
 
-#: ../finch/gntconv.c:1084
-#: ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1156,70 +670,82 @@ msgstr ""
 "Usa \"/help &lt;comando&gt;\" per ottenere aiuto su un comando specifico.\n"
 "I seguenti comandi sono disponibili in questo contesto:\n"
 
-#: ../finch/gntconv.c:1142
-#: ../pidgin/gtkconv.c:7755
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;message&gt;: Invia un messaggio normalmente, come se non stessi utilizzando un comando."
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s non è una classe di messaggio valida. Usa '/help msgcolor' per un elenco "
+"delle classi di messaggio valide."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s non è un colore valido. Usa '/help msgcolor' per un elenco di colori "
+"validi."
+
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;message&gt;: Invia un messaggio normalmente, come se non stessi "
+"utilizzando un comando."
 
-#: ../finch/gntconv.c:1145
-#: ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;azione&gt;: Invia un'azione in stile IRC ad un contatto o ad una chat."
+msgstr ""
+"me &lt;azione&gt;: Invia un'azione in stile IRC ad un contatto o ad una chat."
 
-#: ../finch/gntconv.c:1148
-#: ../pidgin/gtkconv.c:7761
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "debug &lt;opzione&gt;: Invia diverse informazioni di debug alla conversazione corrente."
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;opzione&gt;: Invia diverse informazioni di debug alla "
+"conversazione corrente."
 
-#: ../finch/gntconv.c:1151
-#: ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: cancella lo storico della conversazione."
 
-#: ../finch/gntconv.c:1154
-#: ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;: Aiuto su un comando specifico."
 
-#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "users: mostra la lista degli utenti della chat."
 
-#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostra la finestra dei plugin."
 
-#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra la lista contatti."
 
-#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Mostra la finestra degli account."
 
-#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Mostra la finestra di debug."
 
-#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefs: Mostra la finestra delle preferenze."
 
-#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Mostra la finestra dei messaggi di stato salvati."
 
-#: ../finch/gntdebug.c:231
-#: ../pidgin/gtkconv.c:989
-#: ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:220
-#: ../pidgin/gtkft.c:543
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;classe&gt; &lt;foreground&gt; &lt;background&gt;: Imposta il "
+"colore per le diverse classi di messaggio nella finestra di conversazione."
+"<br>    &lt;classe&gt;: receive, send, highlight, action, timestamp<br>    "
+"&lt;foreground/background&gt;: black, red, green, blue, white, gray, "
+"darkgray, magenta, cyan, default<br><br>ESEMPIO:<br>    msgcolor send cyan "
+"default"
+
 msgid "Unable to open file."
 msgstr "Impossibile aprire il file."
 
-#: ../finch/gntdebug.c:271
-#: ../finch/gntui.c:86
-#: ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
@@ -1227,222 +753,190 @@ msgstr "Finestra di debug"
 #. * 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:292
-#: ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../finch/gntdebug.c:309
-#: ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../finch/gntft.c:118
-#: ../pidgin/gtkft.c:229
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Trasferimento file - %d%% di %d file"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Trasferimento file - %d%% di %d file"
+msgstr[1] "Trasferimento file - %d%% di %d file"
 
 #. Create the window.
-#: ../finch/gntft.c:123
-#: ../finch/gntft.c:196
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234
-#: ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Trasferimento file"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nome file"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Velocità"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Rimanente"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201
-#: ../finch/gntstatus.c:547
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:362
-#: ../libpurple/protocols/gg/gg.c:1041
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/msn/msn.c:621
-#: ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636
-#: ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2710
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
-#: ../pidgin/gtkblist.c:3338
-#: ../pidgin/gtkblist.c:3352
-#: ../pidgin/gtkblist.c:3354
-#: ../pidgin/gtksavedstatuses.c:1005
-#: ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "Stato"
 
-#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
-msgstr "Chiudi questa finestra quando tutti i trasferimenti sono stati completati"
+msgstr ""
+"Chiudi questa finestra quando tutti i trasferimenti sono stati completati"
 
-#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Pulisci i trasferimenti ultimati"
 
-#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Stop"
 
-#: ../finch/gntft.c:305
-#: ../pidgin/gtkft.c:169
-#: ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "In attesa dell'inizio del trasferimento"
 
-#: ../finch/gntft.c:372
-#: ../pidgin/gtkft.c:166
-#: ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Annullato"
 
-#: ../finch/gntft.c:374
-#: ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Fallito"
 
-#: ../finch/gntft.c:420
-#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+msgid "Sent"
+msgstr "Inviati"
+
+msgid "Received"
+msgstr "Ricevuti"
+
+msgid "Finished"
+msgstr "Completato"
+
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Il file è stato salvato col nome %s."
 
-#: ../finch/gntft.c:432
-#: ../finch/gntft.c:433
-#: ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
-msgid "Finished"
-msgstr "Completato"
+msgid "Sending"
+msgstr "Invio in corso"
 
-#: ../finch/gntft.c:437
-#: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:357
-msgid "Transferring"
-msgstr "Trasferimento in corso"
+msgid "Receiving"
+msgstr "Ricezione in corso"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Conversazioni in %s su %s"
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Conversazioni con %s su %s"
+
+msgid "%B %Y"
+msgstr ""
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Il log degli eventi di sistema è effettuato soltanto se è abilitata "
+"l'opzione \"Registra nel log di sistema tutti i cambiamenti di stato\"."
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Il log dei messaggi immediati è effettuato soltanto se è abilitata l'opzione "
+"\"Effettua il log di tutti messaggi immediati\"."
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Il log delle chat è effettuato soltanto se è abilitata l'opzione \"Effettua "
+"il log di tutte le chat\"."
+
+msgid "No logs were found"
+msgstr "Nessun log trovato"
+
+msgid "Total log size:"
+msgstr "Dimensione totale del log:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "Scorri/cerca:"
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "Conversazioni in %s"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "Conversazioni con %s"
+
+msgid "All Conversations"
+msgstr "Tutte le conversazioni"
+
+msgid "System Log"
+msgstr "Log di sistema"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Email"
 
-#: ../finch/gntnotify.c:171
-#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "C'è posta per te!"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "Mittente"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) ha %d nuovo messaggio."
 msgstr[1] "%s (%s) ha %d nuovi messaggi."
 
-#: ../finch/gntnotify.c:226
-#: ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "C'è posta per te"
 
-#: ../finch/gntnotify.c:291
-#: ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "Informazioni per %s"
 
-#: ../finch/gntnotify.c:292
-#: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "Informazioni sul contatto"
 
-#: ../finch/gntnotify.c:382
-#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continua"
 
-#: ../finch/gntnotify.c:391
-#: ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Messaggio"
 
-#: ../finch/gntnotify.c:397
-#: ../libpurple/protocols/sametime/sametime.c:3515
-msgid "Invite"
-msgstr "Invita"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: ../finch/gntplugin.c:77
-#: ../finch/gntplugin.c:86
+msgid "URI"
+msgstr "URI"
+
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "impossibile caricare il plugin"
 
-#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "rimozione del plugin fallita"
 
-#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1459,39 +953,32 @@ msgstr ""
 "Sito web: %s\n"
 "Nome file: %s\n"
 
-#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "È necessario caricare il plugin prima di poterlo configurare."
 
-#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "Nessuna opzione di configurazione per questo plugin."
 
-#: ../finch/gntplugin.c:259
 msgid "Error loading plugin"
 msgstr "Errore nel caricamento del plugin"
 
-#: ../finch/gntplugin.c:260
 msgid "The selected file is not a valid plugin."
 msgstr "Il file selezionato non è un plugin valido."
 
-#: ../finch/gntplugin.c:261
-msgid "Please open the debug window and try again to see the exact error message."
+msgid ""
+"Please open the debug window and try again to see the exact error message."
 msgstr ""
+"Apri la finestra di debug e riprova per vedere il messaggio di errore esatto."
 
-#: ../finch/gntplugin.c:324
 msgid "Select plugin to install"
 msgstr "Scegli il plugin da installare"
 
-#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "Puoi caricare/rimuovere i plugin della seguente lista."
 
-#: ../finch/gntplugin.c:401
 msgid "Install Plugin..."
-msgstr ""
+msgstr "Installa plugin..."
 
-#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "Configura il plugin"
 
@@ -1500,415 +987,290 @@ msgstr "Configura il plugin"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:467
-#: ../finch/gntplugin.c:474
-#: ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90
-#: ../pidgin/gtkdocklet.c:717
-#: ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../finch/gntpounce.c:194
-#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Inserisci il nome di un utente."
 
-#: ../finch/gntpounce.c:339
-#: ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "Nuovo allarme"
 
-#: ../finch/gntpounce.c:339
-#: ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "Modifica l'allarme"
 
-#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Contatto da controllare"
 
 #. Account:
-#: ../finch/gntpounce.c:347
-#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Account:"
 
-#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Nome del contatto:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387
-#: ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "Controlla se il contatto..."
 
-#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "Si connette"
 
-#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "Si disconnette"
 
-#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "È assente"
 
-#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "Ritorna dall'assenza"
 
-#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "Diventa inattivo"
 
-#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "Ritorna attivo"
 
-#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Inizia a scrivere"
 
-#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "Interrompe la scrittura"
 
-#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "Smette di scrivere"
 
-#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "Invia un messaggio"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427
-#: ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "Azione"
 
-#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "Apri una finestra di conversazione"
 
-#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Notifica con un popup"
 
-#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Invia un messaggio"
 
-#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "Esegui un comando"
 
-#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Riproduci un suono"
 
-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
+msgid "Pounce only when my status is not Available"
 msgstr "Genera allarmi solo quando il mio stato è \"non disponibile\""
 
-#: ../finch/gntpounce.c:463
-#: ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
 msgstr "Ricorrente"
 
-#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
 msgstr "Impossibile creare l'allarme"
 
-#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr "Non hai nessun account."
 
-#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr "Prima di poter creare un allarme, devi creare un account."
 
-#: ../finch/gntpounce.c:675
-#: ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Sei sicuro di voler eliminare l'allarme su %s per %s?"
 
-#: ../finch/gntpounce.c:709
-#: ../finch/gntui.c:84
-#: ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "Allarmi"
 
-#: ../finch/gntpounce.c:823
-#: ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha iniziato a scriverti (%s)"
 
-#: ../finch/gntpounce.c:825
-#: ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s si è fermato mentre scriveva un messaggio per te (%s)"
 
-#: ../finch/gntpounce.c:827
-#: ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s si è connesso (%s)"
 
-#: ../finch/gntpounce.c:829
-#: ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s è tornato attivo (%s)"
 
-#: ../finch/gntpounce.c:831
-#: ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s è di nuovo presente (%s)"
 
-#: ../finch/gntpounce.c:833
-#: ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha smesso di scriverti (%s)"
 
-#: ../finch/gntpounce.c:835
-#: ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s si è disconnesso (%s)"
 
-#: ../finch/gntpounce.c:837
-#: ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s è diventato inattivo (%s)"
 
-#: ../finch/gntpounce.c:839
-#: ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s è andato via. (%s)"
 
-#: ../finch/gntpounce.c:841
-#: ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ti ha inviato un messaggio. (%s)"
 
-#: ../finch/gntpounce.c:842
-#: ../pidgin/gtkpounce.c:1499
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Sulla base dell'utilizzo della tastiera"
 
-#: ../finch/gntprefs.c:94
-#: ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "Dall'ultimo messaggio inviato"
 
-#: ../finch/gntprefs.c:96
-#: ../pidgin/gtkprefs.c:900
-#: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:2030
-#: ../pidgin/gtkprefs.c:2044
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mai"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Mostra tempi di inattività"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Mostra i contatti non in linea"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Segnala ai contatti che stai scrivendo"
 
-#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Formato del log"
 
-#: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr "Effettua il log dei messaggi immediati"
 
-#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "Esegui il log delle chat"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Registra nel log di sistema i cambiamenti di stato"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Mostra i tempi di inattività"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Modifica lo stato quando sei inattivo"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minuti prima di modificare lo stato:"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Cambia lo stato in"
 
 #. Conversations
-#: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:995
-#: ../pidgin/gtkprefs.c:2135
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversazioni"
 
-#: ../finch/gntprefs.c:260
-#: ../pidgin/gtkprefs.c:1563
-#: ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "Log"
 
-#: ../finch/gntrequest.c:585
+msgid "You must fill all the required fields."
+msgstr "Devi riempire tutti i campi richiesti."
+
+msgid "The required fields are underlined."
+msgstr "I file richiesti sono sottolineati."
+
 msgid "Not implemented yet."
 msgstr "Non ancora implementato."
 
-#: ../finch/gntrequest.c:661
-#: ../pidgin/gtkrequest.c:1699
-#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "Salva il file..."
 
-#: ../finch/gntrequest.c:661
-#: ../pidgin/gtkrequest.c:1700
-#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "Apri il file..."
 
-#: ../finch/gntsound.c:97
-#: ../pidgin/gtksound.c:62
+msgid "Choose Location..."
+msgstr "Scegli posizione..."
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Premi 'Invio' per cercare più stanze appartenenti a questa categoria."
+
+msgid "Get"
+msgstr "Ottieni"
+
+#. Create the window.
+msgid "Room List"
+msgstr "Lista delle stanze"
+
 msgid "Buddy logs in"
 msgstr "Il contatto è connesso"
 
-#: ../finch/gntsound.c:98
-#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Il contatto è disconnesso"
 
-#: ../finch/gntsound.c:99
-#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Messaggio ricevuto"
 
-#: ../finch/gntsound.c:100
-#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Il messaggio ricevuto inizia la conversazione"
 
-#: ../finch/gntsound.c:101
-#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: ../finch/gntsound.c:102
-#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Una persona entra in chat"
 
-#: ../finch/gntsound.c:103
-#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Una persona abbandona la chat"
 
-#: ../finch/gntsound.c:104
-#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Stai parlando in chat"
 
-#: ../finch/gntsound.c:105
-#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Qualcun altro parla in chat"
 
-#: ../finch/gntsound.c:107
-#: ../pidgin/gtksound.c:73
-msgid "Someone says your screen name in chat"
-msgstr "Qualcuno pronuncia il tuo nome in chat"
+msgid "Someone says your username in chat"
+msgstr "Qualcuno pronuncia il tuo nome in una chat"
 
-#: ../finch/gntsound.c:361
-#: ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "Errore di GStreamer"
 
-#: ../finch/gntsound.c:362
-#: ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "Impossibile inizializzare GStreamer."
 
-#: ../finch/gntsound.c:716
-#: ../finch/gntsound.c:802
-#: ../pidgin/gtkprefs.c:1687
-#: ../pidgin/gtkprefs.c:1776
-#: ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(predefinito)"
 
-#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr "Scegli un file audio..."
 
-#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "Preferenze audio"
 
-#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../finch/gntsound.c:954
-#: ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr "Bip di console"
 
-#: ../finch/gntsound.c:958
-#: ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "Comando"
 
-#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "Nessun suono"
 
-#: ../finch/gntsound.c:961
-#: ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "Metodo del suono"
 
-#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "Metodo:"
 
-#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1918,95 +1280,57 @@ msgstr ""
 "(%s per il nome del file)"
 
 #. Sound options
-#: ../finch/gntsound.c:981
-#: ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "Opzioni suono"
 
-#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
-msgstr "Riproduci i suoni quando la finestra di conversazione va in primo piano"
-
-#: ../finch/gntsound.c:990
-#: ../pidgin/gtkprefs.c:898
-#: ../pidgin/gtkprefs.c:910
-#: ../pidgin/gtkprefs.c:1863
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgstr ""
+"Riproduci i suoni quando la finestra di conversazione va in primo piano"
+
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:991
-#: ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "Solo quando sei disponibile"
 
-#: ../finch/gntsound.c:992
-#: ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "Solo quando non sei disponibile"
 
-#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Volume (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018
-#: ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "Eventi sonori"
 
-#: ../finch/gntsound.c:1020
-#: ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Evento"
 
-#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "File"
 
-#: ../finch/gntsound.c:1039
-#: ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1042
-#: ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Pulisci"
 
-#: ../finch/gntsound.c:1045
-#: ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Scegli..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Sei sicuro di voler eliminare \"%s\""
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Cancella lo stato"
 
-#: ../finch/gntstatus.c:176
-#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Messaggi di stato salvati"
 
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/msn/msn.c:725
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titolo"
 
-#: ../finch/gntstatus.c:183
-#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipo"
 
@@ -2018,381 +1342,274 @@ msgstr "Tipo"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:564
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:274
-#: ../libpurple/protocols/bonjour/bonjour.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:364
-#: ../libpurple/protocols/gg/gg.c:1079
-#: ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605
-#: ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621
-#: ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635
-#: ../libpurple/protocols/irc/irc.c:238
-#: ../libpurple/protocols/jabber/jabber.c:1570
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1598
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/msn/msn.c:677
-#: ../libpurple/protocols/msn/msn.c:683
-#: ../libpurple/protocols/msn/msn.c:689
-#: ../libpurple/protocols/msn/msn.c:695
-#: ../libpurple/protocols/msn/msn.c:700
-#: ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/oscar/oscar.c:5822
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5852
-#: ../libpurple/protocols/oscar/oscar.c:5859
-#: ../libpurple/protocols/oscar/oscar.c:5866
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
-#: ../libpurple/protocols/yahoo/yahoo.c:3768
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526
-#: ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "Messaggio:"
 
 #. Use
-#: ../finch/gntstatus.c:194
-#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Utilizza"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Titolo non valido"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Inserisci un titolo non vuoto per lo stato."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Titolo già esistente"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Inserisci un titolo differente per lo stato."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Sotto-stato"
 
-#: ../finch/gntstatus.c:464
-#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Messaggio:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Modifica lo stato"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Utilizza uno stato differente per i seguenti account"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Salva e utilizza"
 
-#: ../finch/gntui.c:85
 msgid "Certificates"
 msgstr "Certificati"
 
-#: ../finch/gntui.c:89
-#: ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Suoni"
 
-#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Messaggi di stato"
 
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Errore nel caricamento del plugin."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Impossibile trovare il display X"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Impossibile trovare la finestra"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "Questo plugin non può essere caricato perché non è stato compilato con il supporto X11."
+msgstr ""
+"Questo plugin non può essere caricato perché non è stato compilato con il "
+"supporto X11."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:160
 #, fuzzy
 msgid "Clipboard plugin"
-msgstr "Plugin"
+msgstr "Configura il plugin"
 
-#: ../finch/plugins/gntclipboard.c:161
-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 ""
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s si è appena connesso"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s si è appena disconnesso"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s ti ha inviato un messaggio"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s ha pronunciato il tuo nick in %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s ha inviato un messaggio in %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Il contatto si connette/disconnette"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Ricevi un MI"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Qualcuno parla in una chat"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Qualcuno pronuncia il tuo nome in una chat"
 
-#: ../finch/plugins/gntgf.c:336
+#, fuzzy
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "Segnala ai contatti che stai scrivendo"
 
-#: ../finch/plugins/gntgf.c:351
+#, fuzzy
 msgid "Beep too!"
-msgstr ""
+msgstr "Bip di console"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Imposta lo stato URGENTE per la finestra del terminale."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
 #, fuzzy
 msgid "Toaster plugin"
-msgstr "Notifiche per Gaim-Text."
+msgstr "Configura il plugin"
 
-#: ../finch/plugins/gnthistory.c:116
-#: ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversazioni con %s su %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138
-#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Il plugin storico richiede che il log sia attivo"
 
-#: ../finch/plugins/gnthistory.c:139
-#: ../pidgin/plugins/history.c:154
 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 ""
-"Il log delle conversazioni può essere abilitato da Strumenti -> Preferenze -> Log.\n"
+"Il log delle conversazioni può essere abilitato da Strumenti -> Preferenze -"
+"> Log.\n"
 "\n"
-"L'abilitazione del log per i messaggi immediati e/o per le chat attiverà lo storico per il corrispondente tipo di conversazione."
+"L'abilitazione del log per i messaggi immediati e/o per le chat attiverà lo "
+"storico per il corrispondente tipo di conversazione."
 
-#: ../finch/plugins/gnthistory.c:179
 #, fuzzy
 msgid "GntHistory"
 msgstr "Storico"
 
-#: ../finch/plugins/gnthistory.c:181
-#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Mostra le conversazioni registrate di recente nelle nuove finestre di conversazione."
+msgstr ""
+"Mostra le conversazioni registrate di recente nelle nuove finestre di "
+"conversazione."
 
-#: ../finch/plugins/gnthistory.c:182
-#: ../pidgin/plugins/history.c:198
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "Quando viene aperta una nuova conversazione, questo plugin inserirà l'ultima conversazione in quella corrente."
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Quando viene aperta una nuova conversazione, questo plugin inserirà l'ultima "
+"conversazione in quella corrente."
 
-#: ../finch/plugins/lastlog.c:69
-msgid "Lastlog"
+#, c-format
+msgid "Online"
+msgstr "Online"
+
+msgid "Offline"
+msgstr "Non connesso"
+
+msgid "Online Buddies"
+msgstr "Contatti in linea"
+
+msgid "Offline Buddies"
+msgstr "Contatti non in linea"
+
+msgid "Online/Offline"
+msgstr " In linea/Non in linea"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "Nessun raggruppamento"
+
+msgid "Provides alternate buddylist grouping options."
 msgstr ""
+"Fornisce opzioni alternative per il raggruppamento dei contatti nella lista."
+
+msgid "Lastlog"
+msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog: cerca una sottostringa nel registro della conversazione."
 
-#: ../finch/plugins/lastlog.c:122
 #, fuzzy
 msgid "GntLastlog"
 msgstr "Storico"
 
-#: ../finch/plugins/lastlog.c:124
-#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "Plugin Lastlog"
 
-#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "account"
 
-#: ../libpurple/account.c:1050
-#: ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "È richiesta una password per il login."
 
-#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Inserisci la password per %s (%s)"
 
-#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "Inserisci la password"
 
-#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "Salva password"
 
-#: ../libpurple/account.c:1131
-#: ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manca il plugin per il protocollo %s"
 
-#: ../libpurple/account.c:1133
-#: ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "Errore di connessione"
 
-#: ../libpurple/account.c:1330
-#: ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "Le nuove password non coincidono."
 
-#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "Riempi tutti i campi in maniera completa."
 
-#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "Pasword originale"
 
-#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "Nuova password"
 
-#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "Nuova password (di nuovo)"
 
-#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambia la password per %s"
 
-#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "Inserisci la tua password attuale e la nuova password."
 
-#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modifica le informazioni utente per %s"
 
-#: ../libpurple/account.c:1424
-#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Imposta le informazioni utente"
 
-#: ../libpurple/account.c:1895
-#: ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/qq/qq.c:233
-#: ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531
-#: ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3272
-#: ../pidgin/gtkblist.c:6030
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Contatti"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "lista contatti"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(NON CORRISPONDE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr "%s ha presentato il seguente certificato per un utilizzo \"una tantum\":"
+msgstr ""
+"%s ha presentato il seguente certificato per un utilizzo \"una tantum\":"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2402,108 +1619,104 @@ msgstr ""
 "Impronta (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Verifica certificato singolo-uso"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
 msgstr "Autorità per i certificati"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
 msgstr "Cache dei peers SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1185
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Accettare il certificato per %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
 msgstr "Verifica certificato SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1201
 msgid "Accept"
 msgstr "Accetta"
 
-#: ../libpurple/certificate.c:1202
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
 msgstr "_Visualizza certificato..."
 
 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1303
 #, c-format
-msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
-msgstr "Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". Questo può significare che non ti stai connettendo al servizio al quale credi."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1328
-#, c-format
-msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
-msgstr "Il certificato presentato da \"%s\" è auto-firmato. Non può essere verificato automaticamente."
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Il certificato presentato da \"%s\" è auto-firmato. Non può essere "
+"verificato automaticamente."
 
-#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "La catena di certificati presentata per %s non è valida."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1354
-#: ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
 msgstr "Errore certificato SSL"
 
-#: ../libpurple/certificate.c:1355
-#, fuzzy
 msgid "Invalid certificate chain"
-msgstr "Titolo non valido"
+msgstr "Catena di certificati non valida"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1375
-msgid "You have no database of root certificates, so this certificate cannot be validated."
-msgstr "Non hai alcun database di certificati root. Pertanto, questo certificato non può essere validato."
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Non hai alcun database di certificati root. Pertanto, questo certificato non "
+"può essere validato."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1398
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "Il certificato root dal quale questo certificato dichiara di provenire è sconosciuto a Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Il certificato root dal quale questo certificato dichiara di provenire è "
+"sconosciuto a Pidgin."
 
-#: ../libpurple/certificate.c:1415
 #, c-format
-msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
 msgstr ""
+"La catena di certificati presentata da %s non possiede una firma digitale "
+"valida da parte dell'Authority per i Certificati a cui è collegata."
 
-#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
 msgstr "Firma dell'autorità per i certificati non valida"
 
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". "
+"Questo può significare che non ti stai connettendo al servizio al quale "
+"credi."
+
 #. Make messages
-#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2521,133 +1734,95 @@ msgstr ""
 "Data di scadenza: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
 msgstr "Informazioni sul certificato"
 
-#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Errore di registrazione"
 
-#: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Errore di registrazione"
+msgstr "Errore di rimozione"
 
-#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s si è connesso"
 
-#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s si è disconnesso"
 
-#: ../libpurple/connection.c:525
-#: ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2350
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Impossibile inviare il messaggio: il messaggio è troppo grande."
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Impossibile inviare il messaggio a %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Il messaggio è troppo grande."
 
-#: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Impossibile inviare il messaggio."
 
-#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Invia messaggio"
 
-#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Invia messaggio"
 
-#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s è entrato nella stanza."
 
-#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] è entrato nella stanza."
 
-#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha abbandonato la stanza."
 
-#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha abbandonato la stanza (%s)."
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Impossibile creare la connessione: %s"
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Impossibile ottenere il nome: %s"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Impossibile ottenere il nome del server: %s"
 
-#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "Il server D-BUS di Purple non è in esecuzione per il motivo indicato di seguito"
+msgstr ""
+"Il server D-BUS di Purple non è in esecuzione per il motivo indicato di "
+"seguito"
 
-#: ../libpurple/desktopitem.c:287
-#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Nessun nome"
 
-#: ../libpurple/dnsquery.c:511
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "Impossibile creare il socket"
+msgstr "Impossibile creare un nuovo processo per il resolver DNS\n"
 
-#: ../libpurple/dnsquery.c:516
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "Impossibile inviare il messaggio a %s."
+msgstr "Impossibile inviare la richiesta al processo del resolver DNS\n"
 
-#: ../libpurple/dnsquery.c:549
-#: ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2656,35 +1831,29 @@ msgstr ""
 "Errore nella risoluzione di %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552
-#: ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Errore nella risoluzione di %s: %d"
 
-#: ../libpurple/dnsquery.c:574
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "Errore di lettura dal socket: %s"
+msgstr ""
+"Errore nella lettura dal processo del resolver DNS:\n"
+"%s"
 
-#: ../libpurple/dnsquery.c:578
 #, c-format
 msgid "EOF while reading from resolver process"
-msgstr ""
+msgstr "EOF durante la lettura dal processo del resolver"
 
-#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Creazione del thread fallita: %s"
 
-#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
-#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2693,7 +1862,6 @@ msgstr ""
 "Errore di lettura di %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2702,7 +1870,6 @@ msgstr ""
 "Errore di scrittura di %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2711,39 +1878,32 @@ msgstr ""
 "Errore di accesso a %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "La directory non è scrivibile."
 
-#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "Impossibile inviare un file di 0 byte."
 
-#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Impossibile inviare una directory."
 
-#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s non è un file regolare. Mi rifiuto codardamente di sovrascriverlo.\n"
+msgstr ""
+"%s non è un file regolare. Mi rifiuto codardamente di sovrascriverlo.\n"
 
-#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vuole inviarti %s (%s)"
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vuole inviarti un file"
 
-#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accettare la richiesta di trasferimento file da %s?"
 
-#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2754,367 +1914,327 @@ msgstr ""
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s vuole inviare il file %s"
 
-#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s non è un nome file valido.\n"
 
-#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Richiesta di invio di %s a %s in corso"
 
-#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Inizio del trasferimento di %s da %s"
 
-#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Trasferimento del file %s completato"
 
-#: ../libpurple/ft.c:685
 #, c-format
 msgid "File transfer complete"
 msgstr "Trasferimento file completato"
 
-#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Hai annullato il trasferimento di %s"
 
-#: ../libpurple/ft.c:1108
 #, c-format
 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"
 
-#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ha annullato il trasferimento di %s"
 
-#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ha annullato il trasferimento file"
 
-#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Trasferimento file per %s fallito."
 
-#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Trasferimento file da %s fallito."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Esegui il comando in un terminale"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"aim\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"gg\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"icq\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"irc\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"msnim\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"sip\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"xmpp\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Il comando utilizzato per gestire gli URL \"ymsgr\", se abilitati."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Il gestore per gli URL \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "gestore per gli URL \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "gestore per gli URL \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "gestore per gli URL \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "gestore per gli URL \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "gestore per gli URL \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "gestore per gli URL \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "gestore per gli URL \"ymsgr\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"aim\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"aim\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"gg\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"gg\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"icq\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"icq\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"irc\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"irc\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"msnim\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"msnim\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"sip\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"sip\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"xmpp\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"xmpp\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
-msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"ymsgr\"."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Vero, se il comando specificato nella chiave \"command\" deve gestire gli "
+"URL \"ymsgr\"."
 
-#: ../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 "Vero. se il comando utilizzato per gestire questo tipo di URL deve essere eseguito in un terminale."
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Vero. se il comando utilizzato per gestire questo tipo di URL deve essere "
+"eseguito in un terminale."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Se il comando specificato deve gestire gli URL \"ymsgr\""
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">Il logger non ha nessuna funzione di lettura</font></b>"
+msgstr ""
+"<b><font color=\"red\">Il logger non ha nessuna funzione di lettura</font></"
+"b>"
 
-#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Testo semplice"
 
-#: ../libpurple/log.c:626
 msgid "Old flat format"
-msgstr ""
+msgstr "Vecchio formato solo testo"
 
-#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "Il log di questa conversazione non è riuscito."
 
-#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
 #, 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;RISPOSTA AUTOMATICA&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;RISPOSTA "
+"AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
 #, 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;RISPOSTA AUTOMATICA&gt;:</b></font> %s<br/>\n"
+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;RISPOSTA "
+"AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426
-#: ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Impossibile trovare il percorso del file di log!</b></font>"
+msgstr ""
+"<font color=\"red\"><b>Impossibile trovare il percorso del file di log!</b></"
+"font>"
 
-#: ../libpurple/log.c:1438
-#: ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossibile leggere il file: %s</b></font>"
 
-#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Stai usando %s, ma questo plugin richiede %s."
 
-#: ../libpurple/plugin.c:375
 #, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Questo plugin non ha definito alcun ID."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
+msgstr "Plugin magic non corrispondente: %d (necessita %d)"
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "Versione ABI non corrispondente: %d.%d.x (necessita %d.%d.x)"
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
-msgstr "Il plugin non implementa tutte le funzioni richieste"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Il plugin non implementa tutte le funzioni richieste (list_icon, login and "
+"close)"
 
-#: ../libpurple/plugin.c:542
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "Il plugin %s richiesto non è stato trovato. Installare questo plugin e provare di nuovo."
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"Il plugin %s richiesto non è stato trovato. Installare questo plugin e "
+"provare di nuovo."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Impossibile caricare il plugin"
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Impossibile caricare il plugin %s richiesto."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Impossibile caricare il tuo plugin."
 
-#: ../libpurple/plugin.c:663
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "Impossibile caricare Il plugin dipendente %s."
+msgstr "%s richiede %s, ma non è riuscito a rimuoverlo."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Autoaccetta"
 
-#: ../libpurple/plugins/autoaccept.c:25
-#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "Accetta automaticamente le richieste di trasferimento file da utenti selezionati."
+msgstr ""
+"Accetta automaticamente le richieste di trasferimento file da utenti "
+"selezionati."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Trasferimento del file \"%s\" accettato automaticamente da \"%s\" completato."
+msgstr ""
+"Trasferimento del file \"%s\" accettato automaticamente da \"%s\" completato."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Autoaccept completato"
 
-#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Quando arriva una richiesta di trasferimento file da %s"
 
-#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Impostazioni per autoaccept"
 
-#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Salva"
 
-#: ../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:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5936
-#: ../libpurple/protocols/oscar/oscar.c:5991
-#: ../libpurple/protocols/oscar/oscar.c:6217
-#: ../libpurple/protocols/oscar/oscar.c:6287
-#: ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841
-#: ../libpurple/request.h:1854
-#: ../libpurple/request.h:1867
-#: ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Chiedi"
 
-#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Accetta automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Rifiuta automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Accetta automaticamente i trasferimenti file..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3122,31 +2242,27 @@ msgstr ""
 "Posizione in cui salvare i file\n"
 "(Digitare il percorso completo)"
 
-#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
-msgstr "Rifiuta automaticamente per gli utenti non presenti nella lista contatti"
+msgstr ""
+"Rifiuta automaticamente per gli utenti non presenti nella lista contatti"
 
-#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Notifica con un popup quando un trasferimento file accettato automaticamente è completato\n"
+"Notifica con un popup quando un trasferimento file accettato automaticamente "
+"è completato\n"
 "(solamente quando non è in corso una conversazione con il mittente)"
 
-#: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+msgid "Create a new directory for each user"
+msgstr "Crea una nuova directory per ciascun utente"
+
 msgid "Notes"
 msgstr "Note"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Inserisci le tue note qui sotto..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Modifica le note..."
 
@@ -3158,23 +2274,18 @@ msgstr "Modifica le note..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
-#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Note per il contatto"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
-#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Conserva delle note per un dato contatto."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
-#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Aggiunge l'opzione di salvare delle note per i contatti nella tua lista."
+msgstr ""
+"Aggiunge l'opzione di salvare delle note per i contatti nella tua lista."
 
 #. *< type
 #. *< ui_requirement
@@ -3182,16 +2293,13 @@ msgstr "Aggiunge l'opzione di salvare delle note per i contatti nella tua lista.
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
-msgstr ""
+msgstr "Test di cifratura"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267
-#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr ""
 
@@ -3201,7 +2309,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Esempio DBus"
 
@@ -3209,8 +2316,6 @@ msgstr "Esempio DBus"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Esempio di plugin DBus"
 
@@ -3220,7 +2325,6 @@ msgstr "Esempio di plugin DBus"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Controllo file"
 
@@ -3228,61 +2332,42 @@ msgstr "Controllo file"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251
-#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
-msgstr "Consente di controllare il programma immettendo dei comandi in un file."
+msgstr ""
+"Consente di controllare il programma immettendo dei comandi in un file."
 
-#: ../libpurple/plugins/idle.c:158
-#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuti"
 
 #. 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
 msgid "I'dle Mak'er"
 msgstr "Inattivatore"
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Imposta il tempo di inattività per un account"
 
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Imposta"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Nessuno dei tuoi account è inattivo."
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Rimuovi il tempo di inattività per un account"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Rimuovi"
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Imposta il tempo di inattività per tutti gli account"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Rimuovi il tempo di inattività per tutti gli account"
 
-#: ../libpurple/plugins/idle.c:320
-#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Consente di configurare manualmente per quanto tempo sei stato inattivo."
+msgstr ""
+"Consente di configurare manualmente per quanto tempo sei stato inattivo."
 
 #. *< type
 #. *< ui_requirement
@@ -3290,21 +2375,22 @@ msgstr "Consente di configurare manualmente per quanto tempo sei stato inattivo.
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Test client IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Verifica il supporto plugin IPC come client."
 
 #. *  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 "Verifica il supporto plugin IPC come client. Cerca il plugin server e richiama i comandi registrati."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Verifica il supporto plugin IPC come client. Cerca il plugin server e "
+"richiama i comandi registrati."
 
 #. *< type
 #. *< ui_requirement
@@ -3312,31 +2398,25 @@ msgstr "Verifica il supporto plugin IPC come client. Cerca il plugin server e ri
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Test server IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Verifica il supporto plugin IPC come server."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Verifica il supporto plugin IPC come server. Registra i comandi IPC."
 
-#: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "Impostazioni per nascondere i messaggi di Join/Part"
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Dimensione minima della stanza"
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tempo massimo di inattività per l'utente (in minuti)"
 
@@ -3346,136 +2426,115 @@ msgstr "Tempo massimo di inattività per l'utente (in minuti)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Nascondi join/part"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Nasconde i messaggi estranei di join/part"
 
 #. *  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."
-msgstr "Questo plugin nasconde, nelle stanze molto grandi, i messaggi di join/part, con l'esclusione degli utenti che prendono parte in maniera attiva alla conversazione."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"Questo plugin nasconde, nelle stanze molto grandi, i messaggi di join/part, "
+"con l'esclusione degli utenti che prendono parte in maniera attiva alla "
+"conversazione."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "L'utente non è in linea."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Inviata la risposta automatica:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s si è disconnesso."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Uno o più messaggi potrebbero non essere stati inviati."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Sei stato disconnesso dal server."
 
-#: ../libpurple/plugins/log_reader.c:1605
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
-msgstr "Al momento non sei connesso. Non saranno ricevuti messaggi finché non sarai nuovamente in linea."
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Al momento non sei connesso. Non saranno ricevuti messaggi finché non sarai "
+"nuovamente in linea."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Il messaggio non può essere inviato poiché è stata superata la lunghezza massima."
+msgstr ""
+"Il messaggio non può essere inviato poiché è stata superata la lunghezza "
+"massima."
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Impossibile inviare il messaggio."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fuoco"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2861
 msgid "aMSN"
-msgstr ""
+msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Configurazione generale per la lettura dei log"
 
-#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Calcolo veloce della dimensione"
 
-#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Determina i nomi in maniera euristica"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Percorso dei log"
 
@@ -3485,37 +2544,41 @@ msgstr "Percorso dei log"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Visualizzatore log"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Consente di visualizzare i log di altri client MI."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
 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 ""
-"Quando si visualizzano i log, questo plugin include i log da altri client MI. Al momento sono supportati Adium, MSN Messenger e Trillian.\n"
+"Quando si visualizzano i log, questo plugin include i log da altri client "
+"MI. Al momento sono supportati Adium, MSN Messenger e Trillian.\n"
 "\n"
-"ATTENZIONE: questo plugin è ancora in versione alfa e potrebbe andare in crash frequentemente. Utilizzalo a tuo rischio e pericolo!"
+"ATTENZIONE: questo plugin è ancora in versione alfa e potrebbe andare in "
+"crash frequentemente. Utilizzalo a tuo rischio e pericolo!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Loader per il plugin Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Carica i plugin .NET con Mono."
 
+msgid "Add new line in IMs"
+msgstr "Aggiungi un \"a capo\" nei messaggi immediati"
+
+msgid "Add new line in Chats"
+msgstr "Aggiungi un \"a capo\" nelle chat"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3525,86 +2588,60 @@ msgstr "Carica i plugin .NET con Mono."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "A capo"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "Manda a capo ogni messaggio mostrato"
 
 #. *< 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 "Antepone un \"a capo\" ad ogni messaggio, in modo che appaia al di sotto del nome utente nella finestra di conversazione"
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+"Antepone un \"a capo\" ad ogni messaggio, in modo che appaia al di sotto del "
+"nome utente nella finestra di conversazione."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Messaggi non in linea"
 
-#: ../libpurple/plugins/offlinemsg.c:25
-#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Salva i messaggi inviati ad un utente non in linea sotto forma di allarmi."
+msgstr ""
+"Salva i messaggi inviati ad un utente non in linea sotto forma di allarmi."
 
-#: ../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 "Il resto del messaggio sarà salvato sotto forma di allarme. Puoi modificare/cancellare l'allarme dalla finestra 'Allarmi'."
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+"Il resto del messaggio sarà salvato sotto forma di allarme. Puoi modificare/"
+"cancellare l'allarme dalla finestra 'Allarmi'."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, 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\" non è al momento in linea. Vuoi salvare i restanti messaggi sotto forma di allarmi e inviarli automaticamente quando \"%s\" sarà di nuovo in linea?"
+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\" non è al momento in linea. Vuoi salvare i restanti messaggi sotto "
+"forma di allarmi e inviarli automaticamente quando \"%s\" sarà di nuovo in "
+"linea?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Messaggio non in linea"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Puoi modificare/eliminare l'allarme dalla finestra 'Allarmi'"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113
-#: ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307
-#: ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "Sì"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114
-#: ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308
-#: ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Salva i messaggi non in linea come allarmi"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Non chiedere. Salva sempre come allarme."
 
@@ -3614,47 +2651,40 @@ msgstr "Non chiedere. Salva sempre come allarme."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Loader per i plugin in perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603
-#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Consente di caricare i plugin scritti in perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Modalità psichica"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Modalità psichica per le conversazioni in ingresso"
 
-#: ../libpurple/plugins/psychic.c:22
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr "Fa sì che la finestra di conversazione appaia non appena un altro utente inizia a scriverti. Funziona con AIM, ICQ, XMPP, Sametime e Yahoo!"
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Fa sì che la finestra di conversazione appaia non appena un altro utente "
+"inizia a scriverti. Funziona con AIM, ICQ, XMPP, Sametime e Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "C'è un disturbo nella Forza..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Abilita solamente per gli utenti nella lista contatti"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Disabilita se assente"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Mostra i messaggi di notifica nelle conversazioni"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Porta le conversazioni psichiche in primo piano"
 
@@ -3664,7 +2694,6 @@ msgstr "Porta le conversazioni psichiche in primo piano"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Test dei segnali"
 
@@ -3672,8 +2701,6 @@ msgstr "Test dei segnali"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Verifica se tutti i segnali stanno funzionando correttamente."
 
@@ -3683,7 +2710,6 @@ msgstr "Verifica se tutti i segnali stanno funzionando correttamente."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Plugin semplice"
 
@@ -3691,14 +2717,10 @@ msgstr "Plugin semplice"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40
-#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Test per verificare se la maggior parte delle cose funziona."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Certificati X.509"
 
@@ -3708,7 +2730,6 @@ msgstr "Certificati X.509"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3716,8 +2737,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fornisce il supporto SSL attraverso GNUTLS."
 
@@ -3727,7 +2746,6 @@ msgstr "Fornisce il supporto SSL attraverso GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3735,8 +2753,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornisce il supporto SSL attraverso NSS di Mozilla."
 
@@ -3746,7 +2762,6 @@ msgstr "Fornisce il supporto SSL attraverso NSS di Mozilla."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3754,49 +2769,38 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97
-#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fornisce un wrapper per le librerie di supporto SSL."
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s è ritornato."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s è andato via."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s è diventato inattivo."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s è di nuovo attivo."
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s si è connesso."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Notifica quando"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Il contatto è _assente"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Il contatto è _inattivo"
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Il contatto si _connette/disconnette"
 
@@ -3806,7 +2810,6 @@ msgstr "Il contatto si _connette/disconnette"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Notifica dello stato dei contatti"
 
@@ -3814,71 +2817,55 @@ msgstr "Notifica dello stato dei contatti"
 #. *< version
 #. *  summary
 #. *  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 "Notifica nella finestra di conversazione quando un contatto diventa inattivo o ritorna attivo."
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Notifica nella finestra di conversazione quando un contatto diventa inattivo "
+"o ritorna attivo."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Loader per i plugin Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:425
-#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Consente di caricare i plugin Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
-msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
-msgstr "Impossibile trovare un'installazione di ActiveTCL. Se vuoi usare i plugin TCL, installa ActiveTCL da http://www.activestate.com\n"
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"Impossibile trovare un'installazione di ActiveTCL. Se vuoi usare i plugin "
+"TCL, installa ActiveTCL da http://www.activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:107
-msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d.pidgin.im/BonjourWindows for more information."
-msgstr "Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: http://d.pidgin.im/BonjourWindows per maggiori informazioni."
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
+msgstr ""
+"Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: "
+"http://d.pidgin.im/BonjourWindows per maggiori informazioni."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:126
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:153
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Impossibile stabilire una connessione con il server mDNS locale. È in funzione?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Impossibile stabilire una connessione con il server mDNS locale. È in "
+"funzione?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:369
-#: ../libpurple/protocols/bonjour/bonjour.c:674
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../libpurple/protocols/bonjour/bonjour.c:677
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "Cognome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:375
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "Email"
 msgstr "Email"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:378
-#: ../libpurple/protocols/bonjour/bonjour.c:683
 msgid "AIM Account"
 msgstr "Account AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/bonjour/bonjour.c:686
 msgid "XMPP Account"
 msgstr "Account XMPP"
 
@@ -3892,453 +2879,255 @@ msgstr "Account XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:485
-#: ../libpurple/protocols/bonjour/bonjour.c:487
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin per il protocollo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:628
 msgid "Purple Person"
 msgstr "Persona Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha chiuso la conversazione."
 
-#: ../libpurple/protocols/bonjour/jabber.c:439
-#: ../libpurple/protocols/bonjour/jabber.c:672
-#: ../libpurple/protocols/bonjour/jabber.c:690
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Impossibile inviare il messaggio. La conversazione non può essere avviata."
+msgstr ""
+"Impossibile inviare il messaggio. La conversazione non può essere avviata."
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Cannot open socket"
 msgstr "Impossibile aprire il socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Error setting socket options"
-msgstr "Errore nell'impostazione delle opzioni per il socket"
-
-#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not bind socket to port"
 msgstr "Impossibile associare il socket alla porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:635
 msgid "Could not listen on socket"
 msgstr "Impossibile ascoltare sul socket"
 
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1845
+msgid "Error communicating with local mDNSResponder."
+msgstr "Errore di comunicazione con il responder mDNS locale."
+
 msgid "Invalid proxy settings"
 msgstr "Impostazioni del proxy non valide"
 
-#: ../libpurple/protocols/gg/gg.c:77
-#: ../libpurple/proxy.c:1845
-msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
 msgstr "Il nome dell'host o il numero della porta specificati non sono validi."
 
-#: ../libpurple/protocols/gg/gg.c:115
-#: ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Errore di token"
 
-#: ../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 "Impossibile recuperare il token.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267
-#: ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Salva la lista contatti..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "La tua lista contatti è vuota. Non è stato scritto niente sul file."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Lista contatti salvata con successo!"
 
-#: ../libpurple/protocols/gg/gg.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Impossibile caricare la lista contatti"
+msgstr "Impossibile scrivere la lista contatti per %s su %s"
 
-#: ../libpurple/protocols/gg/gg.c:303
-#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Impossibile caricare la lista contatti"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Apri lista contatti..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Lista contatti aperta con successo!"
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Salva lista contatti..."
 
-#: ../libpurple/protocols/gg/gg.c:382
+msgid "Load buddylist from file..."
+msgstr "Importa la lista contatti da file..."
+
 msgid "Fill in the registration fields."
 msgstr "Riempi i campi per la registrazione."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Le password non coincidono."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Impossibile registrare il nuovo account. Si è verificato un errore.\n"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nuovo account Gadu-Gadu registrato"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Registrazione completata con successo!"
 
-#: ../libpurple/protocols/gg/gg.c:483
-#: ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:940
-#: ../libpurple/protocols/jabber/jabber.c:943
-#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "Password"
 
-#: ../libpurple/protocols/gg/gg.c:488
-#: ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Password (di nuovo)"
 
-#: ../libpurple/protocols/gg/gg.c:493
-#: ../libpurple/protocols/gg/gg.c:786
 #, fuzzy
 msgid "Enter current token"
-msgstr "%s non è attualmente connesso."
+msgstr "l'argomento attuale è: %s"
 
-#: ../libpurple/protocols/gg/gg.c:499
-#: ../libpurple/protocols/gg/gg.c:792
 #, fuzzy
 msgid "Current token"
-msgstr "Attualmente su"
+msgstr "Errore di token"
 
-#: ../libpurple/protocols/gg/gg.c:503
-#: ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un nuovo account Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Riempi i seguenti campi"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/oscar/oscar.c:3799
-#: ../libpurple/protocols/oscar/oscar.c:3812
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Città"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Anno di nascita"
 
-#: ../libpurple/protocols/gg/gg.c:651
-#: ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3742
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233
-#: ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sesso"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Maschile o femminile"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3742
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Maschile"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3742
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Femminile"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Soltanto se online"
 
-#: ../libpurple/protocols/gg/gg.c:662
-#: ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Cerca contatti"
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Inserisci i tuoi criteri di ricerca"
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Riempi i campi."
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "La tua password attuale è diversa da quella specificata."
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Impossibile modificare la password. Si è verificato un errore.\n"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambia la password per l'account Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Password attuale"
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Inserisci la tua password attuale e la nuova password per UIN:"
 
-#: ../libpurple/protocols/gg/gg.c:800
-#: ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambia la password per Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Scegli una chat per il contatto: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881
-#: ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Aggiungi alla chat..."
 
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5654
-#: ../libpurple/protocols/qq/qq.c:171
-#: ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3110
-#: ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3338
-#: ../pidgin/gtkblist.c:3676
-#: ../pidgin/gtkdocklet.c:561
-#: ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Non connesso"
-
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2833
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3112
-#: ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545
-#: ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Presente"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016
-#: ../libpurple/protocols/irc/irc.c:537
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4557
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/qq/qq.c:181
-#: ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3664
-#: ../libpurple/protocols/yahoo/yahoo.c:3738
-#: ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549
-#: ../pidgin/gtkprefs.c:2040
-#: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Assente"
 
-#: ../libpurple/protocols/gg/gg.c:1045
-#: ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2709
-#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048
-#: ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3720
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1061
-#: ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Anno di nascita"
 
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Impossibile mostrare i risultati della ricerca."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directory pubblica di Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Risultati della ricerca"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Non è stato trovato nessun utente corrispondente"
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Non ci sono utenti che corrispondono ai tuoi criteri di ricerca."
 
-#: ../libpurple/protocols/gg/gg.c:1314
-#: ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Impossibile leggere il socket"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista contatti scaricata"
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "La tua lista contatti è stata scaricata dal server."
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Lista contatti esportata"
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "La tua lista contatti è stata salvata sul server."
 
-#: ../libpurple/protocols/gg/gg.c:1517
-#: ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Connessione fallita."
 
-#: ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:664
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr "Bloccato"
-
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "Sblocca"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "Blocca"
-
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nome chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Errore nella chat"
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Questo nome chat è già in uso"
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Non connesso al server."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Cerca contatti..."
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Cambia password..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Esporta la lista contatti sul server"
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Scarica la lista contatti dal server"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Elimina la lista contatti dal server"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Salva la lista contatti nel file..."
 
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr "Importa la lista contatti da file..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -4350,155 +3139,81 @@ msgstr "Importa la lista contatti da file..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin per il protocollo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "IM popolare in Polonia"
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Utente Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando sconosciuto: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "l'argomento attuale è: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "Non è impostato nessun argomento"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "Trasferimento file fallito"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
 msgstr "Impossibile aprire una porta in ascolto."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Errore di visualizzazione del MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Nessun MOTD disponibile"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Non c'è nessun MOTD associato con questa connessione."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD per %s"
 
-#: ../libpurple/protocols/irc/irc.c:129
-#: ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:625
-#: ../libpurple/protocols/irc/irc.c:654
-#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "Il server ti ha disconnesso"
 
-#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "Leggi il MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:265
-#: ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canale:"
 
-#: ../libpurple/protocols/irc/irc.c:271
-#: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr "I nick IRC non devono contenere spazi bianchi"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:325
-#: ../libpurple/protocols/jabber/jabber.c:1311
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1290
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
-#: ../libpurple/protocols/simple/simple.c:1893
-#: ../libpurple/protocols/yahoo/yahoo.c:2948
-#: ../libpurple/protocols/zephyr/zephyr.c:1621
-#: ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../libpurple/protocols/irc/irc.c:335
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
 msgstr "Supporto SSL non disponibile"
 
-#: ../libpurple/protocols/irc/irc.c:348
-#: ../libpurple/protocols/myspace/myspace.c:320
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "Impossibile creare il socket"
 
-#: ../libpurple/protocols/irc/irc.c:430
-#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Impossibile connettersi all'host"
 
-#: ../libpurple/protocols/irc/irc.c:620
-#: ../libpurple/protocols/irc/irc.c:649
-#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr "Errore di lettura"
 
-#: ../libpurple/protocols/irc/irc.c:790
-#: ../libpurple/protocols/silc/chat.c:1398
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Utenti"
 
-#: ../libpurple/protocols/irc/irc.c:793
-#: ../libpurple/protocols/sametime/sametime.c:3416
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Argomento"
 
@@ -4510,72 +3225,27 @@ msgstr "Argomento"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "Plugin per il protocollo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Il plugin per il protocollo IRC che fa meno schifo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:957
-#: ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2335
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6721
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:960
-#: ../libpurple/protocols/msn/msn.c:2340
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6724
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
-#: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1864
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
 
-#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "Codifiche"
 
-#: ../libpurple/protocols/irc/irc.c:966
-#: ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:931
-#: ../libpurple/protocols/jabber/jabber.c:934
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
-#: ../libpurple/protocols/silc/silc.c:1148
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
-msgid "Username"
-msgstr "Nome utente"
+msgid "Auto-detect incoming UTF-8"
+msgstr "Individua automaticamente UTF-8 in entrata"
 
-#: ../libpurple/protocols/irc/irc.c:969
-#: ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Vero nome"
 
@@ -4583,1125 +3253,851 @@ msgstr "Vero nome"
 #. 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:977
 msgid "Use SSL"
 msgstr "Utilizza SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Modalità non valida"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Ban su %s da %s, impostato %s fa"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "Ban su %s"
+
+msgid "End of ban list"
+msgstr "Fine della lista dei ban"
+
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sei stato cacciato da %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Cacciato"
 
-#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Impossibile cacciare %s: la lista dei ban è piena"
 
-#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificato)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Attualmente su"
 
-#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Inattivo per"
 
-#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Online da"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Aggettivo descrittivo:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha scelto come argomento: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s ha rimosso l'argomento."
 
-#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "L'argomento di %s è: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Messaggio sconosciuto '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Messaggio sconosciuto"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
-msgstr "Il server IRC ha ricevuto un messaggio che non è in grado di comprendere."
+msgstr ""
+"Il server IRC ha ricevuto un messaggio che non è in grado di comprendere."
 
-#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utenti su %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Risposta sull'orario"
 
-#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "L'ora locale del server IRC è:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Canale inesistente"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "canale inesistente"
 
-#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "L'utente non è connesso"
 
-#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Nick/Canale inesistente"
 
-#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Impossibile inviare"
 
-#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Per entrare in %s è necessario un invito."
 
-#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Solo su invito"
 
-#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sei stato cacciato da %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:803
-#: ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Cacciato da %s: (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modalità (%s %s) da %s"
 
-#: ../libpurple/protocols/irc/msgs.c:911
-#: ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Nickname non valido"
 
-#: ../libpurple/protocols/irc/msgs.c:913
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Il nome per l'account selezionato è stato rifiutato dal server. Probabilmente contiene caratteri non validi."
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Il nome per l'account selezionato è stato rifiutato dal server. "
+"Probabilmente contiene caratteri non validi."
 
-#: ../libpurple/protocols/irc/msgs.c:918
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Il nome per l'account selezionato è stato rifiutato dal server. Probabilmente contiene caratteri non validi."
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Il nome per l'account selezionato è stato rifiutato dal server. "
+"Probabilmente contiene caratteri non validi."
 
-#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Impossibile cambiare nick"
 
-#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Impossibile cambiare nick"
 
-#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Hai abbandonato il canale%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Errore: PONG non valido dal server"
 
-#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Risposta PING -- Ritardo: %lu secondi"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Impossibile entrare in %s: è richiesta la registrazione."
 
-#: ../libpurple/protocols/irc/msgs.c:1114
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Impossibile entrare nel canale"
 
-#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Il nick o il canale è temporaneamente non disponibile."
 
-#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallop da %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;azione da eseguire&gt;: Esegue un'azione."
 
-#: ../libpurple/protocols/irc/parse.c:123
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "away [messaggio]: Imposta un messaggio di assenza. Non immettere alcun messaggio per ritornare dall'assenza."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [messaggio]: Imposta un messaggio di assenza. Non immettere alcun "
+"messaggio per ritornare dall'assenza."
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <nick> <msg>: invia un messaggio ctcp al nick."
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Invia un comando al chanserv"
 
-#: ../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."
-msgstr "deop &lt;nick1&gt; [nick2] ...: Toglie lo status di operatore del canale a qualcuno. Bisogna essere operatore del canale."
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;nick1&gt; [nick2] ...: Toglie lo status di operatore del canale a "
+"qualcuno. Bisogna essere operatore del canale."
 
-#: ../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 must be a channel operator to do this."
-msgstr "devoice &lt;nick1&gt; [nick2] ...: Toglie lo status di voice a qualcuno, impedendo che possa parlare se il canale è moderato (+m). Bisogna essere operatore del canale."
+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;nick1&gt; [nick2] ...: Toglie lo status di voice a qualcuno, "
+"impedendo che possa parlare se il canale è moderato (+m). Bisogna essere "
+"operatore del canale."
 
-#: ../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."
-msgstr "invite &lt;nick&gt; [stanza]: Invita qualcuno a raggiungerti nella stanza specificata o in quella corrente."
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;nick&gt; [stanza]: Invita qualcuno a raggiungerti nella stanza "
+"specificata o in quella corrente."
 
-#: ../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;stanza1&gt;[,stanza2][,...] [chiave1[,chiave2][,...]]: Entra in una o più stanze, fornendo opzionalmente una chiave per ciascuna, se necessario."
+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;stanza1&gt;[,stanza2][,...] [chiave1[,chiave2][,...]]: Entra in una o "
+"più stanze, fornendo opzionalmente una chiave per ciascuna, se necessario."
 
-#: ../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;stanza1&gt;[,stanza2][,...] [chiave1[,chiave2][,...]]: Entra in una o più stanze, fornendo opzionalmente una chiave per ciascuna, se necessario."
+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;stanza1&gt;[,stanza2][,...] [chiave1[,chiave2][,...]]: Entra in una "
+"o più stanze, fornendo opzionalmente una chiave per ciascuna, se necessario."
 
-#: ../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."
-msgstr "kick &lt;nick&gt; [messaggio]: Espelle qualcuno dal canale. Bisogna essere operatore del canale."
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;nick&gt; [messaggio]: Espelle qualcuno dal canale. Bisogna essere "
+"operatore del canale."
 
-#: ../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: Mostra la lista delle chat room presenti sulla rete. <i>Attenzione. Alcuni server potrebbero disconnetterti dopo questo comando.</i>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list: Mostra la lista delle chat room presenti sulla rete. <i>Attenzione. "
+"Alcuni server potrebbero disconnetterti dopo questo comando.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;azione da eseguire&gt;: Esegue un'azione."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Invia un comando al memoserv"
 
-#: ../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;nick|canale&gt;: Imposta o rimuove una modalità del canale o dell'utente."
+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;nick|canale&gt;: Imposta o rimuove una "
+"modalità del canale o dell'utente."
 
-#: ../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;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato a un utente (in opposizione al canale)."
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato a un utente "
+"(in opposizione al canale)."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canale]: Elenca gli utenti presenti nel canale."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuovo nickname&gt;: Cambia il tuo nickname."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Invia un comando al nickserv"
 
-#: ../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."
-msgstr "op &lt;nick1&gt; [nick2] ...:  Concede lo stato di operatore del canale a qualcuno. Devi essere operatore del canale."
+#, fuzzy
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+"me &lt;azione&gt;: Invia un'azione in stile IRC ad un contatto o ad una chat."
 
-#: ../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."
-msgstr "operwall &lt;messaggio&gt;: Se non sai di cosa si tratta, probabilmente non sei in grado di usarlo."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;nick1&gt; [nick2] ...:  Concede lo stato di operatore del canale a "
+"qualcuno. Devi essere operatore del canale."
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;messaggio&gt;: Se non sai di cosa si tratta, probabilmente non "
+"sei in grado di usarlo."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Invia un comando all'operserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [stanza] [messaggio]: Abbandona il canale corrente o un canale specificato con un messaggio opzionale."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [stanza] [messaggio]: Abbandona il canale corrente o un canale "
+"specificato con un messaggio opzionale."
 
-#: ../libpurple/protocols/irc/parse.c:143
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [nick]: Chiede quanto ritardo ha un utente (o il server, se non è specificato nessun utente)."
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [nick]: Chiede quanto ritardo ha un utente (o il server, se non è "
+"specificato nessun utente)."
 
-#: ../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)."
-msgstr "query &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato a un utente (in opposizione al canale)."
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato a un utente "
+"(in opposizione al canale)."
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [messaggio]: Disconnette dal server, con un messaggio opzionale."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Invia un comando grezzo al server."
 
-#: ../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;nick&gt; [messaggio]: Rimuove qualcuno da una stanza. Devi essere operatore del canale."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;nick&gt; [messaggio]: Rimuove qualcuno da una stanza. Devi essere "
+"operatore del canale."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Mostra l'attuale ora locale del server IRC."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento del canale."
 
-#: ../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;: Imposta o rimuove una modalità utente."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;: Imposta o rimuove una modalità utente."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nick]: invia una richiesta CTCP VERSION ad un utente"
 
-#: ../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."
-msgstr "voice &lt;nick1&gt; [nick2] ...: Concede lo status voice a qualcuno. Bisogna essere operatore del canale."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;nick1&gt; [nick2] ...: Concede lo status voice a qualcuno. Bisogna "
+"essere operatore del canale."
 
-#: ../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."
-msgstr "wallops &lt;messaggio&gt;: Se non sai cos'è, probabilmente non sei in grado di usarlo."
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;messaggio&gt;: Se non sai cos'è, probabilmente non sei in grado "
+"di usarlo."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;: Ottiene informazioni su di un utente."
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;nick&gt;: Ottiene informazioni su di un utente che si è disconnesso."
+msgstr ""
+"whowas &lt;nick&gt;: Ottiene informazioni su di un utente che si è "
+"disconnesso."
 
-#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo di risposta da %s: %lu secondi"
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Risposta PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640
-#: ../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 "Disconnesso."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:698
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
 msgstr "Errore sconosciuto"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Comando blocklist fallito"
+msgstr "Comando ad-hoc fallito"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "esegui"
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
+msgstr ""
+"Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
+
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr ""
+"Hai bisogno della crittografia, ma non è presente nessun supporto TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Il server richiede l'autenticazione sotto forma di testo semplice su uno stream non criptato"
+msgstr ""
+"Il server richiede l'autenticazione sotto forma di testo semplice su uno "
+"stream non criptato"
 
-#: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
-msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "%s richiede l'autenticazione sotto forma di testo semplice su una connessione non criptata. Procedere con l'autenticazione?"
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s richiede l'autenticazione sotto forma di testo semplice su una "
+"connessione non criptata. Procedere con l'autenticazione?"
 
-#: ../libpurple/protocols/jabber/auth.c:325
-#: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:520
-#: ../libpurple/protocols/jabber/auth.c:521
-#: ../libpurple/protocols/jabber/auth.c:614
-#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "Autenticazione come testo semplice"
 
-#: ../libpurple/protocols/jabber/auth.c:340
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:627
-msgid "Server does not use any supported authentication method"
-msgstr "Il server non usa nessun metodo di autenticazione supportato"
-
-#: ../libpurple/protocols/jabber/auth.c:472
-#: ../libpurple/protocols/jabber/auth.c:576
-#: ../libpurple/protocols/jabber/auth.c:795
-#: ../libpurple/protocols/jabber/auth.c:944
-#: ../libpurple/protocols/jabber/auth.c:971
-#: ../libpurple/protocols/jabber/auth.c:993
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Risposta non valida da parte del server."
 
-#: ../libpurple/protocols/jabber/auth.c:616
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Il server richiede l'autenticazione sotto forma di testo semplice su una connessione non criptata. Procedere con l'autenticazione?"
+msgid "Server does not use any supported authentication method"
+msgstr "Il server non usa nessun metodo di autenticazione supportato"
 
-#: ../libpurple/protocols/jabber/auth.c:818
-#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "Challenge non valido dal server"
 
-#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "Errore SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4174
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Cognome"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Soprannome"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "Sito Web"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Indirizzo esteso"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Località"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Regione"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Codice postale"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Paese"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefono"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organizzazione"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Ufficio"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193
-#: ../pidgin/gtkblist.c:3350
-#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Modifica la vCard XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr "Tutti i campi seguenti sono opzionali. Inserisci solamente le informazioni che desideri."
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Tutti i campi seguenti sono opzionali. Inserisci solamente le informazioni "
+"che desideri."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
 msgstr "Ultima attività"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 #, fuzzy
 msgid "Service Discovery Info"
-msgstr "Imposta le informazioni sulla Directory"
+msgstr "/Conversazione/_Info"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
+#, fuzzy
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "<b>Oggetti da sincronizzare</b>"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 #, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "Indirizzo esteso"
+msgstr "Tipo di stanza non supportato"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Multi-User Chat"
 msgstr "Chat multi-utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Non c'è nessuna informazione sull'utente nella directory."
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
+#, fuzzy
 msgid "In-Band Bytestreams"
-msgstr ""
+msgstr "Email nella cartella:"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Comando"
+msgstr "Comandi ad-hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
+#, fuzzy
 msgid "PubSub Service"
-msgstr ""
+msgstr "Servizio non disponibile"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
+#, fuzzy
 msgid "Out of Band Data"
-msgstr ""
+msgstr "Tempo limite esaurito per il socket dati"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 #, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "Finestre dei _messaggi immediati"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
 #, fuzzy
 msgid "In-Band Registration"
-msgstr "Errore di registrazione"
+msgstr "Riempi i campi per la registrazione."
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "Località"
+msgstr "Posizione dell'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "Ricerca utente"
+msgstr "Avatar dell'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 #, fuzzy
 msgid "Chat State Notifications"
-msgstr "Notifica dello stato dei contatti"
+msgstr "Notifica i nuovi messaggi di posta"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "Versione non supportata"
+msgstr "Versione del software"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "Orientazione"
+msgstr "Inizializzazione dello stream"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "Trasferimento file"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "Modalità utente"
+msgstr "Umore dell'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "Limite utenti"
+msgstr "Attività dell'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 #, fuzzy
 msgid "Entity Capabilities"
 msgstr "Capacità"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Negoziazione della sessione crittografata"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "Nome utente"
+msgstr "Brano ascoltato dall'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "MI con scambio di chiavi"
+msgstr "Scambio degli elementi del roster"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 #, fuzzy
 msgid "Reachability Address"
-msgstr "Indirizzo email"
+msgstr "Indirizzo notiziario:"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "Profilo"
+msgstr "Profilo dell'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 #, fuzzy
 msgid "Jingle"
 msgstr "Entra"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
+#, fuzzy
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Bitrate audio:"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "Nome utente"
+msgstr "Nickname dell'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
+#, fuzzy
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Porta UDP del comando"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
+#, fuzzy
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Connetti utilizzando TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
+#, fuzzy
 msgid "Jingle Raw UDP"
-msgstr ""
+msgstr "Porta UDP del comando"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 #, fuzzy
 msgid "Jingle Video"
-msgstr "Video live"
+msgstr "Video chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
 msgid "Message Receipts"
-msgstr "Messaggio ricevuto"
+msgstr "Ricevute per il messaggio"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
 msgid "Public Key Publishing"
-msgstr "Babbleprint della chiave pubblica"
+msgstr "Pubblicazione della chiave pubblica"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "Opzioni utente"
+msgstr "Chat con l'utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 #, fuzzy
 msgid "User Browsing"
-msgstr "Modalità utente"
+msgstr "Per utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 #, fuzzy
 msgid "User Gaming"
-msgstr "Nome utente"
+msgstr "Per utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 #, fuzzy
 msgid "User Viewing"
-msgstr "Limite utenti"
+msgstr "Per utente"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
 #, fuzzy
 msgid "Stanza Encryption"
 msgstr "Crittazione di trillian"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#, fuzzy
 msgid "Entity Time"
-msgstr ""
+msgstr "Tempo di inattività"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#, fuzzy
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "Per i messaggi ritardati"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#, fuzzy
 msgid "Collaborative Data Objects"
-msgstr ""
+msgstr "Mostra oggetti in database"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#, fuzzy
 msgid "File Repository and Sharing"
-msgstr ""
+msgstr "%s: nessuna entry per il file `%s' e per la entry del menu `%s'"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#, fuzzy
 msgid "Hop Check"
-msgstr ""
+msgstr "controllo annullato.\n"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "Capacità"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:859
-msgid "Resource"
-msgstr "Risorsa"
-
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1569
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1597
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "Priorità"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Risorsa"
+
 msgid "Middle Name"
 msgstr "Secondo nome"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:979
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Codice postale"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Annulla nascondi \"Da\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Nascondi temporaneamente \"Da\""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Elimina la notifica di presenza"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Annulla la sottoscrizione"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
-#, fuzzy
 msgid "Log In"
-msgstr "Connesso"
+msgstr "Connetti"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
-#, fuzzy
 msgid "Log Out"
-msgstr "Esegui il log delle chat"
+msgstr "Disconnetti"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "È in chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Ancora assente"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5858
-#: ../libpurple/protocols/sametime/sametime.c:3339
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Cognome"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Ecco i risultati della tua ricerca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2332
-msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
-msgstr "Cerca un contatto inserendo i criteri di ricerca nei seguenti campi. Nota: Ogni campo supporta il carattere jolly (%)"
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Cerca un contatto inserendo i criteri di ricerca nei seguenti campi. Nota: "
+"Ogni campo supporta il carattere jolly (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "Interrogazione della directory fallita"
 
-#: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
 msgstr "Impossibile interrogare il server di directory."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Istruzioni per il server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Riempi uno o più campi per cercare gli utenti XMPP corrispondenti."
 
-#: ../libpurple/protocols/jabber/buddy.c:2414
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3724
-#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "Email Address"
 msgstr "Indirizzo email"
 
-#: ../libpurple/protocols/jabber/buddy.c:2423
-#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "Cerca utenti XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2425
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5657
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Ricerca"
 
-#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "Directory non valida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "Inserisci una directory utenti"
 
-#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "Scegli una directory utenti per la ricerca"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "Cerca directory"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5342
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Stanza:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s non è un nome della stanza valido"
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nome della stanza non valido"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s non è un nome del server valido"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Nome del server non valido"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s non è un gestore della stanza valido"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Handle della stanza non valido"
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Impossibile configurare"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Errore di configurazione della stanza"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Questa stanza non è configurabile"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Errore di registrazione"
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "La modifica del nick non è supportata nelle chat room non MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Errore nella ricezione della lista delle stanze"
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Server non valido"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Inserisci il nome del server per le conferenze"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Scegli un server per le conferenze al quale connettersi"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Cerca stanze"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Hai richiesto la criptatura, ma non è disponibile su questo server."
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Errore di scrittura"
 
-#: ../libpurple/protocols/jabber/jabber.c:424
-#: ../libpurple/protocols/jabber/jabber.c:463
+msgid "Ping timeout"
+msgstr "Timeout per il ping"
+
 msgid "Read Error"
 msgstr "Errore di lettura"
 
-#: ../libpurple/protocols/jabber/jabber.c:500
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2562
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5710,638 +4106,446 @@ msgstr ""
 "Impossibile stabilire una connessione con il server:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "Impossibile creare il socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:598
-#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "ID XMMP non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalido. Deve essere impostato il dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrazione di %s@%s avvenuta con successo"
 
-#: ../libpurple/protocols/jabber/jabber.c:689
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Registrazione di %s@%s avvenuta con successo"
+msgstr "Iscrizione su %s avvenuta con successo"
 
-#: ../libpurple/protocols/jabber/jabber.c:691
-#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "Registrazione riuscita"
 
-#: ../libpurple/protocols/jabber/jabber.c:700
-#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "Registrazione fallita"
 
-#: ../libpurple/protocols/jabber/jabber.c:719
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Registrazione di %s@%s avvenuta con successo"
+msgstr "Iscrizione rimossa con successo da %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "Registrazione riuscita"
+msgstr "Rimozione dell'iscrizione riuscita"
 
-#: ../libpurple/protocols/jabber/jabber.c:730
-#: ../libpurple/protocols/jabber/jabber.c:731
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "Registrazione fallita"
+msgstr "Rimozione dell'iscrizione fallita"
 
-#: ../libpurple/protocols/jabber/jabber.c:891
-#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "Già registrato"
 
-#: ../libpurple/protocols/jabber/jabber.c:989
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Stato"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "Codice postale"
 
-#: ../libpurple/protocols/jabber/jabber.c:999
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#, fuzzy
 msgid "Unregister"
-msgstr "Iscrizione"
+msgstr "Rimuovi iscrizione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1021
-#, fuzzy
-msgid "Please fill out the information below to change your account registration."
-msgstr "Riempi i seguenti campi per registrare il tuo nuovo account."
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "Riempi i seguenti campi per modificare i dati del tuo account."
 
-#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr "Riempi i seguenti campi per registrare il tuo nuovo account."
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
-#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "Registra un nuovo account XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1034
-#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "Iscrizione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Modifica le informazioni utente per %s"
+msgstr "Modifica i dati dell'account su %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1040
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registra un nuovo account su %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Change Registration"
 msgstr "Modifica la registrazione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1151
-#: ../libpurple/protocols/jabber/jabber.c:1152
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "Errore nella modifica delle informazioni sull'account"
+msgstr "Errore nella rimozione dell'account"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
-#: ../libpurple/protocols/jabber/jabber.c:1158
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "Qun creato con successo"
+msgstr "Account rimosso con successo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "Inizializzazione dello stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Initializing SSL/TLS"
 msgstr "Inizializzazione di SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1324
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "Reinizializzazione dello stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1427
-#: ../libpurple/protocols/jabber/jabber.c:1879
-#: ../libpurple/protocols/jabber/jabber.c:1922
-#: ../libpurple/protocols/jabber/jabber.c:1960
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "Non autorizzato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "Da (In attesa di \"Per\")"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "Da"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "Per"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "Nessuna (In attesa di \"Per\")"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nessuno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "Sottoscrizione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1571
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1599
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Umore"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
-#: ../libpurple/protocols/msn/msn.c:647
-#, fuzzy
-msgid "Current media"
-msgstr "Attualmente su"
+msgid "Now Listening"
+msgstr "In ascolto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
 #, fuzzy
 msgid "Mood Text"
-msgstr "Gruppo sanguigno"
+msgstr "Testo identificato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
 #, fuzzy
 msgid "Allow Buzz"
-msgstr "Permetti"
+msgstr "Permetti il timeshift"
 
-#: ../libpurple/protocols/jabber/jabber.c:1648
-#, fuzzy
 msgid "Tune Artist"
-msgstr "Artisti"
+msgstr "Artista del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#, fuzzy
 msgid "Tune Title"
-msgstr "Titolo"
+msgstr "Titolo del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1650
 msgid "Tune Album"
-msgstr ""
+msgstr "Album del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1651
 msgid "Tune Genre"
-msgstr ""
+msgstr "Genere del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1652
-#, fuzzy
 msgid "Tune Comment"
-msgstr "Commento per il contatto"
+msgstr "Commento per il brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1653
 msgid "Tune Track"
-msgstr ""
+msgstr "Numero di traccia del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1654
 msgid "Tune Time"
-msgstr ""
+msgstr "Durata del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
 msgid "Tune Year"
-msgstr ""
+msgstr "Anno del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Tune URL"
-msgstr ""
+msgstr "URL del brano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "Password modificata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "La tua password è stata modificata."
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
-#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "Errore nella modifica della password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1743
-#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "Cambia la password XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "Inserisci la tua nuova password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
-#: ../libpurple/protocols/oscar/oscar.c:6438
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "Imposta le informazioni utente..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:6449
-#: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "Cambia password..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "Cerca utenti..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "Richiesta non valida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "Conflitto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "Caratteristica non implementata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "Vietato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "Andato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
-#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "Errore interno del server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "Elemento non trovato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "Formato ID XMPP non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "Non accettabile"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Not Allowed"
 msgstr "Non permesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Payment Required"
 msgstr "Richiesto pagamento"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Recipient Unavailable"
 msgstr "Destinatario non disponibile"
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Registration Required"
 msgstr "Richiesta registrazione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1889
 msgid "Remote Server Not Found"
 msgstr "Server remoto non trovato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "Timeout del server remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "Server sovraccarico"
 
-#: ../libpurple/protocols/jabber/jabber.c:1895
 msgid "Service Unavailable"
 msgstr "Servizio non disponibile"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "Richiesta sottoscrizione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "Richiesta inattesa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "Autorizzazione annullata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "Codifica non corretta nell'autorizzazione"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "Authzid non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "Meccanismo di autorizzazione non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "Meccanismo di autorizzazione troppo debole"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "Autenticazione fallita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "Formato non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#, fuzzy
 msgid "Bad Namespace Prefix"
-msgstr ""
+msgstr "<Inode numero 1>"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Resource Conflict"
 msgstr "Conflitto di risorsa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Connessione scaduta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "Il server non è più in linea"
 
-#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "Host sconosciuto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "Indirizzamento sbagliato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "ID non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "Namespace non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "XML non valido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "Gli host non corrispondono"
 
-#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Policy Violation"
 msgstr "Violazione delle regole di policy"
 
-#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "Controllo remoto fallito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "Vincolo sulla risorsa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
 msgstr "XML limitato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "Vedi gli altri host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "Arresto del sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "Condizione non definita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "Codifica non supportata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "Tipo di stanza non supportato"
 
-#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "Versione non supportata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "XML non creato correttamente"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "Errore di stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossibile allontanare l'utente %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Affiliazione sconosciuta: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Impossibile affiliare l'utente %s come \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ruolo sconosciuto: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Impossibile impostare il ruolo \"%s\" per l'utente: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossibile espellere l'utente %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2202
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Impossibile allontanare l'utente %s"
+msgstr "Impossibile fare ping sull'utente %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2220
-#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
 #, fuzzy, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
+msgstr ""
+"Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
 
-#: ../libpurple/protocols/jabber/jabber.c:2279
-#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#, fuzzy
 msgid "Buzz"
-msgstr ""
+msgstr "Buzz!!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2280
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
 #, fuzzy, c-format
 msgid "%s has buzzed you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/jabber/jabber.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:4132
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
 msgstr "config: Configura una chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configura una chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [stanza]: Abbandona la stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "register: Iscrizione ad una chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento."
 
-#: ../libpurple/protocols/jabber/jabber.c:2343
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;utente&gt; [stanza]: Allontana un utente dalla stanza."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;utente&gt; [motivo]: Allontana un utente dalla stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:2349
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;utente&gt; &lt;proprietario|admin|membro|escluso|nessuno&gt;: Imposta un'affiliazione per l'utente nella stanza."
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+"affiliate &lt;utente&gt; &lt;proprietario|admin|membro|escluso|nessuno&gt;: "
+"Imposta un'affiliazione per l'utente nella stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:2355
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr "role &lt;utente&gt; &lt;moderatore|partecipante|visitatore|nessuno&gt;: Imposta un ruolo per l'utente nella stanza."
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;utente&gt; &lt;moderatore|partecipante|visitatore|nessuno&gt;: "
+"Imposta un ruolo per l'utente nella stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;utente&gt; [messaggio]: Invita un utente nella stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;stanza&gt; [server]: Entra in una chat su questo server."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;stanza&gt; [password]: Entra in una chat su questo server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2373
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;utente&gt; [stanza]: Espelle un utente dalla stanza."
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;utente&gt; [motivo]: Espelle un utente dalla stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:2378
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;utente&gt; &lt;messaggio&gt;: Invia un messaggio privato ad un altro utente."
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;utente&gt; &lt;messaggio&gt;: Invia un messaggio privato ad un altro "
+"utente."
 
-#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tPing verso un utente/componente/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2389
-#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Richiama l'attenzione di un contatto con un buzz"
 
@@ -6355,1044 +4559,693 @@ msgstr "buzz: Richiama l'attenzione di un contatto con un buzz"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Plugin per il protocollo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205
-#: ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Richiedi SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Forza il vecchio SSL (porta 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 "Consenti l'autenticazione come testo semplice\n"
 "su stream non criptati"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3305
-#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "Porta per la connessione"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3302
-#: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1860
-#: ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Server di connessione"
 
-#: ../libpurple/protocols/jabber/message.c:106
+msgid "File transfer proxies"
+msgstr "Server proxy per il trasferimento file"
+
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s ha lasciato la conversazione."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Messaggio da %s"
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha scelto come argomento: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "L'argomento è: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Invio del messaggio a %s fallito: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Errore messaggio XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
-msgid " (Code %s)"
+msgid "(Code %s)"
 msgstr " (Codice %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Errore di parsing XML"
 
-#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "Errore sconosciuto nella presenza"
 
-#: ../libpurple/protocols/jabber/presence.c:516
-#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "Crea una nuova stanza"
 
-#: ../libpurple/protocols/jabber/presence.c:518
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Stai per creare una nuova stanza. Vuoi configurarla oppure accettare le impostazioni predefinite?"
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Stai per creare una nuova stanza. Vuoi configurarla oppure accettare le "
+"impostazioni predefinite?"
 
-#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "_Configura la stanza"
 
-#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "_Accetta impostazioni predefinite"
 
-#: ../libpurple/protocols/jabber/presence.c:567
-#, c-format
-msgid "Error in chat %s"
-msgstr "Errore nella chat %s"
-
-#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Errore nell'ingresso nella chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#, c-format
+msgid "Error in chat %s"
+msgstr "Errore nella chat %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
+msgstr ""
+"Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Invio file fallito"
 
-#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Impossibile inviare il file a %s. JID non valido"
 
-#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
 
-#: ../libpurple/protocols/jabber/si.c:842
 #, fuzzy, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
+msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
 
-#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Scegli a quale risorsa di %s vuoi inviare un file"
 
-#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Scegli una risorsa"
 
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
-#, fuzzy
 msgid "Edit User Mood"
-msgstr "Modalità utente"
+msgstr "Modifica l'umore dell'utente"
 
-#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:201
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Imposta"
 
-#: ../libpurple/protocols/jabber/usermood.c:209
-#, fuzzy
 msgid "Set Mood..."
-msgstr "Invia MI..."
+msgstr "Scegli l'umore..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Imposta il limte utenti"
+msgstr "Imposta il nickname"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Inserire un nuovo nome per %s"
+msgstr "Scegli un nickname."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
-msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
 msgstr ""
+"Questa informazione è visibile da tutti i contatti nella tua lista, quindi "
+"scegli qualcosa di appropriato."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Imposta nickname..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 msgid "Select an action"
 msgstr "Scegli un'azione"
 
-#: ../libpurple/protocols/msn/contact.c:712
-#, fuzzy
 msgid "Unable to retrieve MSN Address Book"
-msgstr "Aggiungi alla rubrica"
+msgstr "Impossibile ottenere la rubrica MSN"
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema di sincronizzazione della lista contatti in %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/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 appartiene al gruppo \"%s\" sulla lista locale ma non sulla lista del server. Vuoi che questo contatto venga aggiunto?"
+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 appartiene al gruppo \"%s\" sulla lista locale ma non sulla lista del "
+"server. Vuoi che questo contatto venga aggiunto?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/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 è presente sulla lista locale ma non sulla lista del server. Vuoi che questo contatto venga aggiunto?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s è presente sulla lista locale ma non sulla lista del server. Vuoi che "
+"questo contatto venga aggiunto?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
 #, c-format
 msgid "Unable to parse message"
 msgstr "Impossibile effettuare il parsing del messaggio."
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
 #, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Errore di sintassi (probabilmente un bug del client)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
 #, c-format
 msgid "Invalid email address"
 msgstr "Indirizzo email non valido"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
 #, c-format
 msgid "User does not exist"
 msgstr "L'utente non esiste"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
 #, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manca un nome di dominio pienamente qualificato"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
 #, c-format
 msgid "Already logged in"
 msgstr "Già connesso"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
 #, c-format
-msgid "Invalid screen name"
+msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
 #, c-format
 msgid "Invalid friendly name"
 msgstr "Alias non valido"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
 #, c-format
 msgid "List full"
 msgstr "Lista piena"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
 #, c-format
 msgid "Already there"
 msgstr "C'è già"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
 #, c-format
 msgid "Not on list"
 msgstr "Non è nella lista"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "User is offline"
 msgstr "L'utente non è in linea"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
 #, c-format
 msgid "Already in the mode"
 msgstr "Già nella modalità"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
 #, c-format
 msgid "Already in opposite list"
 msgstr "Già nella lista opposta"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
 #, c-format
 msgid "Too many groups"
 msgstr "Troppi gruppi"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
 #, c-format
 msgid "Invalid group"
 msgstr "Gruppo non valido"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
 #, c-format
 msgid "User not in group"
 msgstr "L'utente non è nel gruppo"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
 #, c-format
 msgid "Group name too long"
 msgstr "Nome del gruppo troppo lungo"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
 #, c-format
 msgid "Cannot remove group zero"
 msgstr "Impossibile rimuovere il gruppo zero"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Stai cercando di aggiungere un contatto ad un gruppo che non esiste"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
 #, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard fallito"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
 #, c-format
 msgid "Notify transfer failed"
 msgstr "Notifica trasferimento fallita"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
 #, c-format
 msgid "Required fields missing"
 msgstr "Mancano dei campi richiesti"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
 #, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
 #, c-format
 msgid "Not logged in"
 msgstr "Non connesso"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
 #, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servizio temporaneamente non disponibile"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
 #, c-format
 msgid "Database server error"
 msgstr "Errore del server database"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
 #, c-format
 msgid "Command disabled"
 msgstr "Comando disabilitato"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
 #, c-format
 msgid "File operation error"
 msgstr "Operazione illegale sul file"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
 #, c-format
 msgid "Memory allocation error"
 msgstr "Errore di allocazione della memoria"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
 #, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "È stato inviato al server un valore CHL sbagliato"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
 #, c-format
 msgid "Server busy"
 msgstr "Server occupato"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
 #, c-format
 msgid "Server unavailable"
 msgstr "Server non disponibile"
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
 #, c-format
 msgid "Peer notification server down"
 msgstr "Server di notifica non disponibile"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
 #, c-format
 msgid "Database connect error"
 msgstr "Errore di connessione al database"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
 #, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Il server sta per essere disattivato (abbandona la nave)"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
 #, c-format
 msgid "Error creating connection"
 msgstr "Errore nella creazione della connessione"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "I parametri CVR sono sconosciuti o non consentiti"
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
 #, c-format
 msgid "Unable to write"
 msgstr "Impossibile scrivere"
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
 #, c-format
 msgid "Session overload"
 msgstr "Sessione sovraccarica"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
 #, c-format
 msgid "User is too active"
 msgstr "L'utente è troppo attivo"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
 #, c-format
 msgid "Too many sessions"
 msgstr "Troppe sessioni"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
 #, c-format
 msgid "Passport not verified"
 msgstr "Profilo Passport non verificato"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
-#, c-format
+#, fuzzy, c-format
 msgid "Bad friend file"
-msgstr ""
+msgstr "Invia un file a %s"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
 #, c-format
 msgid "Not expected"
 msgstr "Non atteso"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "L'alias cambia troppo rapidamente"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
 #, c-format
 msgid "Server too busy"
 msgstr "Server occupato"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1377
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1393
 #, c-format
 msgid "Authentication failed"
 msgstr "Autenticazione fallita"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
 #, c-format
 msgid "Not allowed when offline"
 msgstr "Non consentito quando non sei in linea"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
 #, c-format
 msgid "Not accepting new users"
 msgstr "Non accetta nuovi utenti"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
 #, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport senza il consenso parentale"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Profilo Passport non ancora verificato"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
 #, c-format
 msgid "Bad ticket"
 msgstr "Biglietto non valido"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Codice di errore sconosciuto %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Errore di MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
-#: ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
-msgstr ""
+msgstr "Trillo"
 
-#: ../libpurple/protocols/msn/msn.c:131
-#: ../libpurple/protocols/msnp9/msn.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha inviato un trillo!"
 
-#: ../libpurple/protocols/msn/msn.c:132
-#: ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "Stai inviando un trillo a %s..."
+
+msgid "Email Address..."
+msgstr "Indirizzo email..."
 
-#: ../libpurple/protocols/msn/msn.c:174
-#: ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Il tuo nuovo alias MSN è troppo lungo."
 
-#: ../libpurple/protocols/msn/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "Imposta un alias."
 
-#: ../libpurple/protocols/msn/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Questo è il nome con il quale i contatti MSN ti vedranno."
 
-#: ../libpurple/protocols/msn/msn.c:305
-#: ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "Imposta il telefono di casa."
 
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "Imposta il telefono dell'ufficio."
 
-#: ../libpurple/protocols/msn/msn.c:339
-#: ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Imposta il numero di cellulare."
 
-#: ../libpurple/protocols/msn/msn.c:354
-#: ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Consenti le \"MSN Mobile Pages\"?"
 
-#: ../libpurple/protocols/msn/msn.c:355
-#: ../libpurple/protocols/msnp9/msn.c:351
-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 "Vuoi permettere ai contatti della tua lista di inviarti \"MSN Mobile pages\" sul tuo cellulare o su un altro dispositivo portatile?"
+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 ""
+"Vuoi permettere ai contatti della tua lista di inviarti \"MSN Mobile pages\" "
+"sul tuo cellulare o su un altro dispositivo portatile?"
 
-#: ../libpurple/protocols/msn/msn.c:361
-#: ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "Permetti"
 
-#: ../libpurple/protocols/msn/msn.c:362
-#: ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "Vieta"
 
-#: ../libpurple/protocols/msn/msn.c:378
-#: ../libpurple/protocols/msnp9/msn.c:374
-msgid "This Hotmail account may not be active."
-msgstr "Questo account Hotmail potrebbe essere non attivo."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Testo bloccato per %s"
+
+msgid "No text is blocked for this account."
+msgstr "Non c'è testo bloccato per questo account."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"I server MSN stanno attualmente bloccando le seguenti espressioni regolari:"
+"<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Questo account non ha l'email abilitata."
 
-#: ../libpurple/protocols/msn/msn.c:404
-#: ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "Invia un messaggio ad un dispositivo portatile."
 
-#: ../libpurple/protocols/msn/msn.c:406
-#: ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "Page"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+msgid "Home Phone Number"
+msgstr "Telefono di casa"
+
+msgid "Work Phone Number"
+msgstr "Telefono ufficio"
+
+msgid "Mobile Phone Number"
+msgstr "Cellulare"
+
 msgid "Be Right Back"
 msgstr "Torno subito"
 
-#: ../libpurple/protocols/msn/msn.c:694
-#: ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../libpurple/protocols/msn/msn.c:699
-#: ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "Al telefono"
 
-#: ../libpurple/protocols/msn/msn.c:704
-#: ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
-#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "A pranzo"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
 msgid "Artist"
 msgstr "Artista"
 
-#: ../libpurple/protocols/msn/msn.c:724
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:742
-#: ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Imposta un alias..."
 
-#: ../libpurple/protocols/msn/msn.c:747
-#: ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Imposta il telefono di casa..."
 
-#: ../libpurple/protocols/msn/msn.c:751
-#: ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Imposta il telefono dell'ufficio..."
 
-#: ../libpurple/protocols/msn/msn.c:755
-#: ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Imposta il numero di cellulare..."
 
-#: ../libpurple/protocols/msn/msn.c:761
-#: ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Abilita/Disabilita i dispositivi portatili..."
 
-#: ../libpurple/protocols/msn/msn.c:766
-#: ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permetti/Vieta Mobile Pages..."
 
-#: ../libpurple/protocols/msn/msn.c:777
-#: ../libpurple/protocols/msnp9/msn.c:658
+msgid "View Blocked Text..."
+msgstr "Visualizza il testo bloccato..."
+
 msgid "Open Hotmail Inbox"
 msgstr "Apri posta su Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:801
-#: ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "Invia ad un dispositivo portatile"
 
-#: ../libpurple/protocols/msn/msn.c:811
-#: ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "Inizia una _chat"
 
-#: ../libpurple/protocols/msn/msn.c:849
-#: ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata."
+msgstr ""
+"Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata."
 
-#: ../libpurple/protocols/msn/msn.c:879
-#: ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "Impossibile connettersi al server."
 
-#: ../libpurple/protocols/msn/msn.c:1663
-#: ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Errore nella ricezione del profilo"
 
-#: ../libpurple/protocols/msn/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582
-#: ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Generale"
 
-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Età"
 
-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Occupazione"
 
-#: ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Località"
 
-#: ../libpurple/protocols/msn/msn.c:1744
-#: ../libpurple/protocols/msn/msn.c:1936
-#: ../libpurple/protocols/msn/msn.c:1942
-#: ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interessi"
 
-#: ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876
-#: ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1891
-#: ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "Qualcosa su di me"
 
-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "Sociale"
 
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Stato civile"
 
-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "Interessi"
 
-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "Animali domestici"
 
-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "Città in cui vivi"
 
-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "Posti in cui hai vissuto"
 
-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "Musica"
 
-#: ../libpurple/protocols/msn/msn.c:1777
-#: ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citazione preferita"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "Informazioni sul contatto"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "Personale"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "Altro"
 
-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "Telefono di casa"
 
-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "Telefono di casa 2"
 
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Indirizzo di casa"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "Cellulare personale"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "Fax di casa"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal Email"
 msgstr "Email personale"
 
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "MI personale"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "Anniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Impiego"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Compagnia"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Dipartimento"
 
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "Professione"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "Telefono dell'ufficio"
 
-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "Telefono dell'ufficio 2"
 
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Indirizzo di lavoro"
 
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "Cellulare lavoro"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "Pager lavoro"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "Fax ufficio"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work Email"
 msgstr "Email ufficio"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "MI al lavoro"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "Data di inizio"
 
-#: ../libpurple/protocols/msn/msn.c:1907
-#: ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "Preferenze"
 
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "Ultima modifica"
 
-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "L'utente non ha creato un profilo pubblico."
 
-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
-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 "MSN ha riportato di non essere in grado di trovare il profilo dell'utente. Questo significa che l'utente non esiste oppure che esiste ma non ha creato un profilo pubblico."
+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 ""
+"MSN ha riportato di non essere in grado di trovare il profilo dell'utente. "
+"Questo significa che l'utente non esiste oppure che esiste ma non ha creato "
+"un profilo pubblico."
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
-msgid "Could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Nessuna informazione trovata nel profilo dell'utente. Molto probabilmente l'utente non esiste."
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"Nessuna informazione trovata nel profilo dell'utente. Molto probabilmente "
+"l'utente non esiste."
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL del profilo"
 
@@ -7406,179 +5259,138 @@ msgstr "URL del profilo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2307
-#: ../libpurple/protocols/msn/msn.c:2309
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Plugin per il protocollo Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "Usa il metodo HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "Test server IPC"
+msgstr "Server per il metodo HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Mostra gli smiley personalizzati"
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge: Richiama l'attenzione di un contatto con un nudge"
+msgstr "nudge: Richiama l'attenzione di un contatto con un trillo"
 
-#: ../libpurple/protocols/msn/nexus.c:70
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr ""
+msgstr "Autenticazione Windows Live ID: Impossibile connettersi"
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:126
-msgid "Windows Live ID authentication: cannot find authenticate token in server response"
-msgstr ""
-
-#: ../libpurple/protocols/msn/nexus.c:172
-msgid "Windows Live ID authentication Failed"
-msgstr "Autenticazione Windows Live ID fallita"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Autenticazione Windows Live ID: risposta non valida"
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s non è un gruppo valido"
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:532
-#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s su %s: (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:509
-#, fuzzy, c-format
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s ti ha inviato un messaggio"
+msgstr "%s ti ha appena inviato un trillo!"
 
-#: ../libpurple/protocols/msn/notification.c:836
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Errore sconosciuto (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
 msgid "Unable to add user"
 msgstr "Impossibile aggiungere l'utente"
 
-#: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Impossibile aggiungere l'utente su %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Impossibile bloccare l'utente su %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Impossibile autorizzare l'utente su %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s non può essere aggiunto perché la tua lista contatti è piena."
 
-#: ../libpurple/protocols/msn/notification.c:922
-#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s non è un profilo passport valido"
 
-#: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Servizio temporaneamente non disponibile."
 
-#: ../libpurple/protocols/msn/notification.c:1263
-#: ../libpurple/protocols/msnp9/notification.c:851
+msgid "Mobile message was not sent because it was too long."
+msgstr "Il messaggio mobile non è stato inviato perché è troppo lungo."
+
 msgid "Unable to rename group"
 msgstr "Impossibile rinominare il gruppo"
 
-#: ../libpurple/protocols/msn/notification.c:1318
-#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr "Impossibile cancellare il gruppo"
 
-#: ../libpurple/protocols/msn/notification.c:1931
-#: ../libpurple/protocols/msnp9/notification.c:1325
 #, 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] ""
-"Il server MSN verrà spento per manutenzione entro %d minuto. Verrai automaticamente disconnesso. Termina tutte le conversazioni in corso.\n"
+"Il server MSN verrà spento per manutenzione entro %d minuto. Verrai "
+"automaticamente disconnesso. Termina tutte le conversazioni in corso.\n"
 "\n"
 "Quando la manutenzione sarà terminata, potrai collegarti nuovamente."
 msgstr[1] ""
-"Il server MSN verrà spento per manutenzione entro %d minuti. Verrai automaticamente disconnesso. Termina tutte le conversazioni in corso.\n"
+"Il server MSN verrà spento per manutenzione entro %d minuti. Verrai "
+"automaticamente disconnesso. Termina tutte le conversazioni in corso.\n"
 "\n"
 "Quando la manutenzione sarà terminata, potrai collegarti nuovamente."
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Il messaggio non è stato inviato poiché il sistema non è disponibile. Questo "
+"accade di solito quando l'utente è bloccato o non esiste."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+"Non è stato possibile inviare il messaggio poiché stai inviando troppo "
+"velocemente."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"Il messaggio potrebbe non essere stato inviato a causa di un errore "
+"sconosciuto di codifica."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+"Il messaggio potrebbe non essere stato inviato a causa di un errore "
+"sconosciuto."
+
 msgid "Unable to connect"
 msgstr "Impossibile connettersi"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Errore in scrittura"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Errore in lettura"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7587,134 +5399,98 @@ msgstr ""
 "Errore di connessione dal server %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "Il nostro protocollo non è supportato dal server."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "Errore di parsing HTTP."
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:311
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Sei connesso da un'altra postazione."
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "I server MSN sono temporaneamente non disponibili. Riprova più tardi."
 
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "I server MSN sono temporaneamente disattivi."
 
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Impossibile autenticare: %s"
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:334
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "La tua lista contatti MSN è temporaneamente non disponibile. Riprova più tardi."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"La tua lista contatti MSN è temporaneamente non disponibile. Riprova più "
+"tardi."
 
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "Handshake in corso"
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:359
+msgid "Transferring"
+msgstr "Trasferimento in corso"
+
 msgid "Starting authentication"
 msgstr "Avvio autenticazione in corso"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "Ricezione cookie in corso"
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "Invio cookie in corso"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "Ricezione della lista contatti in corso"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Lontano dal computer"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Al telefono"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "A pranzo"
 
-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Il messaggio potrebbe non essere stato inviato a causa di un timeout:"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Il messaggio non è stato inviato. Non è permesso quando sei invisibile:"
+msgstr ""
+"Il messaggio non è stato inviato. Non è permesso quando sei invisibile:"
 
-#: ../libpurple/protocols/msn/switchboard.c:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Il messaggio non è stato inviato poiché l'utente non è in linea:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Il messaggio non è stato inviato a causa di un errore di connessione:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Non è stato possibile inviare il messaggio poiché stai inviando troppo velocemente:"
+msgstr ""
+"Non è stato possibile inviare il messaggio poiché stai inviando troppo "
+"velocemente:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
-msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
-msgstr "Il messaggio non è stato inviato perché non è possibile stabilire una sessione con il server. Si tratta probabilmente di un problema del server. Riprova tra qualche minuto:"
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Il messaggio non è stato inviato perché non è possibile stabilire una "
+"sessione con il server. Si tratta probabilmente di un problema del server. "
+"Riprova tra qualche minuto:"
 
-#: ../libpurple/protocols/msn/switchboard.c:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
-msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Il messaggio non è stato inviato a causa di un errore con lo switchboard:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+"Il messaggio non è stato inviato a causa di un errore con lo switchboard:"
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Il messaggio potrebbe non essere stato inviato a causa di un errore sconosciuto:"
+msgstr ""
+"Il messaggio potrebbe non essere stato inviato a causa di un errore "
+"sconosciuto:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s ti ha aggiunto alla sua lista contatti."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s ti ha rimosso dalla sua lista contatti."
@@ -7722,18 +5498,16 @@ msgstr "%s ti ha rimosso dalla sua lista contatti."
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
-#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Impossibile aggiungere \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:645
-msgid "The screen name specified is invalid."
-msgstr "Il nome utente specificato non è valido"
+msgid "The username specified is invalid."
+msgstr "Il nome utente specificato non è valido."
+
+msgid "This Hotmail account may not be active."
+msgstr "Questo account Hotmail potrebbe essere non attivo."
 
-#: ../libpurple/protocols/msnp9/msn.c:549
 msgid "Has you"
 msgstr "Sei nella sua lista"
 
@@ -7747,280 +5521,262 @@ msgstr "Sei nella sua lista"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
 msgid "MSN Protocol Plugin"
 msgstr "Plugin per il protocollo MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Cifra mancante"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "Impossibile trovare la cifra RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
-msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
-msgstr "Aggiorna libpurple ad una versione che supporta RC4 (>= 2.0.1). Il plugin MySpaceIM non sarà caricato."
-
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
-msgstr "Spiacente, le password lunghe più di %d caratteri (la tua è lunga %d) non sono supportate da MySpace."
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1820
-msgid "MySpaceIM Error"
-msgstr "Errore MySpaceIM"
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Aggiorna libpurple ad una versione che supporta RC4 (>= 2.0.1). Il plugin "
+"MySpaceIM non sarà caricato."
 
-#: ../libpurple/protocols/myspace/myspace.c:352
 #, fuzzy
 msgid "Reading challenge"
-msgstr "Errore in lettura"
+msgstr ""
+"Errore di lettura di %s: \n"
+"%s.\n"
 
-#: ../libpurple/protocols/myspace/myspace.c:360
 #, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "Challenge non valido dal server"
+msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
 
-#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr "Login in corso"
 
-#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "Connessione al server persa (nessun dato ricevuto in %d secondi)"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "Connessione al server persa (nessun dato ricevuto in %d secondo)"
+msgstr[1] "Connessione al server persa (nessun dato ricevuto in %d secondi)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
 msgstr "Nuovi messaggi di posta"
 
-#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr "Nuovi commenti sul blog"
 
-#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr "Nuovi commenti sul profilo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
 msgstr "Nuova richiesta di amicizia!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
 msgstr "Nuovi commenti sulle foto"
 
-#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr "MySpace"
 
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Nessun nome utente impostato"
+
+msgid "You appear to have no MySpace username."
+msgstr "Sembra che tu non abbia nessun nome utente MySpace."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Vuoi impostarne uno adesso? (Nota: NON PUO' ESSERE PIU' CAMBIATO!)"
+
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../libpurple/protocols/myspace/myspace.c:1565
-#: ../libpurple/protocols/myspace/myspace.c:1568
-msgid "No username set"
-msgstr "Nessun nome utente impostato"
-
-#: ../libpurple/protocols/myspace/myspace.c:1566
-msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1794
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Errore di protocollo. Codice %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
-#: ../libpurple/protocols/myspace/myspace.c:2024
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr ""
+"%s La tua password è di %d caratteri, più grande della lunghezza massima "
+"attesa di %d per MySpaceIM. Accorcia la tua password, collegandoti su http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"e riprova."
+
+msgid "MySpaceIM Error"
+msgstr "Errore MySpaceIM"
+
 msgid "Failed to add buddy"
 msgstr "Impossibile aggiungere il contatto"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
 msgstr "Comando 'addbuddy' fallito."
 
-#: ../libpurple/protocols/myspace/myspace.c:2024
-#: ../libpurple/protocols/myspace/myspace.c:2261
 #, fuzzy
 msgid "persist command failed"
-msgstr "Switchboard fallito"
+msgstr "Comando 'addbuddy' fallito."
 
-#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr "Utente inesistente: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
 msgstr "Ricerca utente"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
-#: ../libpurple/protocols/myspace/myspace.c:2261
-#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
 msgstr "Impossibile rimuovere il contatto"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr "Comando 'delbuddy' fallito"
 
-#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
 msgstr "Comando blocklist fallito"
 
-#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
 msgstr "Condizione di input non valida"
 
-#: ../libpurple/protocols/myspace/myspace.c:2351
-#: ../libpurple/protocols/myspace/myspace.c:2388
-msgid "Read buffer full"
-msgstr "Buffer di lettura pieno"
+msgid "Read buffer full (2)"
+msgstr "Buffer di lettura pieno (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr "Messaggio indecifrabile"
 
-#: ../libpurple/protocols/myspace/myspace.c:2499
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Impossibile connettersi all'host: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
 msgstr "Amici MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
-msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
-msgstr "%d contatti sono stati aggiunti o aggiornati dal server (inclusi i contatti già presenti sulla lista del server)"
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d contatto è stato aggiunto o aggiornato dal server (inclusi i contatti già "
+"presenti sulla lista del server)"
+msgstr[1] ""
+"%d contatti sono stati aggiunti o aggiornati dal server (inclusi i contatti "
+"già presenti sulla lista del server)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
 msgstr "Aggiungi contatti dal server"
 
-#: ../libpurple/protocols/myspace/myspace.c:2822
-#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr "Aggiungi amici da MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
 msgstr "Importazione degli amici fallita"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr "Cerca persone..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
 msgstr "Cambia il nome MI..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
-msgstr ""
+msgstr "gestore URL myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
+"Impossibile trovare un account MySpaceIM adatto ad aprire questo URL myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Abilita l'account MySpaceIM appropriato e riprova."
 
-#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr "Mostra il nome utente nel messaggio di stato"
 
-#: ../libpurple/protocols/myspace/myspace.c:3312
+#, fuzzy
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Mostra il nome utente nel messaggio di stato"
 
-#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
 msgstr "Invia emoticon"
 
-#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr "Risoluzione dello schermo (punti per pollice)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
 msgstr "Dimensione del font di base (punti)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Utente"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../libpurple/protocols/myspace/user.c:128
 #, fuzzy
 msgid "Headline"
 msgstr "_Handle:"
 
-#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr "Canzone"
 
-#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr "Numero di amici"
 
-#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr "Versione del client"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Nessun nome utente impostato"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Imposta un nome utente"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Inserisci un nome utente per verificarne la disponibilità:"
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - Nome utente disponibile"
+
+msgid "This username is available. Would you like to set it?"
+msgstr "Il nome utente è disponibile. Vuoi impostare questo nome?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "UNA VOLTA IMPOSTATO, NON PUO' ESSERE CAMBIATO!"
+
+msgid "This username is unavailable."
+msgstr "Questo nome utente non è disponibile."
+
+msgid "Please try another username:"
+msgstr "Prova con un altro nome utente:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, fuzzy, c-format
 msgid "%s has zapped you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, fuzzy, c-format
 msgid "Zapping %s..."
 msgstr "Numero del pager"
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
 #, fuzzy
 msgid "Whack"
 msgstr "Avviso"
 
-#: ../libpurple/protocols/myspace/zap.c:54
 #, fuzzy, c-format
 msgid "%s has whacked you!"
-msgstr "Sei stato bloccato dall'utente"
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:54
 #, fuzzy, c-format
 msgid "Whacking %s..."
 msgstr "Avviso"
@@ -8028,80 +5784,64 @@ msgstr "Avviso"
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
 #, fuzzy
 msgid "Torch"
 msgstr "Distaccato"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, fuzzy, c-format
 msgid "%s has torched you!"
-msgstr "Sei stato bloccato dall'utente"
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr ""
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:62
 #, fuzzy, c-format
 msgid "%s has smooched you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
-#, fuzzy
 msgid "Hug"
-msgstr "Log"
+msgstr "Abbraccio"
 
-#: ../libpurple/protocols/myspace/zap.c:65
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha abbracciato!"
 
-#: ../libpurple/protocols/myspace/zap.c:65
-#, fuzzy, c-format
+#, c-format
 msgid "Hugging %s..."
-msgstr "Log"
+msgstr "Stai abbracciando %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
 #, fuzzy
 msgid "Slap"
 msgstr "Assonnato"
 
-#: ../libpurple/protocols/myspace/zap.c:68
 #, fuzzy, c-format
 msgid "%s has slapped you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy
 msgid "Goose"
 msgstr "Gallo"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy, c-format
 msgid "%s has goosed you!"
-msgstr "%s è andato via."
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy, c-format
 msgid "Goosing %s..."
 msgstr "Ricerca di %s in corso"
@@ -8109,34 +5849,29 @@ msgstr "Ricerca di %s in corso"
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy
 msgid "High-five"
-msgstr ""
+msgstr "Priorità alta"
 
-#: ../libpurple/protocols/myspace/zap.c:76
 #, fuzzy, c-format
 msgid "%s has high-fived you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha inviato un messaggio. (%s)"
 
-#: ../libpurple/protocols/myspace/zap.c:76
-#, c-format
+#, fuzzy, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Priorità alta"
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
 #, fuzzy
 msgid "Punk"
-msgstr "Ping"
+msgstr "Punk"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, fuzzy, c-format
 msgid "%s has punk'd you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, fuzzy, c-format
 msgid "Punking %s..."
 msgstr "Ping"
@@ -8148,245 +5883,208 @@ msgstr "Ping"
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
 #, fuzzy
 msgid "Raspberry"
 msgstr "Trasferimento in corso"
 
-#: ../libpurple/protocols/myspace/zap.c:90
 #, fuzzy, c-format
 msgid "%s has raspberried you!"
-msgstr "%s si è connesso."
+msgstr "%s ti ha aggiunto [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:90
 #, fuzzy, c-format
 msgid "Raspberrying %s..."
 msgstr "Trasferimento in corso"
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Dei parametri richiesti non sono stati passati"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Impossibile scriver sulla rete"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Impossibile leggere dalla rete"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Errore di comunicazione con il server"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Conferenza non trovata"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "La conferenza non esiste"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Esiste già una cartella con quel nome."
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Non supportato"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "La password è scaduta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Password non corretta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "L'account è stato disabilitato"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Il server non è riuscito ad accedere alla directory"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Il tuo amministartore di sistema ha disabilitato questa operazione"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Il server non è disponibile. Riprovare più tardi"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Impossibile aggiungere un contatto due volte nella stessa cartella"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Impossibile aggiungere te stesso"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "L'archivio principale non è configurato propriamente"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
+msgid "Incorrect username or password"
 msgstr "Password o nome utente non corretti"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
+msgid "Could not recognize the host of the username you entered"
 msgstr "Impossibile riconoscere l'host del nome utente inserito"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
-msgid "Your account has been disabled because too many incorrect passwords were entered"
-msgstr "Il tuo account è stato disabilitato poiché sono state immesse troppe password non valide"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+"Il tuo account è stato disabilitato poiché sono state immesse troppe "
+"password non valide"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
-msgstr "Impossibile aggiungere la stessa persona due volte ad una conversazione"
+msgstr ""
+"Impossibile aggiungere la stessa persona due volte ad una conversazione"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Hai raggiunto il tuo limite per il numero di contatti consentiti"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
+msgid "You have entered an incorrect username"
 msgstr "Hai immesso un nome utente non valido"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "C'è stato un errore nell'aggiornamento della directory"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Versione del protocollo non compatibile"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Sei stato bloccato dall'utente"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Questa versione di prova non consente a più di dieci utenti di collegarsi allo stesso tempo"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Questa versione di prova non consente a più di dieci utenti di collegarsi "
+"allo stesso tempo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "L'utente non è in linea oppure sei bloccato"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Errore sconosciuto: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Login non riuscito (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Impossibile inviare il messaggio. Impossibile ottenere dettagli per l'utente (%s)."
+msgstr ""
+"Impossibile inviare il messaggio. Impossibile ottenere dettagli per l'utente "
+"(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Impossibile aggiungere %s alla tua lista contatti (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Impossibile inviare il messaggio (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Impossibile invitare l'utente (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "Impossibile inviare il messaggio a %s. Impossibile creare la conferenza (%s)."
+msgstr ""
+"Impossibile inviare il messaggio a %s. Impossibile creare la conferenza (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Impossibile inviare il messaggio. Impossibile creare la conferenza (%s)."
+msgstr ""
+"Impossibile inviare il messaggio. Impossibile creare la conferenza (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "Impossibile spostare l'utente %s nella cartella %s nella lista sul server. Errore nella creazione della cartella (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Impossibile spostare l'utente %s nella cartella %s nella lista sul server. "
+"Errore nella creazione della cartella (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "Impossibile aggiungere %s alla tua lista contatti. Errore nella creazione della cartella nella lista sul server (%s)."
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Impossibile aggiungere %s alla tua lista contatti. Errore nella creazione "
+"della cartella nella lista sul server (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Impossibile ottenere dettagli per l'utente %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Impossibile aggiungere l'utente alla lista privacy (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Impossibile aggiungere %s alla lista contatti bloccati (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Impossibile aggiungere %s alla lista contatti autorizzati (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Impossibile rimuovere %s dalla lista privacy (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Impossibile modificare le impostazioni per la privacy sul server (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Impossibile creare la conferenza (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
-msgstr "Errore di comunicazione con il server. Chiusura della connessione in corso."
+msgstr ""
+"Errore di comunicazione con il server. Chiusura della connessione in corso."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Numero di telefono"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Titolo personale"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Fermo posta"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "ID Utente"
 
@@ -8396,37 +6094,29 @@ msgstr "ID Utente"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferenza GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autenticazione in corso..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Impossibile connettersi al server."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "In attesa di risposta..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s è stato invitato a questa conversazione."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Invito ad una conversazione"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8437,31 +6127,34 @@ msgstr ""
 "\n"
 "Inviato: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Vuoi entrare nella conversazione?"
 
-#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Sei stato disconnesso perché ti sei collegato da un'altra macchina."
 
-#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s sembra essere non in linea e non ha ricevuto il messaggio che hai appena inviato."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+"%s sembra essere non in linea e non ha ricevuto il messaggio che hai appena "
+"inviato."
 
-#: ../libpurple/protocols/novell/novell.c:2184
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Impossibile connettersi al server. Inserisci l'indirizzo del server al quale connettersi."
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
+"connettersi."
 
-#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "Errore. Il supporto SSL non è installato."
 
-#: ../libpurple/protocols/novell/novell.c:2521
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
-msgstr "Questa conferenza è stata chiusa. Non può essere più inviato nessun messaggio."
+msgstr ""
+"Questa conferenza è stata chiusa. Non può essere più inviato nessun "
+"messaggio."
 
 #. *< type
 #. *< ui_requirement
@@ -8473,39 +6166,24 @@ msgstr "Questa conferenza è stata chiusa. Non può essere più inviato nessun m
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin per il protocollo Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Indirizzo del server"
 
-#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Porta del server"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2473
-#: ../libpurple/protocols/yahoo/yahoo.c:2641
-#: ../libpurple/protocols/yahoo/ycht.c:482
-#: ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129
-#: ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338
-#: ../libpurple/proxy.c:1466
+msgid "Could not join chat room"
+msgstr "Impossibile entrare nella chat room"
+
+msgid "Invalid chat room name"
+msgstr "Nome della chat room non valido"
+
 msgid "Server closed the connection."
 msgstr "Il server ha chiuso la connessione."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
-#: ../libpurple/protocols/yahoo/yahoo.c:2634
-#: ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141
-#: ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350
-#: ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8514,12 +6192,6 @@ msgstr ""
 "Connessione persa col server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158
-#: ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362
-#: ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "Ricevuti dati non validi durante la connessione con il server."
 
@@ -8533,8 +6205,6 @@ msgstr "Ricevuti dati non validi durante la connessione con il server."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Plugin per il protocollo AIM"
 
@@ -8548,310 +6218,234 @@ msgstr "Plugin per il protocollo AIM"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Plugin per il protocollo ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codifica"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "L'utente remoto ha chiuso la connessione."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "L'utente remoto ha rifiutato la tua richiesta."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Connessione persa con l'utente remoto:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Ricevuti dati non validi durante la connessione con l'utente remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Impossibile stabilire una connessione con l'utente remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "IM diretto avviato"
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
-msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
 msgstr ""
+"%s ha cercato di inviarti un file di %s, ma sono consentiti soltanto file di "
+"dimensione fino a %s in un messaggio diretto. Prova ad usare il "
+"trasferimento file, invece.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Il file %s è di %s. La massima dimensione possibile è di %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Errore non valido"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "SNAC non valido"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "Rate verso l'host"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Rate verso il client"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Servizio non disponibile"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Servizio non definito"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "Non supportato dall'host"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "Non supportato dal client"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Rifiutato dal client"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Risposta troppo grande"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "Risposte perse"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "Richiesta rifiutata"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#, fuzzy
 msgid "Busted SNAC payload"
-msgstr ""
+msgstr "carico di %d byte sovradimensionato"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Permessi insufficienti"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#, fuzzy
 msgid "In local permit/deny"
-msgstr ""
+msgstr "Imposta bitrate massimo locale (in kbit/s)."
 
-#: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (sender)"
-msgstr "Troppo cattivo (mittente)"
+msgid "Warning level too high (sender)"
+msgstr "Livello di allerta troppo alto (mittente)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
-msgstr "Troppo cattivo (ricevente)"
+msgid "Warning level too high (receiver)"
+msgstr "Livello di allerta troppo alto (destinatario)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "Utente temporaneamente non disponibile"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr "Lista troppo grande"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "Richiesta ambigua"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Coda piena"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Non è possibile se connessi ad AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
-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 "(C'è stato un errore nella ricezione del messaggio. L'utente con il quale stai parlando sta probabilmente usando una codifica diversa da quella attesa. Se conosci la codifica che sta usando, puoi specificarla nelle opzioni avanzate del tuo account AIM/ICQ.)"
+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 ""
+"(C'è stato un errore nella ricezione del messaggio. L'utente con il quale "
+"stai parlando sta probabilmente usando una codifica diversa da quella "
+"attesa. Se conosci la codifica che sta usando, puoi specificarla nelle "
+"opzioni avanzate del tuo account AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
 #, 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 "(C'è stato un errore nella ricezione questo messaggio. E' possibile che tu e %s stiate usando delle codifiche differenti, oppure si tratta di un bug nel client di %s.)"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+"(C'è stato un errore nella ricezione questo messaggio. E' possibile che tu e "
+"%s stiate usando delle codifiche differenti, oppure si tratta di un bug nel "
+"client di %s.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639
-#: ../pidgin/gtkutils.c:2392
-#: ../pidgin/gtkutils.c:2422
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Icona per il contatto"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voce"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
-msgstr "Messaggio istantaneo diretto AIM"
+msgstr "Messaggio immediato diretto AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Chat"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "Ricevi file"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Giochi"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Add-in"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Invia la lista contatti"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Connessione diretta ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Utente AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nichilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "Server relay ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Vecchio ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Crittazione di trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Sicurezza abilitata"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Video live"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Fotocamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5830
+msgid "Screen Sharing"
+msgstr "Condivisone dello schermo"
+
 #, c-format
 msgid "Free For Chat"
 msgstr "Disponibile alla chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5865
 #, c-format
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5851
 #, c-format
 msgid "Occupied"
 msgstr "Occupato"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
 #, c-format
 msgid "Web Aware"
 msgstr "Rendi visibile il tuo stato sul web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737
-#: ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3106
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557
-#: ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
-msgid "Online"
-msgstr "Online"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3717
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Livello di richiamo"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Commento per il contatto"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8860,7 +6454,6 @@ msgstr ""
 "Impossibile connettersi al server di autenticazione:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8869,172 +6462,137 @@ msgstr ""
 "Impossibile connettersi al server BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
-msgid "Screen name sent"
+msgid "Username sent"
 msgstr "Nome utente inviato"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Connessione stabilita, cookie inviato"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Finalizzazione della connessione"
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Impossibile connettersi. Impossibile effettuare il login come %s poiché il nome utente non è valido. I nomi utente devono iniziare con una lettera e contenere solo lettere, numeri e spazi; oppure devono contenere solo numeri."
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Impossibile connettersi. Impossibile effettuare il login come %s poiché il "
+"nome utente non è valido. I nomi utente devono essere indirizzi email "
+"validi. In alternativa devono iniziare con una lettera e contenere solo "
+"lettere, numeri e spazi; oppure devono contenere solo numeri."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1347
-#: ../libpurple/protocols/yahoo/yahoo.c:2108
-msgid "Invalid screen name."
+msgid "Invalid username."
 msgstr "Nome utente non valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "Password non corretta."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "Il tuo account è attualmente sospeso."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger è temporaneamente non disponibile."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1365
-#: ../libpurple/protocols/oscar/oscar.c:1374
-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 "Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
+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 ""
+"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
+"riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "La versione del client che stai usando è troppo vecchia. Aggiornala su %s"
+msgstr ""
+"La versione del client che stai usando è troppo vecchia. Aggiornala su %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr "Impossibile connettersi"
 
-#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "Autorizzazione ricevuta"
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "La chiave SecurID immessa non è valida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Immettere SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Immettere il numero di 6 cifre del display digitale."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @since 2.3.0
-#.
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5935
-#: ../libpurple/protocols/oscar/oscar.c:6216
-#: ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "Verrai disconnesso a breve. Potresti voler utilizzare TOC finché non è risolto il problema. Controlla %s per aggiornamenti."
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"Verrai disconnesso a breve. Potresti voler utilizzare TOC finché non è "
+"risolto il problema. Controlla %s per aggiornamenti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossibile ottenere un hash di login valido per AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Impossibile ottenere un hash di login valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1653
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Password inviata"
 
-#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "Impossibile inizializzare la connessione"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorizzami ad includerti nella mia lista contatti."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Messaggio di richiesta di autorizzazione:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Mi autorizzi, per favore?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5311
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Nessun motivo fornito."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
 #, 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 ""
-"L'utente %u ha rifiutato di essere aggiunto alla tua lista contatti per il seguente motivo:\n"
+"L'utente %u ha rifiutato di essere aggiunto alla tua lista contatti per il "
+"seguente motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "Autorizzazione ICQ rifiutata."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "L'utente %u ha accolto la tua richiesta di aggiungerlo alla tua lista contatti."
+msgstr ""
+"L'utente %u ha accolto la tua richiesta di aggiungerlo alla tua lista "
+"contatti."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9047,7 +6605,6 @@ msgstr ""
 "Da: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9060,7 +6617,6 @@ msgstr ""
 "Da: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9073,60 +6629,66 @@ msgstr ""
 "Il messaggio è:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utente ICQ %u ti ha inviato un contatto: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vuoi aggiungere questo contatto alla tua lista?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
-#: ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Declina"
 
-#: ../libpurple/protocols/oscar/oscar.c:2606
 #, 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] "Non hai ricevuto %hu messaggio da %s poiché non era valido."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché non erano validi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2615
 #, 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] "Non hai ricevuto %hu messaggio da %s poiché era troppo grande."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché erano troppo grandi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2624
 #, 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] "Non hai ricevuto %hu messaggio da %s poiché è stato spedito troppo velocemente."
-msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché sono stati spedito troppo velocemente."
+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] ""
+"Non hai ricevuto %hu messaggio da %s poiché è stato spedito troppo "
+"velocemente."
+msgstr[1] ""
+"Non hai ricevuto %hu messaggi da %s poiché sono stati spedito troppo "
+"velocemente."
 
-#: ../libpurple/protocols/oscar/oscar.c:2633
 #, 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] "Non hai ricevuto %hu messaggio da %s poiché l'utente è troppo \"cattivo\"."
-msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché l'utente è troppo \"cattivo\"."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Non hai ricevuto %hu messaggio da %s poiché il livello di allerta "
+"dell'utente è troppo alto."
+msgstr[1] ""
+"Non hai ricevuto %hu messaggi da %s poiché il livello di allerta dell'utente "
+"è troppo alto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2642
 #, 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] "Non hai ricevuto %hu messaggio da %s poiché sei troppo \"cattivo\"."
-msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché sei troppo \"cattivo\"."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Non hai ricevuto %hu messaggio da %s poiché il tuo livello di allerta è "
+"troppo alto."
+msgstr[1] ""
+"Non hai ricevuto %hu messaggi da %s poiché il tuo livello di allerta è "
+"troppo alto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2651
 #, 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."
@@ -9134,863 +6696,728 @@ msgstr[0] "Non hai ricevuto %hu messaggio da %s per un motivo sconosciuto"
 msgstr[1] "Non hai ricevuto %hu messaggi da %s per un motivo sconosciuto"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2806
-#: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Motivo sconosciuto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2809
-#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossibile inviare il messaggio %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informazioni sull'utente non disponibili: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Online da"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro da"
 
-#: ../libpurple/protocols/oscar/oscar.c:2946
-msgid "Available Message"
-msgstr "Messaggio di disponibilità"
-
-#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "La tua connessione ad AIM potrebbe essere perduta."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3242
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr "[Impossibile mostrare un messaggio da questo utente poiché contiene caratteri non validi.]"
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Impossibile mostrare un messaggio da questo utente poiché contiene "
+"caratteri non validi.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3406
-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 "L'ultima operazione non è stata eseguita poiché sei al di sopra del rate consentito. Attendi 10 secondi e riprova."
+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 ""
+"L'ultima operazione non è stata eseguita poiché sei al di sopra del rate "
+"consentito. Attendi 10 secondi e riprova."
 
-#: ../libpurple/protocols/oscar/oscar.c:3489
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla chat room %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3739
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Pagina web personale"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Informazioni aggiuntive"
 
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Codice postale"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+msgid "Work Information"
+msgstr "Informazioni sul lavoro"
+
 msgid "Division"
 msgstr "Divisione"
 
-#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "Posizione"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Pagina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
-msgid "Work Information"
-msgstr "Informazioni sul lavoro"
-
-#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Messaggio pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
 msgstr[0] "Il seguente nome utente è associato con %s"
 msgstr[1] "I seguenti nomi utente sono associati con %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
-msgid "Screen name"
-msgstr "Nome utente"
-
-#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nessun risultato trovato per l'indirizzo email %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Dovresti ricevere un'email con la richiesta di conferma per %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "Conferma per l'account richiesta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
 #, c-format
-msgid "Error Changing Account Info"
-msgstr "Errore nella modifica delle informazioni sull'account"
-
-#: ../libpurple/protocols/oscar/oscar.c:4015
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
-msgstr "Errore 0x%04x: Impossibile formattare il nome utente poiché il nome utente richiesto differisce dall'originale."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"Errore 0x%04x: Impossibile formattare il nome utente poiché il nome utente "
+"richiesto differisce dall'originale."
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Errore 0x%04x: Impossibile formattare il nome utente poiché non è valido."
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+"Errore 0x%04x: Impossibile formattare il nome utente poiché non è valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
-msgstr "Errore 0x%04x: Impossibile formattare il nome utente poiché il nome utente richiesto è troppo lungo."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Errore 0x%04x: Impossibile formattare il nome utente poiché il nome utente "
+"richiesto è troppo lungo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
-msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché c'è già una richiesta in corso per questo nome utente."
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+"Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché c'è già una "
+"richiesta in corso per questo nome utente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
-msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché l'indirizzo fornito ha troppi nomi utente associati."
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+"Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché l'indirizzo "
+"fornito ha troppi nomi utente associati."
 
-#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
-msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché l'indirizzo fornito non è valido."
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+"Errore 0x%04x: Impossibile cambiare l'indirizzo email poiché l'indirizzo "
+"fornito non è valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Errore 0x%04x: Errore sconosciuto."
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
+msgid "Error Changing Account Info"
+msgstr "Errore nella modifica delle informazioni sull'account"
+
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "L'indirizzo email di %s è %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Informazioni sull'account"
 
-#: ../libpurple/protocols/oscar/oscar.c:4228
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "La tua immagine MI non è stata inviata. Devi essere in connessione diretta per inviare immagini MI."
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"La tua immagine MI non è stata inviata. Devi essere in connessione diretta "
+"per inviare immagini MI."
 
-#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "Impossibile impostare il profilo AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
-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 "Probabilmente hai richiesto di impostare il tuo profilo prima che la procedura di login fosse completata. Il tuo profilo rimane non impostato; prova ad impostarlo di nuovo quando sei connesso correttamente."
+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 ""
+"Probabilmente hai richiesto di impostare il tuo profilo prima che la "
+"procedura di login fosse completata. Il tuo profilo rimane non impostato; "
+"prova ad impostarlo di nuovo quando sei connesso correttamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4514
 #, 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] "La lunghezza massima del profilo di %d byte è stata superata. E' stato pertanto automaticamente troncato."
-msgstr[1] "La lunghezza massima del profilo di %d byte è stata superata. E' stato pertanto automaticamente troncato."
+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] ""
+"La lunghezza massima del profilo di %d byte è stata superata. E' stato "
+"pertanto automaticamente troncato."
+msgstr[1] ""
+"La lunghezza massima del profilo di %d byte è stata superata. E' stato "
+"pertanto automaticamente troncato."
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Profilo troppo lungo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4564
 #, 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] "La lunghezza massima del messaggio di assenza di %d byte è stata superata. E' stato pertanto automaticamente troncato."
-msgstr[1] "La lunghezza massima del messaggio di assenza di %d byte è stata superata. E' stato pertanto automaticamente troncato."
+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] ""
+"La lunghezza massima del messaggio di assenza di %d byte è stata superata. "
+"E' stato pertanto automaticamente troncato."
+msgstr[1] ""
+"La lunghezza massima del messaggio di assenza di %d byte è stata superata. "
+"E' stato pertanto automaticamente troncato."
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Messaggio di assenza troppo lungo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4642
 #, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Impossibile aggiungere il contatto %s poiché il nome utente non è valido. I nomi utente devono essere indirizzi email validi oppure iniziare con una lettera e contenere solo lettere, numeri e spazi; oppure devono contenere solo numeri."
+msgid ""
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Impossibile aggiungere il contatto %s poiché il nome utente non è valido. I "
+"nomi utente devono essere indirizzi email validi oppure iniziare con una "
+"lettera e contenere solo lettere, numeri e spazi; oppure devono contenere "
+"solo numeri."
 
-#: ../libpurple/protocols/oscar/oscar.c:4644
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "Impossibile aggiungere"
 
-#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossibile ricevere la lista contatti"
 
-#: ../libpurple/protocols/oscar/oscar.c:4764
-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 minutes."
-msgstr "I server AIM non sono momentaneamente in grado di inviare la tua lista dei contatti. In ogni caso, la lista non è persa e sarà probabilmente disponibile tra pochi minuti."
+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 minutes."
+msgstr ""
+"I server AIM non sono momentaneamente in grado di inviare la tua lista dei "
+"contatti. In ogni caso, la lista non è persa e sarà probabilmente "
+"disponibile tra pochi minuti."
 
-#: ../libpurple/protocols/oscar/oscar.c:4947
-#: ../libpurple/protocols/oscar/oscar.c:4949
-#: ../libpurple/protocols/oscar/oscar.c:5177
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "Orfani"
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
 #, 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 "Impossibile aggiungere il contatto %s poiché hai troppi contatti nella tua lista. Rimuovine uno e prova nuovamente."
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"Impossibile aggiungere il contatto %s poiché hai troppi contatti nella tua "
+"lista. Rimuovine uno e prova nuovamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Impossibile aggiungere il contatto %s per un motivo sconosciuto."
 
-#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
-msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
-msgstr "L'utente %s ti ha dato il permesso di aggiungerti alla sua lista contatti. Vuoi aggiungerlo alla tua?"
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+"L'utente %s ti ha dato il permesso di aggiungerlo alla tua lista contatti. "
+"Vuoi aggiungerlo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "Autorizzazione concessa"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "L'utente %s ha accolto la tua richiesta di aggiungerlo nella tua lista contatti."
+msgstr ""
+"L'utente %s ha accolto la tua richiesta di aggiungerlo nella tua lista "
+"contatti."
 
-#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "Autorizzazione concessa"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5311
 #, 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 ""
-"L'utente %s ha rifiutato la tua richiesta di aggiungerlo alla tua lista contatti per il seguente motivo:\n"
+"L'utente %s ha rifiutato la tua richiesta di aggiungerlo alla tua lista "
+"contatti per il seguente motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "Autorizzazione rifiutata"
 
-#: ../libpurple/protocols/oscar/oscar.c:5348
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Scambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
-msgid "Invalid chat name specified."
-msgstr "Il nome della chat specificato non è valido."
-
-#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "La tua immagine MI non è stata inviata. Non puoi inviare immagini MI nelle chat AIM."
-
-#: ../libpurple/protocols/oscar/oscar.c:5619
-#: ../libpurple/protocols/oscar/oscar.c:5624
-msgid "Away Message"
-msgstr "Messaggio di assenza"
-
-#: ../libpurple/protocols/oscar/oscar.c:5624
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(scaricamento)</i>"
+msgstr ""
+"La tua immagine MI non è stata inviata. Non puoi inviare immagini MI nelle "
+"chat AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "Link all'iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commento per il contatto %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "Commento per il contatto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Hai scelto di aprire una connessione IM diretta con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
-msgstr "Poiché questo rivela il tuo indirizzo IP, deve essere considerato un rischio per la sicurezza. Vuoi continuare?"
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Poiché questo rivela il tuo indirizzo IP, deve essere considerato un rischio "
+"per la sicurezza. Vuoi continuare?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5990
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onnetti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "Ottieni info AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "Modifica il commento per il contatto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "Ottieni messaggio di stato"
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
-msgstr "Messaggio istantaneo diretto"
+msgstr "Messaggio immediato diretto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "Richiedi autorizzazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "Segnala sul web la tua presenza (questa opzione ti farà ricevere molto SPAM!)"
+msgstr ""
+"Segnala sul web la tua presenza (questa opzione ti farà ricevere molto SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "Opzioni per la privacy di ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "La nuova formattazione non è valida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "La formattazione del nome utente può modificare solo le maiuscole/minuscole e gli spazi bianchi."
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+"La formattazione del nome utente può modificare solo le maiuscole/minuscole "
+"e gli spazi bianchi."
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "Cambia l'indirizzo in:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>non stai attendendo nessuna autorizzazione</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Stai attendendo autorizzazione dai seguenti contatti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col "
+"tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by Email"
 msgstr "Cerca un contatto per email"
 
-#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by email address"
 msgstr "Cerca un contatto attraverso il suo indirizzo email"
 
-#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Inserisci l'indirizzo email del contatto che stai cercando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../libpurple/protocols/oscar/oscar.c:6444
-msgid "Set User Info (URL)..."
-msgstr "Imposta le informazioni utente (URL)..."
+msgid "Set User Info (web)..."
+msgstr "Imposta le informazioni utente (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6455
-msgid "Change Password (URL)"
-msgstr "Cambia password (URL)"
+msgid "Change Password (web)"
+msgstr "Cambia la password (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
-msgid "Configure IM Forwarding (URL)"
-msgstr "Configura l'inoltro dei messaggi immediati (URL)"
+msgid "Configure IM Forwarding (web)"
+msgstr "Configura l'inoltro dei messaggi immediati (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "Imposta le opzioni per la privacy..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "Conferma account"
 
-#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered Email Address"
 msgstr "Mostra gli attuali indirizzi email registrati"
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered Email Address..."
-msgstr "Mostra gli attuali indirizzi email registrati..."
+msgstr "Cambia gli attuali indirizzi email registrati..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra i contatti dai quali attendi autorizzazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by Email Address..."
-msgstr "Cerca un contatto per email..."
+msgstr "Cerca un contatto per indirizzo email..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
 msgstr "Cerca un contatto per informazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6570
-msgid "Use recent buddies group"
-msgstr "Utilizza il gruppo di contatti recente"
-
-#: ../libpurple/protocols/oscar/oscar.c:6573
-msgid "Show how long you have been idle"
-msgstr "Mostra per quanto tempo sei stato inattivo"
-
-#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
-"Utilizza sempre il server proxy ICQ per il trasferimento file\n"
+"Utilizza sempre il server proxy ICQ per\n"
+"il trasferimento file e i messaggi diretti\n"
 "(più lento, ma non rivela il tuo indirizzo IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
+msgid "Allow multiple simultaneous logins"
+msgstr "Consenti login multipli simultanei"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "È in corso la richiesta a %s di connessione verso di noi su %s:%hu per MI diretti."
+msgstr ""
+"È in corso la richiesta a %s di connessione verso di noi su %s:%hu per MI "
+"diretti."
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentativo di connessione con %s: %hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
 #, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Tentativo di connessione attraverso un server proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ha chiesto di connettersi direttamente a %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1039
-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 "Questo richiede una connessione diretta tra i due computer ed è necessario per le Immagini IM. Poiché verrà rivelato il tuo indirizzo IP, devi considerare la cosa come un potenziale rischio per la tua privacy."
+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 ""
+"Questo richiede una connessione diretta tra i due computer ed è necessario "
+"per le Immagini IM. Poiché verrà rivelato il tuo indirizzo IP, devi "
+"considerare la cosa come un potenziale rischio per la tua privacy."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Informazioni primarie"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Presentazione personale"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Numero QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Paese/Regione"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provincia/Stato"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Simbolo zodiacale"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Segno zodiacale"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Gruppo sanguigno"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Scuola superiore"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Codice postale"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Numero di cellulare"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Acquario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Gallo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Ariete"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Toro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Gemelli"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Cancro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Leone"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Vergine"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Bilancia"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Scorpione"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Sagittario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Capricorno"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Topo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 #, fuzzy
 msgid "Ox"
 msgstr "OK"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigre"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Coniglio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drago"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Serpente"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Cavallo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Capra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Scimmia"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Gallo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Cane"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Maiale"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Altro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Modifica le mie informazioni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Aggiorna le mie informazioni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Le tue informazioni sono state aggiornate"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
-msgid "Setting custom faces is not currently supported. Please choose an image from %s."
-msgstr "I volti personalizzati non sono attualmente supportati. Scegli un'immagine da %s."
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+"I volti personalizzati non sono attualmente supportati. Scegli un'immagine "
+"da %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Volto QQ non valido"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Hai rifiutato la richiesta di %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Inserisci la tua motivazione:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Rifiuta la richiesta"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Mi dispiace ma non sei il mio tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
-msgstr "Impossibile aggiungere il contatto attraverso la richiesta di autorizzazione"
+msgstr ""
+"Impossibile aggiungere il contatto attraverso la richiesta di autorizzazione"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Contatto rimosso con successo"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Hai rimosso con successo te stesso dalla lista del tuo amico"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "L'utente %d necessita di autenticazione"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Inserisci la tua richiesta qui"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Vuoi essere mio amico?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Invia"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "Hai aggiunto %d alla lista contatti"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Errore QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid non valido"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID:"
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID del gruppo"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Creatore"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Descrizione del gruppo"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Autorizzazione"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "Qun QQ"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Inserisci un ID per il gruppo esterno"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Puoi solamente cercare i gruppi QQ permanenti\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Motivo: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "Operatore Qun QQ"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Approva"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
-msgstr "La tua richiesta di entrare nel gruppo %d è stata rifiutata dall'amministratore %d"
+msgstr ""
+"La tua richiesta di entrare nel gruppo %d è stata rifiutata "
+"dall'amministratore %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr "La tua richiesta di entrare nel gruppo %d è stata approvata dall'amministratore %d"
+msgstr ""
+"La tua richiesta di entrare nel gruppo %d è stata approvata "
+"dall'amministratore %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Tu [%d] hai lasciato il gruppo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Tu [%d] sei stato aggiunto al gruppo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Questo gruppo è stato aggiunto alla tua lista dei contatti."
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Non sono un membro"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Sono un membro"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Ho richiesto di entrare"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Sono l'amministratore"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Stato sconosciuto"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Questo gruppo non consente ad altri di entrare"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Hai abbandonato il gruppo con successo"
 
-#: ../libpurple/protocols/qq/group_join.c:257
+#, fuzzy
 msgid "QQ Group Auth"
-msgstr ""
+msgstr "IMAP errore di autorizzazione"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "La tua richiesta di autorizzazione è stata accettata dal server QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Hai inserito un ID di gruppo al di fuori dell'intervallo accettabile"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Sei sicuro di voler abbandonare questo Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -9998,159 +7425,126 @@ msgstr ""
 "Nota, se sei il creatore, \n"
 "questa operazione rimuoverà questo Qun."
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Codice [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr "Errore di operazione sul gruppo"
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Vuoi approvare la richiesta?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
 msgstr "Inserisci la tua motivazione:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
 msgstr "Membro Qun modificato con successo"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modified Qun information"
 msgstr "Informazione Qun modificata con successo"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Qun creato con successo"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Vuoi impostare i dettagli Qun adesso?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Impostazione"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Messaggio di sistema"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Impossibile inviare il messaggio immediato"
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-#, fuzzy
-msgid "Keep alive error"
-msgstr "Errore in lettura"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Sconosciuto-%d"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
-msgid "Error requesting login token"
-msgstr "Errore nella creazione della connessione"
+msgid "Level"
+msgstr "Livello"
 
-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr "Impossibile effettuare il login. Verifica il log di debug."
+msgid "Member"
+msgstr "Membro"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140
-#: ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "Impossibile connettersi."
+msgid " VIP"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
-msgstr "Sconosciuto-%d"
+msgid " TCP"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "Indirizzo TCP"
+#, fuzzy
+msgid " FromMobile"
+msgstr "Cellulare"
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "Indirizzo UDP"
+#, fuzzy
+msgid " BindMobile"
+msgstr "Cellulare"
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
-msgstr "Livello"
+#, fuzzy
+msgid " Video"
+msgstr "Video live"
+
+#, fuzzy
+msgid " Space"
+msgstr "MySpace"
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Nome non valido"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Attualmente online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Server</b>: %s: %d<br>\n"
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modalità di connessione</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP del server</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Nome host reale</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Il mio IP pubblico</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Orario di login</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Ultimo IP di login</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Ultimo orario di login</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Informazioni sul login"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Imposta le mie informazioni"
 
-#: ../libpurple/protocols/qq/qq.c:537
-#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Mostra le informazioni sul login"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Abbandona questo Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Blocca questo utente"
 
@@ -10164,334 +7558,357 @@ msgstr "Blocca questo utente"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726
-#: ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Plugin per il protocollo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Connetti utilizzando TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr "Intervallo(i) per il reinvio"
+
+#, fuzzy
+msgid "Keep alive interval(s)"
+msgstr "Errore nell'aggiunta del contatto"
+
+msgid "Update interval(s)"
+msgstr "Intervallo(i) per l'aggiornamento"
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "Titolo non valido"
+
+#, fuzzy
+msgid "Keep alive error"
+msgstr "Errore nell'aggiunta del contatto"
+
+msgid "Failed to connect server"
+msgstr "Impossibile connettersi al server"
+
 msgid "Socket error"
 msgstr "Errore socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Connessione persa col server:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "Impossibile leggere dal socket"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr "Errore di scrittura"
+
+msgid "Connection lost"
+msgstr "Connessione persa"
+
+msgid "Couldn't resolve host"
+msgstr "Impossibile risolvere l'host"
+
+msgid "hostname is NULL or port is 0"
+msgstr "il nome host è NULL o la porta è 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Connessione in corso al server %s, tentativi %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Impossibile connettersi."
+
+msgid "Could not resolve hostname"
+msgstr "Impossibile risolvere il nome dell'host"
+
+msgid "Unable to login. Check debug log."
+msgstr "Impossibile effettuare il login. Verifica il log di debug."
+
+msgid "Unable to login"
+msgstr "Impossibile effettuare il login"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Impossibile rimuovere il contatto"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Tu [%d] sei stato aggiunto al gruppo \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d ha rifiutato il file %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "File inviato"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha annullato il trasferimento di %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Connessione persa"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Login non riuscito. Nessuna risposta."
-
-#: ../libpurple/protocols/qq/sys_msg.c:110
 msgid "Do you want to add this buddy?"
 msgstr "Vuoi aggiungere questo contatto?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sei stato aggiunto da %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr "Vuoi aggiungerlo?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s ti [%s] ha aggiunto alla sua lista contatti"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "L'utente %s ha rifiutato la tua richiesta"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
 msgstr "L'utente %s ha accettato la tua richiesta"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s vuole aggiungerti [%s] come amico"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s non è nella tua lista contatti"
 
-#: ../libpurple/protocols/sametime/sametime.c:419
+#, fuzzy, c-format
+msgid "Notice from: %s"
+msgstr "Annuncio da %s"
+
+#, c-format
+msgid "%s"
+msgstr ""
+
 msgid "Connection closed (writing)"
 msgstr "Connessione chiusa (scrittura in corso)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titolo del gruppo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Utente:</b> %s<br>"
+msgstr "<b>ID del gruppo di Notes:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informazioni per il gruppo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
-#, fuzzy
 msgid "Notes Address Book Information"
-msgstr "Informazioni sul lavoro"
+msgstr "Informazioni sulla Rubrica di Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Invita il gruppo in conferenza..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1339
-#, fuzzy
 msgid "Get Notes Address Book Info"
-msgstr "Aggiungi alla rubrica"
+msgstr "Ottieni informazioni sulla Rubrica di Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Invio handshake in corso"
 
-#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "In attesa del riconoscimento dell'handshake"
 
-#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake riconosciuto. Invio del login in corso"
 
-#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "In attesa del riconoscimento del login"
 
-#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "Login rediretto"
 
-#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Login forzato in corso"
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "Login riconosciuto"
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Avvio servizi in corso"
 
-#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Un amministratore Sametime ha diffuso il seguente annuncio sul server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"Un amministratore Sametime ha diffuso il seguente annuncio sul server %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Annuncio dell'amministratore Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "Connessione reimpostata"
 
-#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Errore di lettura dal socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "Impossibile connettersi all'host"
 
-#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annuncio da %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "Conferenza chiusa"
 
-#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "Impossibile inviare il messaggio:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Luogo chiuso"
 
-#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "Microfono"
 
-#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "Altoparlanti"
 
-#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "Video camera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "Supporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "Utente esterno"
 
-#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "Crea una conferenza con l'utente"
 
-#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
-msgstr "Inserisci l'argomento per la nuova conferenza, insieme ad un messaggio di invito da inviare a %s"
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Inserisci l'argomento per la nuova conferenza, insieme ad un messaggio di "
+"invito da inviare a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "Nuova conferenza"
 
-#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "Crea"
 
-#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "Conferenze disponibili"
 
-#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "Crea una nuova conferenza..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "Invita un utente in conferenza"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
 #, 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 "Scegli una conferenza dalla seguente lista per la quale inviare un invito all'utente %s. Scegli \"Crea nuova conferenza\" se preferisci creare una nuova conferenza alla quale invitare l'utente."
+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 ""
+"Scegli una conferenza dalla seguente lista per la quale inviare un invito "
+"all'utente %s. Scegli \"Crea nuova conferenza\" se preferisci creare una "
+"nuova conferenza alla quale invitare l'utente."
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "Invita in conferenza"
 
-#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "Invita in conferenza..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "Invia annuncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3628
-#: ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "Nessun server community Sametime specificato"
 
-#: ../libpurple/protocols/sametime/sametime.c:3681
 #, 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 "Non è stato configurato nessun host o indirizzo IP per l'account Meanwhile %s. Per poter proseguire con il login, devi specificarne uno qui sotto."
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Non è stato configurato nessun host o indirizzo IP per l'account Meanwhile %"
+"s. Per poter proseguire con il login, devi specificarne uno qui sotto."
 
-#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Impostazione della connessione Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "Nessun server community Sametime specificato"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "Connetti"
 
-#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Sconosciuto (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "Ultimo client conosciuto"
 
-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "Nome utente"
 
-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "E' stato immesso uno user ID ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
 #, 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 "L'identificativo '%s' potrebbe riferirsi ad uno dei seguenti utenti. Seleziona dall'elenco qui sotto l'utente corretto da aggiungere alla tua lista contatti."
+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 ""
+"L'identificativo '%s' potrebbe riferirsi ad uno dei seguenti utenti. "
+"Seleziona dall'elenco qui sotto l'utente corretto da aggiungere alla tua "
+"lista contatti."
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "Scegli l'utente"
 
-#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "Impossibile aggiungere l'utente: utente non trovato"
 
-#: ../libpurple/protocols/sametime/sametime.c:4466
 #, 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 "L'identificativo '%s' non corrisponde a nessun utente nella tua comunità Sametime. Questa voce è stata pertanto rimossa dalla tua lista contatti."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"L'identificativo '%s' non corrisponde a nessun utente nella tua comunità "
+"Sametime. Questa voce è stata pertanto rimossa dalla tua lista contatti."
 
-#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10500,242 +7917,182 @@ msgstr ""
 "Errore nella lettura del file %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "Lista contatti archiviata in remoto"
 
-#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "Modalità di archiviazione della lista contatti"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "Soltanto lista contatti locale"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "Unisci la lista dal server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "Unisci e salva la lista sul server "
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "Sincronizza la lista con il server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importa la lista Sametime per l'account %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Esporta la lista Sametime per l'account %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "Impossibile aggiungere il gruppo: il gruppo esiste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un gruppo dal nome '%s' esiste già nella tua lista contatti."
 
-#: ../libpurple/protocols/sametime/sametime.c:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "Impossibile aggiungere il gruppo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "Possibili corrispondenze"
 
-#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
-msgstr ""
+msgstr "Risultati per i gruppi della Rubrica di Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5435
 #, 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."
+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 ""
+"L'identificativo '%s' potrebbe riferirsi ad uno dei seguenti gruppi della "
+"Rubrica di Notes. Scegli dalla seguente lista il gruppo corretto da "
+"aggiungere alla tua lista contatti."
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
-#, fuzzy
 msgid "Select Notes Address Book"
-msgstr "Aggiungi alla rubrica"
+msgstr "Scegli una Rubrica di Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "Impossibile aggiungere il gruppo: gruppo non trovato"
 
-#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
 msgstr ""
+"L'identificativo '%s' non corrisponde a nessun gruppo della Rubrica di Notes "
+"nella tua community Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5526
-#, fuzzy
 msgid "Notes Address Book Group"
-msgstr "Aggiungi alla rubrica"
+msgstr "Gruppo della Rubrica di Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527
-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."
+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 ""
+"Inserisci nel campo sottostante il nome di un gruppo della Rubrica di Notes. "
+"Il gruppo e i suoi membri saranno aggiunti alla tua lista contatti."
 
-#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Risultati della ricerca per '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5577
 #, 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 "L'identificativo '%s' può corrispondere ad uno dei seguenti utenti. Puoi aggiungere questi utenti alla tua lista contatti o inviare loro dei messaggi tramite i pulsanti qui sotto."
+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 ""
+"L'identificativo '%s' può corrispondere ad uno dei seguenti utenti. Puoi "
+"aggiungere questi utenti alla tua lista contatti o inviare loro dei messaggi "
+"tramite i pulsanti qui sotto."
 
-#: ../libpurple/protocols/sametime/sametime.c:5584
-#: ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "Risultati della ricerca"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "Nessuna corrispondenza"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "L'identificativo '%s' non corrisponde ad alcun utente nella tua comunità Sametime."
+msgstr ""
+"L'identificativo '%s' non corrisponde ad alcun utente nella tua comunità "
+"Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "Nessuna corrispondenza"
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "Cerca utente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5652
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr "Inserisci un nome o un ID parziale nel campo sottostante per cercare tra gli utenti nella tua comunità Sametime."
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Inserisci un nome o un ID parziale nel campo sottostante per cercare tra gli "
+"utenti nella tua comunità Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "Ricerca utente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "Importa la lista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "Esporta la lista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
-#, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "Aggiungi alla rubrica"
+msgstr "Aggiungi un gruppo dalla Rubrica di Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "Ricerca utente..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "Forza il login (ignora le redirezioni del server)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "Nascondi l'identità del client"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "L'utente %s non è presente nella rete"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Scambio delle chiavi"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Impossibile eseguire lo scambio delle chiavi"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "C'è stato un errore durante lo scambio delle chiavi"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Scambio delle chiavi fallito"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tempo scaduto durante lo scambio delle chiavi"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Lo scambio delle chiavi è stato interrotto"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Lo scambio delle chiavi è già stato avviato"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Impossibile avviare uno scambio delle chiavi con te stesso"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "L'utente remoto non è più presente nella rete"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "Ricevuta una richiesta di scambio chiavi da %s. Vuoi eseguire lo scambio delle chiavi?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Ricevuta una richiesta di scambio chiavi da %s. Vuoi eseguire lo scambio "
+"delle chiavi?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10746,912 +8103,486 @@ msgstr ""
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Richiesta di scambio chiavi"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "MI con password"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Impossibile impostare la chiave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Imposta la password MI"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Ottieni chiave pubblica"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Impossibile recuperare la chiave pubblica"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Mostra la chaive pubblica"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Impossibile caricare la chiave pubblica"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Informazioni sull'utente"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Impossibile ottenere le informazioni sull'utente"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Il contatto %s non è fidato"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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 "Non puoi ricevere notifiche dal contatto finché non importi la sua chiave pubblica. Puoi usare il comando \"Ottieni chiave pubblica\" per recuperare la chiave pubblica."
+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 ""
+"Non puoi ricevere notifiche dal contatto finché non importi la sua chiave "
+"pubblica. Puoi usare il comando \"Ottieni chiave pubblica\" per recuperare "
+"la chiave pubblica."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Apri..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Il contatto %s non è presente nella rete"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "Per poter aggiungere il contatto devi importare la sua chiave pubblica. Fai clic su \"Importa\" per importare una chiave pubblica."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Per poter aggiungere il contatto devi importare la sua chiave pubblica. Fai "
+"clic su \"Importa\" per importare una chiave pubblica."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importa..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Scegliere l'utente corretto"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
-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 "È stato trovato più di un utente con la stessa chiave pubblica. Scegliere dalla lista l'utente corretto da aggiungere alla lista contatti."
+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 ""
+"È stato trovato più di un utente con la stessa chiave pubblica. Scegliere "
+"dalla lista l'utente corretto da aggiungere alla lista contatti."
 
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
-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 "È stato trovato più di un utente con lo stesso nome. Scegliere dalla lista l'utente corretto da aggiungere alla lista contatti."
+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 ""
+"È stato trovato più di un utente con lo stesso nome. Scegliere dalla lista "
+"l'utente corretto da aggiungere alla lista contatti."
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Distaccato"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposto"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Svegliami"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Iperattivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Felice"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Arrabbiato"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Geloso"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Vergognoso"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invincibile"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Innamorato"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Assonnato"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Annoiato"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Eccitato"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modalità utente"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contatti preferiti"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Lingua preferita"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Località geografica"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Resetta la chiave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "MI con scambio di chiavi"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "MI con password"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Ottieni la chiave pubblica..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Uccidi utente"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Scrivi sulla lavagna"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Il canale %s non esiste nella rete"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Informazioni sul canale"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Impossibile ottenere informazioni sul canale"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome del canale:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Numero di utenti:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fondatore del canale:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cipher del canale:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC del canale:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Argomento del canale:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modalità del canale:</b>"
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Fingerprint della chiave del fondatore:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Babbleprint della chiave del fondatore:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Aggiungi la chiave pubblica del canale"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Apri chiave pubblica..."
 
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Passphrase del canale"
 
-#: ../libpurple/protocols/silc/chat.c:432
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista delle chaivi pubbliche del canale"
 
-#: ../libpurple/protocols/silc/chat.c:437
-#: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
-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 "L'autenticazione del canale è usata per rendere sicuro il canale da accessi non autorizzati. L'autenticazione dovrebbe essere basata su una passphrase e sulle firme digitali. Se è impostata una passphrase, questa sarà richiesta per poter entrare nel canale. Se sono impostate le chiavi pubbliche del canale, solamente gli utenti le cui chiavi pubbliche sono elencate saranno in grado di entrare."
-
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
+#, c-format
+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 ""
+"L'autenticazione del canale è usata per rendere sicuro il canale da accessi "
+"non autorizzati. L'autenticazione dovrebbe essere basata su una passphrase e "
+"sulle firme digitali. Se è impostata una passphrase, questa sarà richiesta "
+"per poter entrare nel canale. Se sono impostate le chiavi pubbliche del "
+"canale, solamente gli utenti le cui chiavi pubbliche sono elencate saranno "
+"in grado di entrare."
+
 msgid "Channel Authentication"
 msgstr "Autenticazione del canale"
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Aggiungi / rimuovi"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nome del gruppo"
 
-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
-#: ../libpurple/protocols/silc/silc.c:1163
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Inserisci il nome del gruppo privato del canale %s e la passphrase."
 
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Inserisci un gruppo privato al canale"
 
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Limite utenti"
 
-#: ../libpurple/protocols/silc/chat.c:747
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "Imposta un limite per gli utenti del canale. Scegli zero per rimuovere il limite."
+msgstr ""
+"Imposta un limite per gli utenti del canale. Scegli zero per rimuovere il "
+"limite."
 
-#: ../libpurple/protocols/silc/chat.c:911
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista degli inviti"
 
-#: ../libpurple/protocols/silc/chat.c:916
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista dei ban"
 
-#: ../libpurple/protocols/silc/chat.c:924
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Aggiungi un gruppo privato"
 
-#: ../libpurple/protocols/silc/chat.c:937
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Rimuovere la modalità permanente"
 
-#: ../libpurple/protocols/silc/chat.c:942
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Impostare la modalità permanente"
 
-#: ../libpurple/protocols/silc/chat.c:950
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Imposta il limte utenti"
 
-#: ../libpurple/protocols/silc/chat.c:956
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Azzera le restrizioni sull'argomento"
 
-#: ../libpurple/protocols/silc/chat.c:961
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Imposta restrizioni sull'argomento"
 
-#: ../libpurple/protocols/silc/chat.c:968
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Azzera i canali privati"
 
-#: ../libpurple/protocols/silc/chat.c:973
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Imposta un canale privato"
 
-#: ../libpurple/protocols/silc/chat.c:980
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Azzera i canali segreti"
 
-#: ../libpurple/protocols/silc/chat.c:985
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Imposta un canale segreto"
 
-#: ../libpurple/protocols/silc/chat.c:1046
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "Devi entrare nel canale %s prima di poter entrare nel gruppo privato"
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entra nel gruppo privato"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Impossibile entrare nel gruppo privato"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1360
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
 #, fuzzy
 msgid "Call Command"
-msgstr "Comando"
+msgstr "Impossibile richiamare il comando"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1361
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "Impossibile richiamare il comando"
 
-#: ../libpurple/protocols/silc/chat.c:1246
-#: ../libpurple/protocols/silc/silc.c:1362
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: ../libpurple/protocols/silc/ft.c:85
-#: ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104
-#: ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112
-#: ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120
-#: ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277
-#: ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288
-#: ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89
-#: ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Trasferimento file sicuro"
 
-#: ../libpurple/protocols/silc/ft.c:86
-#: ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105
-#: ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113
-#: ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121
-#: ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93
-#: ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Errore nel trasferimento del file"
 
-#: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s si è disconnesso"
+msgstr "La controparte si è disconnessa"
 
-#: ../libpurple/protocols/silc/ft.c:106
-#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Pemesso negato"
 
-#: ../libpurple/protocols/silc/ft.c:110
-#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Scambio delle chiavi fallito"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Connessione scaduta"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Creazione della connessione fallita"
 
-#: ../libpurple/protocols/silc/ft.c:122
-#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "La sessione di trasferimento file non esiste"
 
-#: ../libpurple/protocols/silc/ft.c:273
-#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nessuna sessione di trasferimento file attiva"
 
-#: ../libpurple/protocols/silc/ft.c:278
-#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Il trasferimento file è già iniziato"
 
-#: ../libpurple/protocols/silc/ft.c:283
-#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Impossibile eseguire lo scambio delle chiavi per il trasferimento file"
 
-#: ../libpurple/protocols/silc/ft.c:289
-#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Impossibile avviare il trasferimento file"
 
-#: ../libpurple/protocols/silc/ft.c:426
-#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Impossibile inviare il file"
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Si è verificato un errore"
 
-#: ../libpurple/protocols/silc/ops.c:533
-#: ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha scelto come argomento di <I>%s</I>: %s"
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> ha impostato le modalità del canale <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> ha rimosso tutte le modalità del canale <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> ha impostato le modalità di <I>%s</I> a : %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> ha rimosso tutte le modalità di <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sei stato espulso (kick) da <I>%s</I> da parte di <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718
-#: ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sei stato ucciso (kill) da %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749
-#: ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Ucciso (kill) da %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Disconnessione dal server"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Compleanno"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Posizione lavorativa"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1156
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unità"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Note"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Entra in chat"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sei il fondatore del canale su <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Il fondatore del canale su <I>%s</I> è <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Vero nome"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Testo di stato"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Fingerprint della chiave pubblica"
 
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Babbleprint della chiave pubblica"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Altro..."
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc/silc.c:1220
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "Distacca dal server"
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Impossibile distaccarsi"
 
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Impossibile impostare l'argomento"
 
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Modifica del nickname non riuscita"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista delle stanze"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Impossibile recuperare la lista delle stanze"
 
-#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Il network è vuoto"
 
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Non è stata ricevuta nessuna chiave pubblica"
 
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informazioni sul server"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Impossibile ottenere le informazioni sul server"
 
-#: ../libpurple/protocols/silc/ops.c:1552
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Statistiche del server"
 
-#: ../libpurple/protocols/silc/ops.c:1553
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Impossibile ottenere le statistiche sul server"
 
-#: ../libpurple/protocols/silc/ops.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11686,73 +8617,49 @@ msgstr ""
 "Operatori server totali: %d\n"
 "Operatori router totali: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistiche sulla rete"
 
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping non riuscito"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ricevuta risposta al ping dal server"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Impossibile uccidere (kill) l'utente"
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1652
 #, fuzzy
 msgid "Cannot watch user"
-msgstr "Impossibile aggiungere te stesso"
+msgstr "Impossibile ottenere le informazioni sull'utente"
 
-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
-#: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Ripristino della sessione in corso"
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autenticazione della connessione in corso"
 
-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verifica della chiave pubblica del server in corso"
 
-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Passphrase richiesta"
 
-#: ../libpurple/protocols/silc/pk.c:98
-#: ../libpurple/protocols/silc10/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 "Ricevuta la chiave pubblica di %s. La tua copia locale non coincide con questa chiave. Vuoi accettare in ogni caso questa chiave pubblica?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"Ricevuta la chiave pubblica di %s. La tua copia locale non coincide con "
+"questa chiave. Vuoi accettare in ogni caso questa chiave pubblica?"
 
-#: ../libpurple/protocols/silc/pk.c:103
-#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Ricevuta la chiave pubblica di %s. Vuoi accettare questa chiave?"
 
-#: ../libpurple/protocols/silc/pk.c:107
-#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11765,102 +8672,69 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110
-#: ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verifica della chiave pubblica"
 
-#: ../libpurple/protocols/silc/pk.c:115
-#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Visualizza..."
 
-#: ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo di chiave pubblica non supportato"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Disconnesso dal server"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Errore nella connessione al server SILC"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Scambio delle chiavi fallito"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Ripristino della sessione distaccata non riuscito. Fai clic su \"Connetti di nuovo\" per creare una nuova connessione."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Ripristino della sessione distaccata non riuscito. Fai clic su \"Connetti di "
+"nuovo\" per creare una nuova connessione."
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Scambio delle chiavi in corso"
 
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
-msgid "Connecting to SILC Server"
-msgstr "Connessione al server SILC in corso"
+msgid "Unable to create connection"
+msgstr "Impossibile creare la connessione"
 
-#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
 msgstr "Impossibile caricare la coppia di chiavi SILC"
 
-#: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
-msgid "Unable to create connection"
-msgstr "Impossibile creare la connessione"
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "Connessione al server SILC in corso"
 
-#: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Impossibile inizializzare il protocollo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "Errore nel caricamento della coppia di chiavi SILC"
 
-#: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:650
+#, c-format
+msgid "Download %s: %s"
+msgstr "Scarica %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Il tuo umore attuale"
 
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1741
 #, c-format
 msgid "Normal"
 msgstr "Normale"
 
-#: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Innamorato"
 
-#: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11868,334 +8742,226 @@ msgstr ""
 "\n"
 "I tuoi metodi di contatto preferiti"
 
-#: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Video conferenza"
 
-#: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Il tuo stato attuale"
 
-#: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Servizi on line"
 
-#: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Lascia che gli altri vedono quali servizi stai usando"
 
-#: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Lascia che gli altri vedano quale computer stai usando"
 
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Il tuo file VCard"
 
-#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Fuso orario (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Attributi di stato degli utenti"
 
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
-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 "Puoi lasciare che gli altri utenti vedano le informazioni sul tuo stato di connessione e le tue informazioni personali. Immetti le informazioni che vuoi rendere note agli altri utenti."
-
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1418
+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 ""
+"Puoi lasciare che gli altri utenti vedano le informazioni sul tuo stato di "
+"connessione e le tue informazioni personali. Immetti le informazioni che "
+"vuoi rendere note agli altri utenti."
+
 msgid "Message of the Day"
 msgstr "Messaggio del giorno"
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Nessun messaggio del giorno disponibile"
 
-#: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Non c'è nessun messaggio del giorno associato con questa connessione"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1171
-#: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Crea una nuova coppia di chiavi SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Le  password non coincidono"
 
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Generazione della coppia di chiavi fallita"
 
-#: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Lunghezza della chiave"
 
-#: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "File per la chiave pubblica"
 
-#: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "File per la chiave privata"
 
-#: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Password (di nuovo)"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Genera una coppia di chiavi"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "Stato di connessione"
 
-#: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "Visualizza il messaggio del giorno"
 
-#: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "Crea una coppia di chiavi SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "L'utente <I>%s</I> non è presente nella rete"
 
-#: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "Argomento troppo lungo"
 
-#: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "Devi specificare un nick"
 
-#: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "canale %s non trovato"
 
-#: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modalità del canale per %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "non è impostata alcuna modalità del canale su %s"
 
-#: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Impossibile impostare i cmodes per %s"
 
-#: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comando sconosciuto: %s, (potrebbe essere un bug del client)"
 
-#: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canale]: Abbandona la chat"
 
-#: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canale]: Abbandona la chat"
 
-#: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuovo argomento&gt;]: Visualizza o modifica l'argomento."
 
-#: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join: &lt;canale&gt; [&lt;password&gt;]: Entra in una chat su questa rete."
+msgstr ""
+"join: &lt;canale&gt; [&lt;password&gt;]: Entra in una chat su questa rete."
 
-#: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list: Elenca i canali presenti su questa rete"
 
-#: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;: Visualizza le informazioni sul nick"
 
-#: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1610
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato ad un utente"
+msgstr ""
+"msg &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato ad un utente"
 
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;nick&gt; [&lt;message&gt;]: Invia un messaggio privato ad un utente"
+msgstr ""
+"query &lt;nick&gt; [&lt;message&gt;]: Invia un messaggio privato ad un utente"
 
-#: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Visualizza il messaggio del giorno"
 
-#: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detach: Distacca questa sessione"
 
-#: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [messaggio]: Disconnette dal server, con un messaggio opzionale"
 
-#: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;: Richiama qualunque comando client silc"
 
-#: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;nick&gt; [-pubkey|&lt;motivo&gt;]: Uccide (kill) il nick indicato"
+msgstr ""
+"kill &lt;nick&gt; [-pubkey|&lt;motivo&gt;]: Uccide (kill) il nick indicato"
 
-#: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuovo nickname&gt;: Cambia il tuo nickname"
 
-#: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;: Visualizza le informazioni sul nick"
 
-#: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1648
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;canale&gt; [+|-&lt;modalità&gt;] [argomenti]: Cambia o mostra le modalità del canale"
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;canale&gt; [+|-&lt;modalità&gt;] [argomenti]: Cambia o mostra le "
+"modalità del canale"
 
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1652
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;canale&gt; +|-&lt;modalità&gt; &lt;nick&gt;: Cambia le modalità sul canale per il nick indicato"
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;canale&gt; +|-&lt;modalità&gt; &lt;nick&gt;: Cambia le modalità "
+"sul canale per il nick indicato"
 
-#: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modalità utente&gt;: Imposta le tue modalità nella rete"
 
-#: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;nick&gt; [-pubkey]: Ottiene i privilegi di operatore del server"
+msgstr ""
+"oper &lt;nick&gt; [-pubkey]: Ottiene i privilegi di operatore del server"
 
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1664
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;canale&gt; [-|+]&lt;nick&gt;: invita il nick indicato o lo aggiunge/rimuove dalla lista degli inviti del canale"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;canale&gt; [-|+]&lt;nick&gt;: invita il nick indicato o lo "
+"aggiunge/rimuove dalla lista degli inviti del canale"
 
-#: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;canale&gt; &lt;nick&gt; [commento]: Espelle (kick) il client dal canale"
+msgstr ""
+"kick &lt;canale&gt; &lt;nick&gt; [commento]: Espelle (kick) il client dal "
+"canale"
 
-#: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]: Visualizza dettagli amministrativi del server"
 
-#: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;canale&gt; +|-&lt;nick&gt;]: Allontana (ban) il client dal canale"
+msgstr ""
+"ban [&lt;canale&gt; +|-&lt;nick&gt;]: Allontana (ban) il client dal canale"
 
-#: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;nick|server&gt;: Recupera la chiave pubblica del client o del server"
+msgstr ""
+"getkey &lt;nick|server&gt;: Recupera la chiave pubblica del client o del "
+"server"
 
-#: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats: Visualizza le statistiche del server e della rete"
 
-#: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: Invia un PING al server a cui si è connessi"
 
-#: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canale&gt;: Elenca gli utenti presenti nel canale."
 
-#: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1697
-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;canale(i)&gt;: Elenca utenti specifici nel canale (nei canali)"
+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;canale(i)&gt;: Elenca "
+"utenti specifici nel canale (nei canali)"
 
 #. *< type
 #. *< ui_requirement
@@ -12206,142 +8972,91 @@ msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;canale(i)&gt;: Elenca u
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "Plugin per il protocollo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocollo Secure Internet Live Conferencing (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1856
-#: ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Rete"
 
-#: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "File per la chiave pubblica"
 
-#: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "File per la chiave privata"
 
-#: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "Cifra"
 
-#: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "Autenticazione con chiave pubblica"
 
-#: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Blocca i MI senza scambio di chiavi"
 
-#: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Blocca i messaggi per la lavagna"
 
-#: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Apri automaticamente la lavagna"
 
-#: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Firma digitalmente e verifica tutti i messaggi"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creazione della coppia di chiavi SILC in corso..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Impossibile creare la coppia di chiavi SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Vero nome: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome utente: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "Email: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome host: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizzazione: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Paese: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:376
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Lunghezza della chiave: \t%d bit\n"
 
-#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versione: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12352,8 +9067,6 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:381
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12362,158 +9075,108 @@ msgstr ""
 "Babbleprint della chiave pubblica:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informazioni sulla chiave pubblica"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Numero del pager"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Video conferenza"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computer"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminale"
 
-#: ../libpurple/protocols/silc/wb.c:288
-#: ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s ha inviato un messaggio sulla lavagna. Vuoi aprire la lavagna?"
 
-#: ../libpurple/protocols/silc/wb.c:292
-#: ../libpurple/protocols/silc10/wb.c:291
 #, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
-msgstr "%s ha inviato un messaggio sulla lavagna del canale %s. Vuoi aprire la lavagna?"
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+"%s ha inviato un messaggio sulla lavagna del canale %s. Vuoi aprire la "
+"lavagna?"
 
-#: ../libpurple/protocols/silc/wb.c:306
-#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Lavagna"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Statistiche sul server non disponibili"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Non riuscito: Versioni non coincidenti. Aggiorna il tuo client"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Non riuscito: La controparte non accetta o non supporta la tua chiave pubblica"
+msgstr ""
+"Non riuscito: La controparte non accetta o non supporta la tua chiave "
+"pubblica"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Non riuscito: La controparte non supporta il gruppo KE proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Non riuscito: La controparte non supporta il cipher proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Non riuscito: La controparte non supporta il PKCS proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Non riuscito: La controparte non supporta la funzione di hash proposta"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Non riuscito: La controparte non supporta l'HMAC proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
 #, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Non riuscito: Firma non corretta"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
 #, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Non riuscito: Cookie non valido"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Non riuscito: Autenticazione fallita"
 
-#: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr "Impossibile inizializzare la connessione client SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:290
 #, fuzzy
 msgid "John Noname"
 msgstr "Nessun nome"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Impossibile trovare/accedere alla cartella ~/.silc"
-
-#: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Impossibile caricare la coppia di chiavi SILC: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Impossibile scrivere"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "Impossibile connettersi"
 
-#: ../libpurple/protocols/simple/simple.c:1127
-#, fuzzy
 msgid "Unknown server response."
-msgstr "Motivo sconosciuto."
+msgstr "Risposta sconosciuta dal server."
 
-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "Impossibile creare il socket in ascolto"
 
-#: ../libpurple/protocols/simple/simple.c:1752
-msgid "Couldn't resolve host"
-msgstr "Impossibile risolvere l'host"
-
-#: ../libpurple/protocols/simple/simple.c:1853
-msgid "Could not resolve hostname"
-msgstr "Impossibile risolvere il nome dell'host"
-
-#: ../libpurple/protocols/simple/simple.c:1871
-msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "I nomi utente SIP non devono contenere spazi bianchi o simboli @"
 
 #. *< type
@@ -12524,252 +9187,205 @@ msgstr "I nomi utente SIP non devono contenere spazi bianchi o simboli @"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin per il protocollo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Il plugin per il protocollo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 "Rendi pubblico il tuo stato\n"
 "(nota: chiunque potrebbe vederti)"
 
-#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "Utilizza UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "Utilizza proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "Utente Auth"
 
-#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "Dominio Auth"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Ricerca di %s in corso"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connessione a %s fallita"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Connessione a: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossibile scrivere il file %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossibile leggere il file %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Messaggio troppo lungo. Troncati gli ultimi %s byte."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s non è attualmente connesso."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Richiamo a %s non consentito."
 
-#: ../libpurple/protocols/toc/toc.c:503
 #, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Un messaggio è stato rifiutato. Stai superando il limite di velocità del server."
+msgstr ""
+"Un messaggio è stato rifiutato. Stai superando il limite di velocità del "
+"server."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "La chat in %s non è disponibile."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Stai inviando troppo velocemente messaggi a %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Non hai ricevuto un messaggio da %s poiché era troppo grande."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Non hai ricevuto un messaggio da %s poiché è stato spedito troppo velocemente."
+msgstr ""
+"Non hai ricevuto un messaggio da %s poiché è stato spedito troppo "
+"velocemente."
 
-#: ../libpurple/protocols/toc/toc.c:518
 #, c-format
 msgid "Failure."
 msgstr "Fallimento."
 
-#: ../libpurple/protocols/toc/toc.c:521
 #, c-format
 msgid "Too many matches."
 msgstr "Troppe corrispondenze."
 
-#: ../libpurple/protocols/toc/toc.c:524
 #, c-format
 msgid "Need more qualifiers."
 msgstr "Servono più qualificatori."
 
-#: ../libpurple/protocols/toc/toc.c:527
 #, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Servizio di directory temporaneamente non disponibile."
 
-#: ../libpurple/protocols/toc/toc.c:530
 #, c-format
 msgid "Email lookup restricted."
 msgstr "Ricerca email limitata."
 
-#: ../libpurple/protocols/toc/toc.c:533
 #, c-format
 msgid "Keyword ignored."
 msgstr "Parola chiave ignorata."
 
-#: ../libpurple/protocols/toc/toc.c:536
 #, c-format
 msgid "No keywords."
 msgstr "Nessuna parola chiave."
 
-#: ../libpurple/protocols/toc/toc.c:539
 #, c-format
 msgid "User has no directory information."
 msgstr "Non c'è nessuna informazione sull'utente nella directory."
 
-#: ../libpurple/protocols/toc/toc.c:543
 #, c-format
 msgid "Country not supported."
 msgstr "Paese non supportato."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Errore sconosciuto: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
 #, c-format
-msgid "Incorrect screen name or password."
-msgstr "Password o nome utente non corretti."
+msgid "Incorrect username or password."
+msgstr "Nome utente o password non corretti."
 
-#: ../libpurple/protocols/toc/toc.c:552
 #, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Il servizio è temporaneamente non disponibile."
 
-#: ../libpurple/protocols/toc/toc.c:555
 #, c-format
 msgid "Your warning level is currently too high to log in."
-msgstr "Il tuo livello di richiamo è attualmente troppo alto per poterti connettere."
+msgstr ""
+"Il tuo livello di richiamo è attualmente troppo alto per poterti connettere."
 
-#: ../libpurple/protocols/toc/toc.c:558
 #, c-format
-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 "Ti sei connesso e disconnesso troppo frequentemente. Attendi 10 minuti e riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
+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 ""
+"Ti sei connesso e disconnesso troppo frequentemente. Attendi 10 minuti e "
+"riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Si è verificato un errore sconosciuto di connessione: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Si è verificato un errore sconosciuto, %d. Info: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Nome gruppo non valido"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Connessione chiusa"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "In attesa di risposta..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC è ritornato dalla pausa. Puoi nuovamente inviare messaggi."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Password modificata con successo"
 
-#: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:6241
-#: ../pidgin/gtkblist.c:6599
 msgid "_Group:"
 msgstr "_Gruppo:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Ottieni informazioni dalla Directory"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Imposta le informazioni sulla Directory"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Impossibile aprire %s in scrittura!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
-msgstr "Trasferimento file fallito: probabilmente è stato annullato dall'altra parte."
+msgstr ""
+"Trasferimento file fallito: probabilmente è stato annullato dall'altra parte."
 
-#: ../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 "Impossibile connettersi per il trasferimento."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Impossibile scrivere l'header del file. Il file non verrà inviato."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s chiede che tu gli invii un file"
@@ -12784,99 +9400,96 @@ msgstr "%s chiede che tu gli invii un file"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Plugin per il protocollo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è ancora supportata."
+msgstr ""
+"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
+"ancora supportata."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio di Yahoo! non è stato inviato."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Messaggio di sistema Yahoo! per %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr "%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua lista contatti per il seguente motivo: %s."
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua "
+"lista contatti per il seguente motivo: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua lista contatti."
+msgstr ""
+"%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua "
+"lista contatti."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Aggiungi un contatto rifiutato"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, 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 "Il server di Yahoo ha richiesto l'uso di un metodo di autenticazione non riconosciuto. Probabilmente non sarai in grado di connetterti con successo a Yahoo. Controlla %s per aggiornamenti."
+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 ""
+"Il server di Yahoo ha richiesto l'uso di un metodo di autenticazione non "
+"riconosciuto. Probabilmente non sarai in grado di connetterti con successo a "
+"Yahoo. Controlla %s per aggiornamenti."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Autenticazione Yahoo! fallita"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, 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 "Hai cercato di ignorare %s, ma l'utente è nella tua lista contatti. Facendo clic su \"Sì\" il contatto verrà rimosso ed ignorato."
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"Hai cercato di ignorare %s, ma l'utente è nella tua lista contatti. Facendo "
+"clic su \"Sì\" il contatto verrà rimosso ed ignorato."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ignora il contatto?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Il tuo account è bloccato. Per piacere, effettua il login sul sito web di Yahoo!."
+msgstr ""
+"Il tuo account è bloccato. Per piacere, effettua il login sul sito web di "
+"Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Codice di errore %d sconosciuto. Il problema potrebbe essere risolto effettuando il login sul sito web di Yahoo!."
+msgstr ""
+"Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
+"effettuando il login sul sito web di Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per l'account %s."
+msgstr ""
+"Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per "
+"l'account %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2682
-#: ../libpurple/protocols/yahoo/yahoo.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Problema di connessione"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2708
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12885,7 +9498,6 @@ msgstr ""
 "Connessione persa con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12894,104 +9506,73 @@ msgstr ""
 "Impossibile stabilire una connessione con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "Non a casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "Non alla scrivania"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "Non in ufficio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
-#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "In vacanza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3104
-#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "A fare 2 passi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
 msgstr "Non è nella lista del server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
-#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "Appai come in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "Appai permanentemente come non in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "Presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "Sembra non in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "Non apparire permanentemente come non in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "Entra nella chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "Inizia una conferenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "Impostazioni di presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3405
+#, fuzzy
 msgid "Start Doodling"
-msgstr ""
+msgstr "_Prima porta:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
 msgstr "Quale ID vuoi attivare?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
-#, fuzzy
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "A chi vuoi unirti nella chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
 msgstr "Attiva l'ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
 msgstr "Unisciti ad un utente in chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
 msgstr "Apri posta in arrivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Elenca le stanze presenti sul network Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -13005,220 +9586,192 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4369
-#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin per il protocollo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo Giappone"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "Sever pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "Server pager (Giappone)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "Porta Yahoo Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "Server per il trasferimento file"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "Server per il trasferimento file (Giappone)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "Porta trasferimento file"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "Lingua della chat room"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignora gli inviti a conferenze e a chat room"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "URL della lista delle chat room"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Server Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Porta Yahoo Chat"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
+#, fuzzy
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "Richiedi nuovamente l'autorizzazione"
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "Impossibile creare un descrittore di file."
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Errore di scrittura"
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s sta cercando di inviarti un gruppo di %d file.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Profilo Yahoo! Giappone"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Profilo Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Spiacente, i profili contrassegnati come contenenti contenuti per soli adulti non sono attualmente supportati."
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Spiacente, i profili contrassegnati come contenenti contenuti per soli "
+"adulti non sono attualmente supportati."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
-msgstr "Se vuoi vedere questo profilo, dovrai aprire questo link con il tuo browser:"
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+"Se vuoi vedere questo profilo, dovrai aprire questo link con il tuo browser:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Ultime notizie"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Link preferito 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Link preferito 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Link preferito 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Ultimo aggiornamento"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informazioni sull'utente %s non disponibili"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
-msgstr "Spiacente, questo profilo sembra essere in un linguaggio non supportato al momento."
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"Spiacente, questo profilo sembra essere in un linguaggio non supportato al "
+"momento."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "Impossibile ricevere il profilo dell'utente. Molto probabilmente si tratta di un problema temporaneo sul server. Riprova più tardi."
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Impossibile ricevere il profilo dell'utente. Molto probabilmente si tratta "
+"di un problema temporaneo sul server. Riprova più tardi."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-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 "Impossibile ricevere il profilo dell'utente. Questo molto probabilmente vuol dire che l'utente non esiste. In ogni caso, Yahoo! a volte non riesce a trovare un profilo utente. Se sei certo che l'utente esista, riprova più tardi."
+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 ""
+"Impossibile ricevere il profilo dell'utente. Questo molto probabilmente vuol "
+"dire che l'utente non esiste. In ogni caso, Yahoo! a volte non riesce a "
+"trovare un profilo utente. Se sei certo che l'utente esista, riprova più "
+"tardi."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Il profilo dell'utente è vuoto."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il seguente motivo \"%s\"."
+msgstr ""
+"%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il "
+"seguente motivo \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Invito rifiutato"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Impossibile entrare nella chat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Stanza sconosciuta"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Forse la stanza è piena"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Non disponibile"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
-msgstr "Errore sconosciuto. Potrebbe essere necessario disconnettersi ed aspettare cinque minuti prima di poter entrare nuovamente nella chat room"
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Errore sconosciuto. Potrebbe essere necessario disconnettersi ed aspettare "
+"cinque minuti prima di poter entrare nuovamente nella chat room"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Stai ora conversando in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Impossibile unirsi al contatto in chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Forse non sono in chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Recupero della lista delle stanze fallito."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Voci"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Webcam"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Impossibile recuperare la lista delle stanze."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Stanze utente"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Problema di connessione con il server YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13227,97 +9780,93 @@ msgstr ""
 "Connessione persa con il server\n"
 "%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 "(C'è stato un errore nella conversione di questo messaggio.\t Controlla l'opzione 'Codifica' nell'editor degli account)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(C'è stato un errore nella conversione di questo messaggio.\t Controlla "
+"l'opzione 'Codifica' nell'editor degli account)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Impossibile invare alla chat %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Nascosto o non connesso"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>A %s da %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Istanza:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Tentativo di iscrizione a %s,%s,%s fallito"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Rintraccia l'utente"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Rinraccia l'utente"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;istanza&gt;: Imposta l'istanza da usare su questa classe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;istanza&gt;: Imposta l'istanza da usare su questa classe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;istanza&gt;: Imposta l'istanza da usare su questa classe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;classe&gt; &lt;istanza&gt; &lt;destinatario&gt;: Entra in una nuova chat"
+msgstr ""
+"sub &lt;classe&gt; &lt;istanza&gt; &lt;destinatario&gt;: Entra in una nuova "
+"chat"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;istanza&gt;: Invia un messaggio a &lt;messaggio,<i>istanza</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;istanza&gt;: Invia un messaggio a &lt;messaggio,<i>istanza</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;classe&gt; &lt;istanza&gt;: Invia un messaggio a &lt;<i>classe</i>,<i>istanza</i>,*&gt;"
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;classe&gt; &lt;istanza&gt;: Invia un messaggio a &lt;<i>classe</i>,"
+"<i>istanza</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;classe&gt; &lt;istanza&gt; &lt;destinatario&gt;: Invia un messaggio a &lt;<i>classe</i>,<i>istanza</i>,<i>destinatario</i>&gt;"
+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;classe&gt; &lt;istanza&gt; &lt;destinatario&gt;: Invia un messaggio "
+"a &lt;<i>classe</i>,<i>istanza</i>,<i>destinatario</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;istanza&gt; &lt;destinatario&gt;: Invia un messaggio a &lt;MESSAGE,<i>istanza</i>,<i>destinatario</i>&gt;"
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;istanza&gt; &lt;destinatario&gt;: Invia un messaggio a &lt;MESSAGE,"
+"<i>istanza</i>,<i>destinatario</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;classe&gt;: Invia un messaggio a &lt;<i>classe</i>,PERSONAL,*&gt;"
+msgstr ""
+"zc &lt;classe&gt;: Invia un messaggio a &lt;<i>classe</i>,PERSONAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Effettua nuovamente la sottoscrizione"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Recupera le sottoscrizioni dal server"
 
@@ -13331,48 +9880,34 @@ msgstr "Recupera le sottoscrizioni dal server"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin per il protocollo Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Utilizza tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "Comando tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Esporta in .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Esporta in .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Importa da .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Importa da .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
 #, fuzzy
 msgid "Realm"
 msgstr "Vero nome"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Esposizione"
 
-#: ../libpurple/proxy.c:461
-#: ../libpurple/proxy.c:902
-#: ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13381,95 +9916,63 @@ msgstr ""
 "Impossibile creare il socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:702
-#: ../libpurple/proxy.c:750
-#: ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Errore di connessione al proxy HTTP: %d"
 
-#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %d."
+msgstr ""
+"Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %"
+"d."
 
-#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Errore nella risoluzione di %s"
 
-#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Impossibile risolvere il nome dell'host"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Richiedi l'attenzione di %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s ha richiesto la tua attenzione!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @since 2.3.0
-#.
-#. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @deprecated Please use purple_request_yes_no_with_hint instead.
 #.
-#: ../libpurple/request.h:1802
-#: ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "_Sì"
 
-#: ../libpurple/request.h:1802
-#: ../libpurple/request.h:1815
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @since 2.3.0
-#.
-#. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
 #.
-#: ../libpurple/request.h:1854
-#: ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "_Accetta"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Sono momentaneamente assente"
 
-#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "status salvati"
 
-#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s è ora conosciuto come %s.\n"
 
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "Richiedi l'attenzione di %s..."
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s ha richiesto la tua attenzione!"
-
-#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13478,286 +9981,272 @@ msgstr ""
 "%s ha invitato %s nella chat room: %s\n"
 "%s"
 
-#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitato %s nella chat room: %s\n"
 
-#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Accetti l'invito alla chat?"
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+msgid "Shortcut"
+msgstr "Scorciatoia"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Scorciatoia di testo per lo smiley"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Immagine salvata"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
 msgid "SSL Connection Failed"
 msgstr "Connessione SSL fallita"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Handshake SSL fallito"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "Il peer SSL ha presentato un certificato non valido"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Errore SSL sconosciuto"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Rimuovi"
 
-#: ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Ancora assente"
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: ../libpurple/status.c:161
 msgid "Listening to music"
 msgstr "Sta ascoltando musica"
 
-#: ../libpurple/status.c:610
 #, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s ha cambiato stato da %s a %s"
-
-#: ../libpurple/status.c:613
-#, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s ha cambiato stato da %s a %s"
+msgstr "%s (%s) ha cambiato stato da %s a %s"
 
-#: ../libpurple/status.c:624
 #, c-format
-msgid "%s is now %s"
-msgstr "%s è ora %s"
-
-#: ../libpurple/status.c:626
-#, fuzzy, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s è ora %s"
+msgstr "%s (%s) è ora %s"
 
-#: ../libpurple/status.c:632
 #, c-format
-msgid "%s is no longer %s"
-msgstr "%s non è più %s"
-
-#: ../libpurple/status.c:634
-#, fuzzy, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s non è più %s"
+msgstr "%s (%s) non è più %s"
 
-#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s è diventato inattivo"
 
-#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s è ritornato attivo"
 
-#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s è diventato inattivo"
 
-#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s è ritornato attivo"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "Errore nella lettura di %s"
 
-#: ../libpurple/util.c:2784
 #, 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 "Si è verificato un errore nella lettura dei tuoi %s. Non sono stati caricati e il vecchio file è stato rinominato in %s~."
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Si è verificato un errore nella lettura dei tuoi %s. Non sono stati caricati "
+"e il vecchio file è stato rinominato in %s~."
 
-#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "Calcolo in corso..."
 
-#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "Sconosciuto."
 
-#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondo"
 msgstr[1] "%d secondi"
 
-#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d giorno"
 msgstr[1] "%d giorni"
 
-#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d ora"
 msgstr[1] "%s, %d ore"
 
-#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minuti"
 
-#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Impossibile aprire %s: redirezionato troppe volte"
 
-#: ../libpurple/util.c:3647
-#: ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Impossibile connettersi a %s"
 
-#: ../libpurple/util.c:3770
 #, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr "Impossibile allocare memoria sufficiente per i contenuti di %s. E' possibile che il server web stia tentando qualcosa di sospetto."
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Impossibile allocare memoria sufficiente per i contenuti di %s. E' possibile "
+"che il server web stia tentando qualcosa di sospetto."
 
-#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Errore di lettura da %s: %s"
 
-#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Errore di scrittura su %s: %s"
 
-#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossibile connettersi a %s: %s"
 
-#: ../pidgin.desktop.in.h:1
+#, c-format
+msgid " - %s"
+msgstr ""
+
+#, c-format
+msgid " (%s)"
+msgstr "(%s)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "Connessione interrotta da un altro programma sul tuo computer."
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr "L'host remoto ha chiuso la connessione."
+
+#. 10060
+#, c-format
+msgid "Connection timed out."
+msgstr "Connessione scaduta."
+
+#. 10061
+#, c-format
+msgid "Connection refused."
+msgstr "Connessione rifiutata."
+
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Indirizzo già in uso."
+
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Client multiprotocollo per messaggi immediati"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientazione"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "L'orientazione del vassoio."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Opzioni di login"
 
-#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tocollo:"
 
-#: ../pidgin/gtkaccount.c:442
-msgid "Screen _name:"
-msgstr "_Nome utente:"
-
-#: ../pidgin/gtkaccount.c:532
-msgid "_Local alias:"
-msgstr "Alias _locale:"
+msgid "_Username:"
+msgstr "Nome _utente:"
 
-#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "Ricorda la pass_word"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Opzioni utente"
 
-#: ../pidgin/gtkaccount.c:607
+msgid "_Local alias:"
+msgstr "Alias _locale:"
+
 msgid "New _mail notifications"
 msgstr "Notifica i nuovi messaggi di _posta"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizza per questo account la seguente _icona:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "Opzioni %s"
 
-#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizza le opzioni del proxy di GNOME"
 
-#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Utilizza le opzioni globali del proxy"
 
-#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Nessun proxy"
 
-#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:970
-#: ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Utilizza le opzioni globali"
 
@@ -13766,832 +10255,689 @@ msgstr "Utilizza le opzioni globali"
 #. 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:1009
 msgid "If you look real closely"
 msgstr "Se guardi da vicino"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "puoi vedere le farfalle accoppiarsi"
 
-#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "Opzioni del proxy"
 
-#: ../pidgin/gtkaccount.c:1047
-#: ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "_Tipo di proxy:"
 
-#: ../pidgin/gtkaccount.c:1056
-#: ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1060
-#: ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1068
-msgid "_Username:"
-msgstr "Nome _utente:"
-
-#: ../pidgin/gtkaccount.c:1075
-#: ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
 msgstr "Impossibile salvare il nuovo account"
 
-#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
 msgstr "Esiste già un account con i criteri specificati."
 
-#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Aggiungi un account"
 
-#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "Di _base"
 
-#: ../pidgin/gtkaccount.c:1504
-msgid "Create this new account on the server"
-msgstr "Crea questo nuovo account sul server"
+msgid "Create _this new account on the server"
+msgstr "Crea _questo nuovo account sul server"
 
-#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_Avanzate"
 
-#: ../pidgin/gtkaccount.c:1978
-#: ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../pidgin/gtkaccount.c:2207
 #, 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'>Benvenuto in %s!</span>\n"
 "\n"
-"Non hai nessun account configurato. Per iniziare a connetterti con %s, premi il pulsante <b>Aggiungi</b> qui sotto e configura il tuo primo account. Se vuoi che %s si connetta a diversi account di messaggistica, premi nuovamente <b>Aggiungi</b> per configurarli tutti.\n"
+"Non hai nessun account configurato. Per iniziare a connetterti con %s, premi "
+"il pulsante <b>Aggiungi</b> qui sotto e configura il tuo primo account. Se "
+"vuoi che %s si connetta a diversi account di messaggistica, premi nuovamente "
+"<b>Aggiungi</b> per configurarli tutti.\n"
 "\n"
-"Puoi tornare a questa finestra, per aggiungere, modificare o rimuovere un account, attraverso <b>Account->Aggiungi/Modifica</b> nella finestra della Lista contatti."
+"Puoi tornare a questa finestra, per aggiungere, modificare o rimuovere un "
+"account, attraverso <b>Account->Aggiungi/Modifica</b> nella finestra della "
+"Lista contatti."
 
-#: ../pidgin/gtkblist.c:543
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Hai già %d contatto con il nome %s. Vuoi unirli?"
 msgstr[1] "Hai già %d contatti con il nome %s. Vuoi unirli?"
 
-#: ../pidgin/gtkblist.c:544
-msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
-msgstr "Unendo questi contatti verrà mostrata un'unica voce nella lista contatti ed usata un'unica finestra di conversazione. Puoi separarli nuovamente scegliendo 'Massimizza' dal menu contestuale del contatto"
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Unendo questi contatti verrà mostrata un'unica voce nella lista contatti ed "
+"usata un'unica finestra di conversazione. Puoi separarli nuovamente "
+"scegliendo 'Massimizza' dal menu contestuale del contatto"
 
-#: ../pidgin/gtkblist.c:546
-msgid "_Merge"
-msgstr "_Unisci"
+msgid "Please update the necessary fields."
+msgstr "Aggiorna i campi necessari."
 
-#: ../pidgin/gtkblist.c:961
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr "Inserisci le informazioni appropriate per la chat nella quale vuoi entrare.\n"
+msgid "Room _List"
+msgstr "_Lista delle stanze"
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Inserisci le informazioni appropriate per la chat nella quale vuoi entrare.\n"
 
-#: ../pidgin/gtkblist.c:972
-#: ../pidgin/gtkblist.c:6560
-#: ../pidgin/gtkpounce.c:554
-#: ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1261
-#: ../pidgin/gtkprivacy.c:605
-#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "_Blocca"
 
-#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "_Sblocca"
 
-#: ../pidgin/gtkblist.c:1304
 msgid "Move to"
-msgstr ""
+msgstr "Sposta in"
 
-#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "_Info"
 
-#: ../pidgin/gtkblist.c:1347
-#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1353
 msgid "_Send File..."
 msgstr "_Invia file..."
 
-#: ../pidgin/gtkblist.c:1360
 msgid "Add Buddy _Pounce..."
 msgstr "Aggiungi un _allarme..."
 
-#: ../pidgin/gtkblist.c:1365
-#: ../pidgin/gtkblist.c:1369
-#: ../pidgin/gtkblist.c:1484
-#: ../pidgin/gtkblist.c:1507
 msgid "View _Log"
 msgstr "Mostra il _log"
 
-#: ../pidgin/gtkblist.c:1375
 msgid "Hide when offline"
 msgstr "Nascondi quando non sei in linea"
 
-#: ../pidgin/gtkblist.c:1375
 msgid "Show when offline"
 msgstr "Mostra quando non sei in linea"
 
-#: ../pidgin/gtkblist.c:1389
-#: ../pidgin/gtkblist.c:1398
-#: ../pidgin/gtkblist.c:1492
-#: ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1392
-#: ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494
-#: ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../pidgin/gtkblist.c:1450
+msgid "Set Custom Icon"
+msgstr "Imposta un'icona personalizzata"
+
+msgid "Remove Custom Icon"
+msgstr "Rimuovi l'icona personalizzata"
+
 msgid "Add _Buddy..."
 msgstr "Aggiungi un _contatto..."
 
-#: ../pidgin/gtkblist.c:1453
 msgid "Add C_hat..."
 msgstr "Aggiungi una c_hat..."
 
-#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "_Elimina il gruppo"
 
-#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "_Rinomina"
 
 #. join button
-#: ../pidgin/gtkblist.c:1478
-#: ../pidgin/gtkroomlist.c:316
-#: ../pidgin/gtkroomlist.c:773
-#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "Entra automaticamente"
 
-#: ../pidgin/gtkblist.c:1482
 msgid "Persistent"
 msgstr "Persistente"
 
-#: ../pidgin/gtkblist.c:1520
-#: ../pidgin/gtkblist.c:1543
+msgid "_Edit Settings..."
+msgstr "_Modifica le impostazioni..."
+
 msgid "_Collapse"
 msgstr "_Minimizza"
 
-#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "M_assimizza"
 
-#: ../pidgin/gtkblist.c:1799
-#: ../pidgin/gtkblist.c:1811
-#: ../pidgin/gtkblist.c:5225
-#: ../pidgin/gtkblist.c:5238
 msgid "/Tools/Mute Sounds"
 msgstr "/Strumenti/Nessun suono"
 
-#: ../pidgin/gtkblist.c:2271
-#: ../pidgin/gtkconv.c:4922
-#: ../pidgin/gtkpounce.c:437
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Non sei attualmente connesso a nessun protocollo che consenta di aggiungere un contatto."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Non sei attualmente connesso a nessun protocollo che consenta di aggiungere "
+"un contatto."
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#, fuzzy
+msgid "Unknown node type"
+msgstr "tipo di compressione sconosciuto `%s'!"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/_Contatti"
 
-#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contatti/Nuovo _messaggio immediato..."
 
-#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contatti/Entra in _chat..."
 
-#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contatti/_Informazioni sul contatto..."
 
-#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/Contatti/Mostra il log dell'utente..."
 
-#: ../pidgin/gtkblist.c:3109
 msgid "/Buddies/Sh_ow"
 msgstr "/Contatti/M_ostra"
 
-#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Contatti/Mostra/Contatti _non in linea"
 
-#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Contatti/Mostra/Gruppi _vuoti"
 
-#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Contatti/Mostra/_Dettagli sui contatti"
 
-#: ../pidgin/gtkblist.c:3113
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Contatti/Mostra/_Tempi di inattività"
 
-#: ../pidgin/gtkblist.c:3114
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Contatti/Mostra/_Icone del protocollo"
 
-#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contatti/_Ordina contatti"
 
-#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contatti/_Aggiungi contatto..."
 
-#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contatti/Aggiungi c_hat..."
 
-#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/Contatti/Aggiungi _gruppo..."
 
-#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/Contatti/_Esci"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/_Account"
 
-#: ../pidgin/gtkblist.c:3125
-#: ../pidgin/gtkblist.c:7262
-msgid "/Accounts/Manage"
-msgstr "/Account/Gestisci"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Account/Gestisci gli account"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "/_Strumenti"
 
-#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Strumenti/A_llarmi"
 
-#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/_Certificates"
 msgstr "/Strumenti/_Certificati"
 
-#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/Strumenti/Plu_gin"
 
-#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/Strumenti/Pr_eferenze"
 
-#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/Strumenti/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:3135
+msgid "/Tools/Smile_y"
+msgstr "/Strumenti/Smile_y"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Strumenti/Trasferimento _file"
 
-#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/Strumenti/Lista delle _stanze"
 
-#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/Strumenti/_Log di sistema"
 
-#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/Strumenti/Nessun _suono"
 
 #. Help
-#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
 msgstr "/_Aiuto"
 
-#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
 msgstr "/Aiuto/_Aiuto online"
 
-#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/Aiuto/Finestra di _debug"
 
-#: ../pidgin/gtkblist.c:3145
-#: ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/Aiuto/I_nformazioni"
 
-#: ../pidgin/gtkblist.c:3176
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Account:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>Occupanti:</b> %d"
+
 #, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Argomento:</b> %s"
+
+msgid "(no topic set)"
+msgstr "(Nessun argomento impostato)"
 
-#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "Alias per il contatto"
 
-#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "Connesso"
 
-#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "Visto l'ultima volta"
 
-#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "Spaventoso"
 
-#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "Magnifico"
 
-#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "Ganzo"
 
-#: ../pidgin/gtkblist.c:3693
+msgid "Total Buddies"
+msgstr "Numero totale di contatti"
+
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inattivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inattivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "Inattivo %dm"
 
-#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contatti/Nuovo messaggio immediato..."
 
-#: ../pidgin/gtkblist.c:3852
-#: ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contatti/Entra in chat..."
 
-#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/Contatti/Informazioni sul contatto..."
 
-#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contatti/Aggiungi contatto..."
 
-#: ../pidgin/gtkblist.c:3855
-#: ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/Contatti/Aggiungi chat..."
 
-#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/Contatti/Aggiungi gruppo..."
 
-#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/Strumenti/Privacy"
 
-#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "/Strumenti/Lista delle stanze"
 
-#: ../pidgin/gtkblist.c:4026
-#: ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d messaggio non letto da %s\n"
 msgstr[1] "%d messaggi non letti da %s\n"
 
-#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:4192
 msgid "By status"
 msgstr "Per stato"
 
-#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
 msgstr "Per dimensione del log"
 
-#: ../pidgin/gtkblist.c:4483
 #, c-format
 msgid "%s disconnected"
 msgstr "%s si è disconnesso"
 
-#: ../pidgin/gtkblist.c:4485
 #, c-format
 msgid "%s disabled"
 msgstr "%s disabilitato"
 
-#: ../pidgin/gtkblist.c:4489
 msgid "Reconnect"
 msgstr "Riconnetti"
 
-#: ../pidgin/gtkblist.c:4489
-#: ../pidgin/gtkblist.c:4577
 msgid "Re-enable"
 msgstr "Riabilita"
 
-#: ../pidgin/gtkblist.c:4493
-#: ../pidgin/gtkblist.c:4580
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "Ignora"
+msgid "Welcome back!"
+msgstr "Bentornato!"
 
-#: ../pidgin/gtkblist.c:4604
-#, fuzzy, c-format
-msgid "%d account was disabled because you signed on from another location."
-msgid_plural "%d accounts were disabled because you signed on from another location."
-msgstr[0] "Sei connesso da un'altra postazione."
-msgstr[1] "Sei connesso da un'altra postazione."
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+"%d account è stato disabilitato perché sei connesso da un'altra posizione:"
+msgstr[1] ""
+"%d account sono stati disabilitati perché sei connesso da un'altra posizione:"
 
-#: ../pidgin/gtkblist.c:4831
 msgid "<b>Username:</b>"
 msgstr "<b>Nome utente:</b>"
 
-#: ../pidgin/gtkblist.c:4838
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
-#: ../pidgin/gtkblist.c:4849
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4934
 msgid "/Accounts"
 msgstr "/Account"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4948
 #, 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->Manage</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->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Benvenuto in %s!</span>\n"
 "\n"
-"Non hai abilitato nessun account. Puoi farlo dalla finestra <b>Account</b>, raggiungibile da <b>Account->Gestisci</b>. Una volta abilitato un account, potrai connetterti, impostare il tuo stato e parlare con i tuoi amici."
+"Non hai abilitato nessun account. Puoi farlo dalla finestra <b>Account</b>, "
+"raggiungibile da <b>Account->Gestisci account</b>. Una volta abilitato un "
+"account, potrai connetterti, impostare il tuo stato e parlare con i tuoi "
+"amici."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5219
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Contatti/Mostra/Contatti non in linea"
 
-#: ../pidgin/gtkblist.c:5222
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Contatti/Mostra/Gruppi vuoti"
 
-#: ../pidgin/gtkblist.c:5228
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Contatti/Mostra/Dettagli sui contatti"
 
-#: ../pidgin/gtkblist.c:5231
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Contatti/Mostra/Tempi di inattività"
 
-#: ../pidgin/gtkblist.c:5234
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Contatti/Mostra/Icone del protocollo"
 
-#: ../pidgin/gtkblist.c:6166
-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 "Inserisci il nome utente della persona che vuoi aggiungere alla tua lista contatti. Puoi aggiungere opzionalmente un alias, o nickname, per il contatto. Gli alias verranno mostrati al posto del nome utente, laddove è possibile.\n"
+msgid "Add a buddy.\n"
+msgstr "Aggiungi un contatto.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6189
-msgid "A_ccount:"
-msgstr "A_ccount:"
+msgid "Buddy's _username:"
+msgstr "_Nome utente del contatto:"
 
-#. End of account box
-#: ../pidgin/gtkblist.c:6201
-msgid "_Screen name:"
-msgstr "Nome _utente:"
+msgid "(Optional) A_lias:"
+msgstr "A_lias (opzionale):"
 
-#: ../pidgin/gtkblist.c:6223
-#: ../pidgin/gtkblist.c:6581
-msgid "A_lias:"
-msgstr "A_lias:"
+msgid "Add buddy to _group:"
+msgstr "Aggiungi un contatto al _gruppo:"
 
-#: ../pidgin/gtkblist.c:6491
 msgid "This protocol does not support chat rooms."
 msgstr "Questo protocollo non supporta le chat room."
 
-#: ../pidgin/gtkblist.c:6507
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr "Non sei attualmente connesso a nessun protocollo che consenta una chat."
-
-#: ../pidgin/gtkblist.c:6550
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "Inserisci un alias e le informazioni appropriate per la chat che vuoi aggiungere alla tua lista contatti.\n"
-
-#: ../pidgin/gtkblist.c:6609
-msgid "Autojoin when account becomes online."
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
 msgstr ""
+"Non sei attualmente connesso a nessun protocollo che consenta una chat."
 
-#: ../pidgin/gtkblist.c:6610
-msgid "Hide chat when the window is closed."
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
 msgstr ""
+"Inserisci un alias e le informazioni appropriate per la chat che vuoi "
+"aggiungere alla tua lista contatti.\n"
+
+msgid "A_lias:"
+msgstr "A_lias:"
+
+msgid "Auto_join when account becomes online."
+msgstr "Entra _automaticamente quando l'account si connette."
+
+msgid "_Hide chat when the window is closed."
+msgstr "_Nascondi la chat quando la finestra è chiusa."
 
-#: ../pidgin/gtkblist.c:6636
 msgid "Please enter the name of the group to be added."
 msgstr "Inserisci il nome del gruppo da aggiungere."
 
-#: ../pidgin/gtkblist.c:7282
+msgid "Enable Account"
+msgstr "Abilita account"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Account/Abilita account"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Account/"
 
-#: ../pidgin/gtkblist.c:7306
 msgid "_Edit Account"
 msgstr "_Modifica account"
 
-#: ../pidgin/gtkblist.c:7319
-#: ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "Nessuna azione disponibile"
 
-#: ../pidgin/gtkblist.c:7327
 msgid "_Disable"
 msgstr "_Disabilita"
 
-#: ../pidgin/gtkblist.c:7339
-msgid "Enable Account"
-msgstr "Abilita account"
-
-#: ../pidgin/gtkblist.c:7345
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Account/Abilita account"
-
-#: ../pidgin/gtkblist.c:7394
 msgid "/Tools"
 msgstr "/Strumenti"
 
-#: ../pidgin/gtkblist.c:7464
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contatti/Ordina contatti"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
 msgstr "Server SSL"
 
-#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: ../pidgin/gtkconv.c:796
-#: ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Il contatto appartiene a un protocollo diverso da quello di questa chat"
+msgstr ""
+"Il contatto appartiene a un protocollo diverso da quello di questa chat"
 
-#: ../pidgin/gtkconv.c:816
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Non sei attualmente connesso a nessun protocollo che consenta di invitare il contatto."
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Non sei attualmente connesso a nessun protocollo che consenta di invitare il "
+"contatto."
 
-#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invita un contatto nella chat room"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr "Inserisci il nome del contatto che vuoi invitare, insieme a un messaggio di invito (opzionale)."
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Inserisci il nome del contatto che vuoi invitare, insieme a un messaggio di "
+"invito (opzionale)."
 
-#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Contatto:"
 
-#: ../pidgin/gtkconv.c:931
-#: ../pidgin/gtksavedstatuses.c:1200
-#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_Messaggio:"
 
-#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversazioni con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Salva la conversazione"
 
-#: ../pidgin/gtkconv.c:1179
-#: ../pidgin/gtkdebug.c:168
-#: ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "Trova"
 
-#: ../pidgin/gtkconv.c:1205
-#: ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Annulla ignora"
 
-#: ../pidgin/gtkconv.c:1699
+msgid "Ignore"
+msgstr "Ignora"
+
 msgid "Get Away Message"
 msgstr "Ottieni messaggio di assenza"
 
-#: ../pidgin/gtkconv.c:1722
-#, fuzzy
 msgid "Last said"
-msgstr "Cognome:"
+msgstr "Ultimo messaggio"
 
-#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Impossibile salvare il file dell'icona sul disco."
 
-#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Salva l'icona"
 
-#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Anima"
 
-#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Nascondi l'icona"
 
-#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Salva l'icona con nome..."
 
-#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Imposta un'icona personalizzata..."
 
-#: ../pidgin/gtkconv.c:2799
-msgid "Remove Custom Icon"
-msgstr "Rimuovi l'icona personalizzata"
+msgid "Change Size"
+msgstr "Modifica dimensione"
 
-#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr "Mostra tutto"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Conversazione"
 
-#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Contatti/Nuovo _messaggio immediato..."
 
-#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Conversazione/_Trova..."
 
-#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Conversazione/Mostra il _log"
 
-#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Conversazione/_Salva con nome..."
 
-#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversazione/Rimuovi lo _storico"
 
-#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
 
-#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversazione/Aggiungi un _allarme..."
 
-#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Conversazione/_Info"
 
-#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Conversazione/In_vita..."
 
-#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Conversazione/_Altro"
 
-#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversazione/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Conversazione/_Blocca..."
 
-#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversazione/_Sblocca..."
 
-#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Conversazione/_Aggiungi..."
 
-#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Conversazione/_Rimuovi..."
 
-#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversazione/Inserisci un _collegamento..."
 
-#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversazione/Inserisci un'imma_gine..."
 
-#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Conversazione/_Chiudi"
 
 #. Options
-#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_Opzioni"
 
-#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Opzioni/Abilita il _log"
 
-#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Opzioni/Abilita i _suoni"
 
-#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opzioni/Mostra la _barra di formattazione"
 
-#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opzioni/Mostra i ti_mestamp"
 
-#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/Conversazione/Altro"
 
-#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
 msgstr "/Opzioni"
 
@@ -14600,976 +10946,784 @@ msgstr "/Opzioni"
 #. 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:3225
-#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/Conversazione"
 
-#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/Conversazione/Mostra il log"
 
-#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
 
-#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversazione/Aggiungi un allarme..."
 
-#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/Conversazione/Info"
 
-#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/Conversazione/Invita..."
 
-#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/Conversazione/Alias..."
 
-#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/Conversazione/Blocca..."
 
-#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/Conversazione/Sblocca..."
 
-#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/Conversazione/Aggiungi..."
 
-#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/Conversazione/Rimuovi..."
 
-#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversazione/Inserisci un link..."
 
-#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversazione/Inserisci un'immagine..."
 
-#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/Opzioni/Abilita il log"
 
-#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/Opzioni/Abilita i suoni"
 
-#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opzioni/Mostra la barra di formattazione"
 
-#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/Opzioni/Mostra i timestamp"
 
-#: ../pidgin/gtkconv.c:3419
-#: ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "L'utente sta scrivendo..."
 
-#: ../pidgin/gtkconv.c:3464
-msgid "User has typed something and stopped"
-msgstr "L'utente ha scritto qualcosa ed ora è in pausa"
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s ha smesso di scrivere"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3648
-#: ../pidgin/gtkconv.c:8248
 msgid "S_end To"
 msgstr "_Invia a"
 
-#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "_Invia"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "0 persone nella stanza"
 
-#: ../pidgin/gtkconv.c:5846
-#: ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona nella stanza"
 msgstr[1] "%d persone nella stanza"
 
-#: ../pidgin/gtkconv.c:6574
-#: ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Sta scrivendo"
 
-#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "Ha smesso di scrivere"
 
-#: ../pidgin/gtkconv.c:6581
 #, fuzzy
 msgid "Nick Said"
-msgstr "Nickname"
+msgstr "%s ha pronunciato il tuo nick in %s"
 
-#: ../pidgin/gtkconv.c:6584
-#: ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Messaggi non letti"
 
-#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "Nuovo evento"
 
-#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: rimuove lo storico di tutte le conversazioni."
 
-#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "Conferma chiusura"
 
-#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Hai dei messaggi non letti. Sei sicuro di voler chiudere la finestra?"
 
-#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "Chiudi le altre schede"
 
-#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "Chiudi tutte le schede"
 
-#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "Stacca questa scheda"
 
-#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "Chiudi questa scheda"
 
-#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "Chiudi la conversazione"
 
-#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "Ultima finestra creata"
 
-#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "Separa le finestre dei MI e delle chat"
 
-#: ../pidgin/gtkconv.c:9712
-#: ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "Nuova finestra"
 
-#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "Per gruppo"
 
-#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "Per account"
 
-#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "Salva il log di debug"
 
-#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "Inverti"
 
-#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "Evidenzia le corrispondenze"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "Solo _icone"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "Solo _testo"
 
-#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "Icone _e testo"
 
-#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "Fai clic col tasto destro per altre opzioni."
 
-#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "Livello"
 
-#: ../pidgin/gtkdebug.c:830
-#: ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "Seleziona il livello del filtro di debug."
 
-#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "Tutto"
 
-#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "Misc"
 
-#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "Avviso"
 
-#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "Errore"
 
-#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "Errore fatale"
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:117
-msgid "lead developer"
-msgstr "sviluppatore principale"
-
-#: ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77
-#: ../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:85
-#: ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87
-#: ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92
-#: ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "sviluppatore"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
 msgid "support"
 msgstr "supporto"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "supporto/QA"
 
-#: ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "sviluppatore e webmaster"
 
-#: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Collaboratore senior/QA"
 
-#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "port su win32"
 
-#: ../pidgin/gtkdialogs.c:109
-#: ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "maintainer"
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "Maintainer della libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e autista designato [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "sviluppatore XMPP"
 
-#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "autore originale"
 
-#: ../pidgin/gtkdialogs.c:133
+msgid "lead developer"
+msgstr "sviluppatore principale"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134
-#: ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "Arabo"
 
-#: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:136
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "Bosniaco"
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Catalano"
 
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalano"
 
-#: ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../pidgin/gtkdialogs.c:147
-#: ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Danese"
 
-#: ../pidgin/gtkdialogs.c:149
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "Tedesco"
 
-#: ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Greco"
 
-#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Inglese Australiano"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Inglese Canadese"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "Inglese Britannico"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160
-#: ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
 msgstr "Estone"
 
-#: ../pidgin/gtkdialogs.c:162
-#: ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Euskera (Basco)"
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persiano"
 
-#: ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "Finlandese"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "Francese"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "Galiziano"
 
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "Team per la lingua Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173
-#: ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonesiano"
 
-#: ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Traduttori georgiani di Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "Team dei traduttori Kannada"
 
-#: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Leone"
+msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Macedone"
 
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
 msgstr "Norvegese Bokmål"
 
-#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr "Nepalese"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "Olandese, Fiammingo"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
 msgstr "Norvegese Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:257
+msgid "Occitan"
+msgstr ""
+
+msgid "Punjabi"
+msgstr "Punjabi"
+
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "Portoghese-Brasile"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "Rumeno"
 
-#: ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Russo"
 
-#: ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Sloveno"
 
-#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "Albanese"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+msgid "Sinhala"
+msgstr "Singalese"
+
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "Thailandese"
 
-#: ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:213
+msgid "Urdu"
+msgstr "Urdu"
+
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e il Team Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Cinese semplificato"
 
-#: ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "Cinese di Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Cinese tradizionale"
 
-#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "Amarico"
 
-#: ../pidgin/gtkdialogs.c:368
 #, c-format
 msgid "About %s"
 msgstr "Informazioni su %s"
 
-#: ../pidgin/gtkdialogs.c:411
 #, 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, MySpaceIM, 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 è un client grafico modulare di messaggistica basato su libpurple in grado di usare allo stesso tempo i protocolli AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu e QQ. È scritto utilizzando GTK+.<BR><BR>È possibile modificare e ridistribuire il programma nei termini della licenza GPL (versione 2 o successiva).  Una copia della GPL è contenuta nel file 'COPYING' distribuito con %s. Il copyright di %s appartiene ai suoi autori. Per una lista completa degli autori, vedere il file 'COPYRIGHT'.  Il programma è fornito senza nessuna garanzia.<BR><BR>"
+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, MySpaceIM, 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 è un client grafico modulare di messaggistica basato su libpurple in "
+"grado di usare allo stesso tempo i protocolli AIM, MSN, Yahoo!, XMPP, ICQ, "
+"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
+"MySpaceIM, Gadu-Gadu e QQ. È scritto utilizzando GTK+.<BR><BR>È possibile "
+"modificare e ridistribuire il programma nei termini della licenza GPL "
+"(versione 2 o successiva).  Una copia della GPL è contenuta nel file "
+"'COPYING' distribuito con %s. Il copyright di %s appartiene ai suoi autori. "
+"Per una lista completa degli autori, vedere il file 'COPYRIGHT'.  Il "
+"programma è fornito senza nessuna garanzia.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:429
 #, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:434
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
 
-#: ../pidgin/gtkdialogs.c:449
 msgid "Crazy Patch Writers"
 msgstr "I pazzi scrittori di patch"
 
-#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Developers"
 msgstr "Sviluppatori ritirati"
 
-#: ../pidgin/gtkdialogs.c:479
 msgid "Retired Crazy Patch Writers"
 msgstr "I pazzi scrittori di patch in pensione"
 
-#: ../pidgin/gtkdialogs.c:494
 msgid "Artists"
 msgstr "Artisti"
 
-#: ../pidgin/gtkdialogs.c:509
 msgid "Current Translators"
 msgstr "Traduttori attuali"
 
-#: ../pidgin/gtkdialogs.c:529
 msgid "Past Translators"
 msgstr "Traduttori precedenti"
 
-#: ../pidgin/gtkdialogs.c:547
 msgid "Debugging Information"
 msgstr "Informazioni di debug"
 
-#: ../pidgin/gtkdialogs.c:764
-#: ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:988
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../pidgin/gtkdialogs.c:769
-#, fuzzy
-msgid "Buddy"
-msgstr "_Contatto:"
-
-#: ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912
-#: ../pidgin/gtkdialogs.c:993
 msgid "_Account"
 msgstr "_Account"
 
-#: ../pidgin/gtkdialogs.c:920
 msgid "Get User Info"
 msgstr "Informazioni sull'utente"
 
-#: ../pidgin/gtkdialogs.c:922
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
-msgstr "Inserisci il nome utente o l'alias della persona della quale vuoi informazioni."
+#, fuzzy
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+"Inserisci il nome utente o l'alias della persona della quale vuoi "
+"informazioni."
 
-#: ../pidgin/gtkdialogs.c:1012
 msgid "View User Log"
 msgstr "Mostra il log dell'utente"
 
-#: ../pidgin/gtkdialogs.c:1014
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr "Inserisci il nome utente o l'alias della persona della quale vuoi vedere il log."
-
-#: ../pidgin/gtkdialogs.c:1034
 msgid "Alias Contact"
 msgstr "Imposta un alias per la lista"
 
-#: ../pidgin/gtkdialogs.c:1035
 msgid "Enter an alias for this contact."
 msgstr "Inserisci un alias per questa lista."
 
-#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Inserisci un alias per %s."
 
-#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Buddy"
 msgstr "Imposta un alias per il contatto"
 
-#: ../pidgin/gtkdialogs.c:1080
 msgid "Alias Chat"
 msgstr "Imposta un alias per la chat"
 
-#: ../pidgin/gtkdialogs.c:1081
 msgid "Enter an alias for this chat."
 msgstr "Inserisci un alias per questa chat."
 
-#: ../pidgin/gtkdialogs.c:1120
 #, 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] "Stai per rimuovere la lista contenente %s e %d altro contatto dalla tua lista contatti. Vuoi continuare?"
-msgstr[1] "Stai per rimuovere la lista contenente %s e altri %d contatti dalla tua lista contatti. Vuoi continuare?"
+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] ""
+"Stai per rimuovere la lista contenente %s e %d altro contatto dalla tua "
+"lista contatti. Vuoi continuare?"
+msgstr[1] ""
+"Stai per rimuovere la lista contenente %s e altri %d contatti dalla tua "
+"lista contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1128
 msgid "Remove Contact"
 msgstr "Rimuovi lista"
 
-#: ../pidgin/gtkdialogs.c:1131
 msgid "_Remove Contact"
 msgstr "_Rimuovi contatto"
 
-#: ../pidgin/gtkdialogs.c:1162
 #, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
-msgstr "Stai per unire il gruppo chiamato %s con il gruppo chiamato %s. Vuoi continuare?"
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Stai per unire il gruppo chiamato %s con il gruppo chiamato %s. Vuoi "
+"continuare?"
 
-#: ../pidgin/gtkdialogs.c:1169
 msgid "Merge Groups"
 msgstr "Unisci gruppi"
 
-#: ../pidgin/gtkdialogs.c:1172
 msgid "_Merge Groups"
 msgstr "_Unisci gruppi"
 
-#: ../pidgin/gtkdialogs.c:1222
 #, 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 "Stai per rimuovere il gruppo %s e tutti i suoi membri dalla tua lista contatti. Vuoi continuare?"
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Stai per rimuovere il gruppo %s e tutti i suoi membri dalla tua lista "
+"contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Group"
 msgstr "Rimuovi il gruppo"
 
-#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Group"
 msgstr "_Rimuovi gruppo"
 
-#: ../pidgin/gtkdialogs.c:1261
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Stai per rimuovere %s dalla tua lista contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Buddy"
 msgstr "Rimuovi il contatto"
 
-#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Buddy"
 msgstr "_Rimuovi il contatto"
 
-#: ../pidgin/gtkdialogs.c:1288
 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr "Stai per rimuovere la chat %s dalla tua lista contatti. Vuoi continuare?"
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Stai per rimuovere la chat %s dalla tua lista contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1291
 msgid "Remove Chat"
 msgstr "Rimuovi la chat"
 
-#: ../pidgin/gtkdialogs.c:1294
 msgid "_Remove Chat"
 msgstr "_Rimuovi chat"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Fai clic col pulsante destro per gli altri messaggi non letti...\n"
 
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr "Modifica lo stato"
+msgid "_Change Status"
+msgstr "_Modifica lo stato"
 
-#: ../pidgin/gtkdocklet.c:680
-msgid "Show Buddy List"
-msgstr "Mostra la lista contatti"
+msgid "Show Buddy _List"
+msgstr "Mostra la _lista contatti"
 
-#: ../pidgin/gtkdocklet.c:706
-msgid "New Message..."
-msgstr "Nuovo messaggio..."
+msgid "_Unread Messages"
+msgstr "Messaggi _non letti"
 
-#: ../pidgin/gtkdocklet.c:721
-msgid "Mute Sounds"
-msgstr "Nessun suono"
+msgid "New _Message..."
+msgstr "Nuovo _messaggio..."
 
-#: ../pidgin/gtkdocklet.c:728
-#, fuzzy
-msgid "Blink on New Message"
-msgstr "Segnala i messaggi in arrivo"
+msgid "_Accounts"
+msgstr "_Account"
+
+msgid "Plu_gins"
+msgstr "Plu_gin"
 
-#: ../pidgin/gtkdocklet.c:738
-msgid "Quit"
-msgstr "Esci"
+msgid "Pr_eferences"
+msgstr "Pr_eferenze"
+
+msgid "Mute _Sounds"
+msgstr "Nessun _suono"
+
+msgid "_Blink on New Message"
+msgstr "_Lampeggia all'arrivo di nuovi messaggi"
+
+msgid "_Quit"
+msgstr "_Esci"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Non avviato"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Ricezione in corso come:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Ricezione in corso da:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Invio in corso a:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Invio in corso come:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
-msgstr "Non c'è nessuna applicazione configurata per aprire questo tipo di file."
+msgstr ""
+"Non c'è nessuna applicazione configurata per aprire questo tipo di file."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "C'è stato un errore nell'apertura del file."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Errore nell'esecuzione di %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Errore nell'esecuzione di %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Il processo ha restituito il codice d'errore %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nome file:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "File locale:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Tempo trascorso:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Tempo rimanente:"
 
-#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
-msgstr "Chiudi questa finestra quando tutti i trasferimenti sono stati _completati"
+msgstr ""
+"Chiudi questa finestra quando tutti i trasferimenti sono stati _completati"
 
-#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "_Pulisci i trasferimenti ultimati"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "_Dettagli trasferimento file"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833
-#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausa"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Riprendi"
 
-#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Incolla come _testo semplice"
 
-#: ../pidgin/gtkimhtml.c:832
-#: ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "_Rimuovi la formattazione"
 
-#: ../pidgin/gtkimhtml.c:1359
+msgid "Disable _smileys in selected text"
+msgstr "Disabilita gli _smileys nel testo selezionato"
+
 msgid "Hyperlink color"
 msgstr "Colore dei collegamenti"
 
-#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr "Colore per disegnare i collegamenti."
 
-#: ../pidgin/gtkimhtml.c:1363
 #, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Colore dei collegamenti"
+msgstr "Inserire un codice colore"
 
-#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colore per i collegamenti al passaggio del mouse."
 
-#: ../pidgin/gtkimhtml.c:1581
+#, fuzzy
+msgid "Sent Message Name Color"
+msgstr "%s ti ha inviato un messaggio. (%s)"
+
+msgid "Color to draw the name of a message you sent."
+msgstr "Colore per il nome in un messaggio che hai inviato."
+
+#, fuzzy
+msgid "Received Message Name Color"
+msgstr "Il messaggio ricevuto inizia la conversazione"
+
+msgid "Color to draw the name of a message you received."
+msgstr "Colore per il nome in un messaggio che hai ricevuto."
+
+#, fuzzy
+msgid "\"Attention\" Name Color"
+msgstr "Inserire un codice colore"
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+"Colore per il nome in un messaggio che hai ricevuto e che contiene il tuo "
+"nome."
+
+msgid "Action Message Name Color"
+msgstr "Colore del nome per i messaggi di azione"
+
+msgid "Color to draw the name of an action message."
+msgstr "Colore per il nome di un messaggio di azione."
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+#, fuzzy
+msgid "Whisper Message Name Color"
+msgstr "%s ti ha inviato un messaggio. (%s)"
+
+msgid "Typing notification color"
+msgstr "Colore per la notifica di scrittura"
+
+msgid "The color to use for the typing notification font"
+msgstr "Il colore da usare per il carattere della notifica di scrittura"
+
+msgid "Typing notification font"
+msgstr "Carattere per la notifica di scrittura"
+
+msgid "The font to use for the typing notification"
+msgstr "Il carattere da usare per la notifica di scrittura"
+
+msgid "Enable typing notification"
+msgstr "Abilita la notifica di scrittura"
+
 msgid "_Copy Email Address"
 msgstr "_Copia l'indirizzo email"
 
-#: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
-#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr "_Copia l'indirizzo del collegamento"
 
-#: ../pidgin/gtkimhtml.c:3353
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15579,7 +11733,6 @@ msgstr ""
 "\n"
 "Verrà utilizzato il formato predefinito PNG."
 
-#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15589,18 +11742,17 @@ msgstr ""
 "\n"
 "Verrà utilizzato il formato predefinito PNG."
 
-#: ../pidgin/gtkimhtml.c:3385
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Errore nel salvataggio dell'immagine</span>\n"
+"<span size='larger' weight='bold'>Errore nel salvataggio dell'immagine</"
+"span>\n"
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15611,274 +11763,213 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3466
-#: ../pidgin/gtkimhtml.c:3478
 msgid "Save Image"
 msgstr "Salva l'immagine"
 
-#: ../pidgin/gtkimhtml.c:3506
 #, c-format
 msgid "_Save Image..."
 msgstr "_Salva l'immagine..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Aggiungi uno smiley personalizzato..."
+
 msgid "Select Font"
 msgstr "Scegli il carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Scegli il colore del testo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "Scegli il colore dello sfondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Descrizione"
 
-#: ../pidgin/gtkimhtmltoolbar.c:423
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "Inserisci l'indirizzo e la descrizione del collegamento che vuoi inserire. La descrizione è opzionale."
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Inserisci l'indirizzo e la descrizione del collegamento che vuoi inserire. "
+"La descrizione è opzionale."
 
-#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Immetti l'URL del collegamento che vuoi inserire."
 
-#: ../pidgin/gtkimhtmltoolbar.c:432
-#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "Inserisci un collegamento"
 
-#: ../pidgin/gtkimhtmltoolbar.c:436
-#: ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossibile salvare l'immagine: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:542
-#: ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "Inserisci un'immagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:765
-msgid "This theme has no available smileys."
-msgstr "Questo tema non dispone di smiley."
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Questo smiley è disabilitato poiché esiste già uno smiley personalizzato per "
+"questa scorciatoia da tastiera:\n"
+"%s"
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:850
-#: ../pidgin/gtkimhtmltoolbar.c:1224
+msgid "_Manage custom smileys"
+msgstr "_Gestisci gli smiley personalizzati"
+
+msgid "This theme has no available smileys."
+msgstr "Questo tema non dispone di smiley."
+
 msgid "_Font"
 msgstr "_Carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-#, fuzzy
 msgid "Group Items"
-msgstr "ID del gruppo"
+msgstr "Raggruppa elementi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Separa elementi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
-#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
-msgstr ""
+msgstr "Barrato"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Increase Font Size"
 msgstr "Aumenta la dimensione del carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Decrease Font Size"
 msgstr "Diminuisci la dimensione del carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Font Face"
 msgstr "Tipo di carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Background Color"
 msgstr "Colore dello sfondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Foreground Color"
 msgstr "Colore del carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Reset Formatting"
 msgstr "Rimuovi la formattazione"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1107
-#, fuzzy
 msgid "Insert IM Image"
 msgstr "Inserisci un'immagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "Inserisci uno smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
 msgstr "<b>_Grassetto</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
 msgstr "<i>_Corsivo</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
 msgstr "<u>_Sottolineato</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
-#, fuzzy
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span size='larger'>_Più grande</span>"
+msgstr "<span strikethrough='true'>Barrato</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Più grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
 msgstr "_Normale"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>Più _piccolo</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
 msgstr "_Tipo di carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
 msgstr "_Colore del carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
 msgstr "Colore dello _sfondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
 msgstr "_Immagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
 msgstr "Linea _orizzontale"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1309
 msgid "_Smile!"
 msgstr "_Sorridi!"
 
-#: ../pidgin/gtklog.c:293
+msgid "Log Deletion Failed"
+msgstr "Cancellazione del log fallita"
+
+msgid "Check permissions and try again."
+msgstr "Verifica i permessi e riprova."
+
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
-msgstr "Sei sicuro di voler eliminare permanentemente il log della conversazione con %s iniziata il %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"Sei sicuro di voler eliminare permanentemente il log della conversazione con "
+"%s iniziata il %s?"
 
-#: ../pidgin/gtklog.c:304
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
-msgstr "Sei sicuro di voler eliminare permanentemente il log della conversazione in %s iniziata il %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"Sei sicuro di voler eliminare permanentemente il log della conversazione in %"
+"s iniziata il %s?"
 
-#: ../pidgin/gtklog.c:309
 #, 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 "Sei sicuro di voler eliminare permanentemente il log iniziato il %s?"
 
-#: ../pidgin/gtklog.c:453
+msgid "Delete Log?"
+msgstr "Eliminare il log?"
+
+msgid "Delete Log..."
+msgstr "Elimina log..."
+
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversazione su %s il %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversazione con %s il %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr ""
-
-#: ../pidgin/gtklog.c:550
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "Il log degli eventi di sistema è effettuato soltanto se è abilitata l'opzione \"Registra nel log di sistema tutti i cambiamenti di stato\"."
-
-#: ../pidgin/gtklog.c:554
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Il log dei messaggi immediati è effettuato soltanto se è abilitata l'opzione \"Effettua il log di tutti messaggi immediati\"."
-
-#: ../pidgin/gtklog.c:557
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Il log delle chat è effettuato soltanto se è abilitata l'opzione \"Effettua il log di tutte le chat\"."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "Nessun log trovato"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
-msgstr ""
-
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Dimensione totale del log:"
-
-#: ../pidgin/gtklog.c:714
-#, c-format
-msgid "Conversations in %s"
-msgstr "Conversazioni in %s"
-
-#: ../pidgin/gtklog.c:722
-#: ../pidgin/gtklog.c:793
-#, c-format
-msgid "Conversations with %s"
-msgstr "Conversazioni con %s"
+msgstr "_Sfoglia la cartella dei log"
 
-#: ../pidgin/gtklog.c:823
-msgid "System Log"
-msgstr "Log di sistema"
-
-#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#: ../pidgin/gtkmain.c:400
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15889,8 +11980,9 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
@@ -15900,13 +11992,43 @@ msgstr ""
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
+"  -m, --multiple      non assicurare una singola istanza\n"
 "  -n, --nologin       non effettuare il login\n"
-"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale NOME\n"
+"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale "
+"NOME\n"
+"                      specifica gli account da usare, separati da virgole)\n"
+"  --display=DISPLAY   display X da utilizzare\n"
+"  -v, --version       mostra la versione attuale ed esce\n"
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Uso: %s [OPZIONI]...\n"
+"\n"
+"  -c, --config=DIR    usa DIR per i file di configurazione\n"
+"  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -h, --help          mostra questo aiuto ed esce\n"
+"  -m, --multiple      non assicurare una singola istanza\n"
+"  -n, --nologin       non effettuare il login\n"
+"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale "
+"NOME\n"
 "                      specifica gli account da usare, separati da virgole)\n"
 "  --display=DISPLAY   display X da utilizzare\n"
 "  -v, --version       mostra la versione attuale ed esce\n"
 
-#: ../pidgin/gtkmain.c:528
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -15946,502 +12068,409 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:718
-#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "Apri tutti i messaggi"
 
-#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
 
-#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ha %d nuovo messaggio"
 msgstr[1] "%s ha %d nuovi messaggi"
 
-#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>%d nuovo messaggio di posta.</b>"
-msgstr[1] "<b>%d nuovi messaggi di posta.</b>"
+msgstr[0] "<b>%d nuova email.</b>"
+msgstr[1] "<b>%d nuove email.</b>"
 
-#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Il comando per il browser \"%s\" non è valido."
 
-#: ../pidgin/gtknotify.c:1000
-#: ../pidgin/gtknotify.c:1012
-#: ../pidgin/gtknotify.c:1025
-#: ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "Impossibile aprire l'URL"
 
-#: ../pidgin/gtknotify.c:1010
-#: ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Errore nell'esecuzione di \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1154
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "È stato scelto di impostare il browser manualmente, ma non è stato immesso nessun comando."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"È stato scelto di impostare il browser manualmente, ma non è stato immesso "
+"nessun comando."
 
-#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "I seguenti plugin saranno rimossi."
 
-#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Saranno rimossi diversi plugin."
 
-#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Rimuovi Plugin"
 
-#: ../pidgin/gtkplugin.c:308
 msgid "Could not unload plugin"
 msgstr "Impossibile rimuovere il plugin"
 
-#: ../pidgin/gtkplugin.c:309
-msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
-msgstr ""
-
-#: ../pidgin/gtkplugin.c:417
-#, c-format
 msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
 msgstr ""
-"%s%s<span weight=\"bold\">Scritto da:</span>\t%s\n"
-"<span weight=\"bold\">Sito web:</span>\t\t%s\n"
-"<span weight=\"bold\">Nome file:</span>\t\t%s"
+"Il plugin non può essere disabilitato adesso. Verrà disabilitato al prossimo "
+"avvio."
 
-#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Errore: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Errore: %s\n"
 "Verifica il sito web del plugin per un aggiornamento.</span>"
 
-#: ../pidgin/gtkplugin.c:562
+msgid "Author"
+msgstr "Autore"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>Scritto da:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>Sito web:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Nome file:</b>"
+
 msgid "Configure Pl_ugin"
 msgstr "Configura il pl_ugin"
 
-#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Dettagli sul plugin</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Scegli un file"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "Contatto da controllare"
 
-#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "Nome del _contatto:"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "Si _connette"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "Si _disconnette"
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "È _assente"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "_Ritorna dall'assenza"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "Diventa _inattivo"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "Ritorna _attivo"
 
-#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "Inizia a _scrivere"
 
-#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "In_terrompe la scrittura"
 
-#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "_Smette di scrivere"
 
-#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "Invia un _messaggio"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "_Apri una finestra di conversazione"
 
-#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "_Notifica con un popup"
 
-#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "Invia un _messaggio"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "_Esegui un comando"
 
-#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "_Riproduci un suono"
 
-#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "_Sfoglia..."
 
-#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "_Sfoglia..."
 
-#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "_Anteprima"
 
-#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "Genera _allarmi solo quando il mio stato è \"non disponibile\""
 
-#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
 msgstr "_Ricorrente"
 
-#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "Contatto da controllare"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "Impossibile spacchettare il tema degli smiley."
 
-#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "Installa tema"
 
-#: ../pidgin/gtkprefs.c:698
-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 "Scegli un tema per gli smiley dalla seguente lista. Possono essere installati nuovi temi trascinandoli sulla lista dei temi."
+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 ""
+"Scegli un tema per gli smiley dalla seguente lista. Possono essere "
+"installati nuovi temi trascinandoli sulla lista dei temi."
 
-#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "Icona"
 
-#: ../pidgin/gtkprefs.c:895
+msgid "Keyboard Shortcuts"
+msgstr "Scorciatoie da tastiera"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Ch_iudi le conversazioni con il tasto Esc"
+
 msgid "System Tray Icon"
 msgstr "Icona di notifica"
 
-#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "_Mostra l'icona di notifica:"
 
-#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "Se ci sono messaggi non letti"
 
-#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "Finestre di conversazione nascoste"
 
-#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "_Nascondi le nuove conversazioni:"
 
-#: ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "Se assente"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "Schede"
 
-#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostra i messaggi immediati e le chat come _schede"
 
-#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "Mostra il pulsante di _chiusura sulle linguette"
 
-#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "_Posizionamento:"
 
-#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "In alto"
 
-#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "In basso"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "A sinistra"
 
-#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "A destra"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "In verticale a sinistra"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "In verticale a destra"
 
-#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "N_uove conversazioni:"
 
-#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "Mostra la _formattazione per i messaggi in entrata"
 
-#: ../pidgin/gtkprefs.c:999
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "Chiudi istantaneamente i messaggi immediati alla chiusura della scheda"
 
-#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
 msgstr "Mostra informazioni _dettagliate"
 
-#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "Abilita l'a_nimazione delle icone dei contatti"
 
-#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "Segnala ai contatti che stai _scrivendo"
 
-#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "_Evidenzia le parole con errori di ortografia"
 
-#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "Usa scrolling fluido"
 
-#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "_Illumina la finestra quando arriva un messaggio"
 
-#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zza le nuove finestre di conversazione"
 
-#: ../pidgin/gtkprefs.c:1027
+msgid "Minimum input area height in lines:"
+msgstr "Altezza minima in linee della casella di testo:"
+
 msgid "Font"
 msgstr "Carattere"
 
-#: ../pidgin/gtkprefs.c:1029
 msgid "Use document font from _theme"
 msgstr "Usa il carattere di _sistema"
 
-#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
 msgstr "Usa il carattere di _sistema"
 
-#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
 msgstr "_Carattere per la conversazione:"
 
-#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "Formattazione predefinita"
 
-#: ../pidgin/gtkprefs.c:1066
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
-msgstr "Così appariranno i tuoi messaggi in uscita quando usi un protocollo che supporta la formattazione."
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"Così appariranno i tuoi messaggi in uscita quando usi un protocollo che "
+"supporta la formattazione."
 
-#: ../pidgin/gtkprefs.c:1126
 msgid "Cannot start proxy configuration program."
-msgstr ""
+msgstr "Impossibile avviare il programma per la configurazione del proxy."
 
-#: ../pidgin/gtkprefs.c:1138
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "Impossibile ottenere le informazioni sull'utente"
+msgstr "Impossibile avviare il programma di configurazione del browser."
 
-#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "Server ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "Rileva _automaticamente l'indirizzo IP"
 
-#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "_IP pubblico:"
 
-#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "Porte"
 
-#: ../pidgin/gtkprefs.c:1217
+msgid "_Enable automatic router port forwarding"
+msgstr "_Abilita il port forwarding automatico"
+
 msgid "_Manually specify range of ports to listen on"
-msgstr "Specifica _manualmente l'intervallo di porte sulle quali mettersi in ascolto"
+msgstr ""
+"Specifica _manualmente l'intervallo di porte sulle quali mettersi in ascolto"
 
-#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "_Prima porta:"
 
-#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "_Ultima porta:"
 
-#: ../pidgin/gtkprefs.c:1235
-#, fuzzy
 msgid "Proxy Server &amp; Browser"
-msgstr "Server proxy"
+msgstr "Server proxy &amp; Browser"
 
-#: ../pidgin/gtkprefs.c:1243
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
+"<b>Il programma per la configurazione del proxy non è stato trovato.</b>"
 
-#: ../pidgin/gtkprefs.c:1251
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
+"<b>Il programma per la configurazione del browser non è stato trovato.</b>"
 
-#: ../pidgin/gtkprefs.c:1256
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
+"Le preferenze del proxy e del browser sono configurate\n"
+"nelle Preferenze di GNOME"
 
-#: ../pidgin/gtkprefs.c:1263
 msgid "Configure _Proxy"
 msgstr "Configura il _proxy"
 
-#: ../pidgin/gtkprefs.c:1268
 msgid "Configure _Browser"
 msgstr "Configura il _browser"
 
-#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "Server proxy"
 
-#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "Nessun proxy"
 
-#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_Utente:"
 
-#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1428
+msgid "Desktop Default"
+msgstr "Predefinito di sistema"
+
 msgid "GNOME Default"
 msgstr "Predefinito di Gnome"
 
-#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Manuale"
 
-#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "Scelta del browser"
 
-#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Apertura dei collegamenti:"
 
-#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "Impostazione predefinita del browser"
 
-#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Finestra esistente"
 
-#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Nuova scheda"
 
-#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16450,69 +12479,54 @@ msgstr ""
 "Scelta _manuale:\n"
 "(%s per inserire un URL)"
 
-#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "_Formato del log:"
 
-#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "Esegui il _log di tutti i messaggi immediati"
 
-#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Esegui il log di tutte le c_hat"
 
-#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "Registra nel log di sistema tutti i cambiamenti di _stato"
 
-#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "Scegli un suono"
 
-#: ../pidgin/gtkprefs.c:1735
 #, c-format
 msgid "Quietest"
 msgstr "Bassissimo"
 
-#: ../pidgin/gtkprefs.c:1737
 #, c-format
 msgid "Quieter"
 msgstr "Più basso"
 
-#: ../pidgin/gtkprefs.c:1739
 #, c-format
 msgid "Quiet"
 msgstr "Basso"
 
-#: ../pidgin/gtkprefs.c:1743
 #, c-format
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1745
 #, c-format
 msgid "Louder"
 msgstr "Più alto"
 
-#: ../pidgin/gtkprefs.c:1747
 #, c-format
 msgid "Loudest"
 msgstr "Altissimo"
 
-#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_Metodo:"
 
-#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "Bip di console"
 
-#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Nessun suono"
 
-#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16521,339 +12535,320 @@ msgstr ""
 "C_omando da eseguire:\n"
 "(%s per il nome del file)"
 
-#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
-msgstr "Riproduci i suoni quando la finestra di conversazione va in _primo piano"
+msgstr ""
+"Riproduci i suoni quando la finestra di conversazione va in _primo piano"
 
-#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Abilita i suoni:"
 
-#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Riproduci"
 
-#: ../pidgin/gtkprefs.c:2028
+msgid "_Browse..."
+msgstr "_Sfoglia..."
+
+msgid "_Reset"
+msgstr "_Reimposta"
+
 msgid "_Report idle time:"
 msgstr "Mostra i _tempi di inattività:"
 
-#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "Sulla base dell'utilizzo della tastiera o del mouse"
 
-#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "Risposta _automatica:"
 
-#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "Se assente e inattivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "Assente automatico"
 
-#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Modifica lo stato quando sei _inattivo"
 
-#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuti prima di diventare inattivo:"
 
-#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Cambia lo _stato in:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "Stato all'avvio"
 
-#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "Utilizza lo stato impostato l'ultima volta"
 
-#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Stato da _utilizzare all'avvio:"
 
-#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Temi degli smiley"
 
-#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Stato / Inattività"
 
-#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Consenti a tutti di contattarmi"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "Consenti di contattarmi solo agli utenti della mia lista contatti"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "Consenti di contattarmi solo agli utenti della seguente lista"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Blocca tutti gli utenti"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Blocca solamente gli utenti nella seguente lista"
 
-#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Le modifiche alle impostazioni della privacy hanno effetto immediato."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Imposta la privacy per:"
 
-#: ../pidgin/gtkprivacy.c:559
-#: ../pidgin/gtkprivacy.c:576
+#. Remove All button
+msgid "Remove Al_l"
+msgstr "Rimuovi _tutto"
+
 msgid "Permit User"
 msgstr "Consenti all'utente di contattarti"
 
-#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "Inserisci il nome dell'utente al quale permetti di contattarti."
 
-#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Inserisci il nome dell'utente al quale permetti di contattarti."
 
-#: ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Consenti"
 
-#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Consenti a %s di contattarti?"
 
-#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sei sicuro di volere che %s ti contatti?"
 
-#: ../pidgin/gtkprivacy.c:601
-#: ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Blocca l'utente"
 
-#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Inserisci il nome dell'utente da bloccare."
 
-#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Inserisci il nome dell'utente che vuoi bloccare."
 
-#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Bloccare %s?"
 
-#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sei sicuro di voler bloccare %s?"
 
-#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "Applica"
 
-#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "Il file esiste già."
 
-#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "Vuoi sovrascriverlo?"
 
-#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "Scegli un nuovo nome"
 
-#: ../pidgin/gtkrequest.c:1797
-#: ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "Scegli cartella..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:518
-#: ../pidgin/gtkroomlist.c:688
-msgid "Room List"
-msgstr "Lista delle stanze"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "_Scarica la lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "_Aggiungi una chat"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Sei sicuro di voler eliminare gli stati salvati selezionati?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620
-#: ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "_Utilizza"
 
-#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titolo già in uso. Devi scegliere un titolo diverso."
 
-#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "Differente"
 
-#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: ../pidgin/gtksavedstatuses.c:1184
-#: ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "_Stato:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "Utilizza uno stato _differente per alcuni account"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "Sa_lva e utilizza"
 
-#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "Stato per %s"
 
-#: ../pidgin/gtkstatusbox.c:664
+msgid "Custom Smiley"
+msgstr "Smiley personalizzato"
+
+msgid "Duplicate Shortcut"
+msgstr "Scorciatoia già esistente"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Esiste già uno smiley personalizzato per la scorciatoia da tastiera "
+"selezionata. Specifica una scorciatoia differente."
+
+msgid "More Data needed"
+msgstr "C'è bisogno di più dati"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
+
+msgid "Please select an image for the smiley."
+msgstr "Scegli un'immagine per lo smiley."
+
+msgid "Edit Smiley"
+msgstr "Modifica lo smiley"
+
+msgid "Add Smiley"
+msgstr "Aggiungi uno smiley"
+
+msgid "Smiley _Image"
+msgstr "_Immagine per lo smiley"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "S_corciatoia per lo smiley"
+
+msgid "Smiley"
+msgstr "Smiley"
+
+msgid "Custom Smiley Manager"
+msgstr "Gestione degli smiley personalizzati"
+
 msgid "Waiting for network connection"
 msgstr "In attesa della connessione di rete"
 
-#: ../pidgin/gtkstatusbox.c:1072
 msgid "New status..."
 msgstr "Nuovo messaggio di stato..."
 
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved statuses..."
 msgstr "Messaggi di stato salvati..."
 
-#: ../pidgin/gtkutils.c:634
+msgid "Status Selector"
+msgstr "Selettore di stato"
+
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1401
-#: ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Si è verificato il seguente errore nel caricamento di %s: %s"
 
-#: ../pidgin/gtkutils.c:1404
-#: ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Impossibile inviare la cartella %s."
 
-#: ../pidgin/gtkutils.c:1501
 #, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
-msgstr "%s non può trasferire una cartella. Devi inviare individualmente i file contenuti."
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+"%s non può trasferire una cartella. Devi inviare individualmente i file "
+"contenuti."
 
-#: ../pidgin/gtkutils.c:1535
-#: ../pidgin/gtkutils.c:1547
-#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "Hai trascinato un'immagine"
 
-#: ../pidgin/gtkutils.c:1536
-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 "Puoi inviare questa immagine come file, inserirla nel messaggio o utilizzarla come icona per questo contatto."
+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 ""
+"Puoi inviare questa immagine come file, inserirla nel messaggio o "
+"utilizzarla come icona per questo contatto."
 
-#: ../pidgin/gtkutils.c:1542
-#: ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "Imposta come icona per il contatto"
 
-#: ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "Invia il file dell'immagine"
 
-#: ../pidgin/gtkutils.c:1544
-#: ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "Inserisci nel messaggio"
 
-#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Vuoi utilizzarla come icona per questo contatto?"
 
-#: ../pidgin/gtkutils.c:1555
-msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
-msgstr "Puoi inviare questa immagine come file, o utilizzarla come icona per questo contatto."
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Puoi inviare questa immagine come file, o utilizzarla come icona per questo "
+"contatto."
 
-#: ../pidgin/gtkutils.c:1556
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "Puoi inserire questa immagine nel messaggio o utilizzarla come icona per questo contatto."
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Puoi inserire questa immagine nel messaggio o utilizzarla come icona per "
+"questo contatto."
 
 #. 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:1615
 msgid "Cannot send launcher"
 msgstr "Impossibile inviare l'icona di avvio"
 
-#: ../pidgin/gtkutils.c:1615
-msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
-msgstr "Hai trascinato un'icona di avvio. Molto probabilmente vuoi inviare ciò cui l'icona si riferisce piuttosto che l'icona stessa."
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Hai trascinato un'icona di avvio. Molto probabilmente vuoi inviare ciò cui "
+"l'icona si riferisce piuttosto che l'icona stessa."
 
-#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16864,112 +12859,86 @@ msgstr ""
 "<b>Dimensione del file:</b> %s\n"
 "<b>Dimensione dell'immagine:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Il file '%s' è troppo grande per %s. Riprova con un'immagine più piccola.\n"
+msgstr ""
+"Il file '%s' è troppo grande per %s. Riprova con un'immagine più piccola.\n"
 
-#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "Errore icona"
 
-#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "Impossibile impostare l'icona"
 
-#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Impossibile aprire il file '%s': %s"
 
-#: ../pidgin/gtkutils.c:2798
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Impossibile caricare l'immagine '%s' per un motivo sconosciuto. Probabilmente il file dell'immagine è danneggiato."
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Impossibile caricare l'immagine '%s' per un motivo sconosciuto. "
+"Probabilmente il file dell'immagine è danneggiato."
 
-#: ../pidgin/gtkwhiteboard.c:754
-#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Salva il file"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Scegli il colore"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Chiudi _schede"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Info"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Invita"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+#, fuzzy
+msgid "Pidgin Tooltip"
+msgstr "Smiley di Pidgin"
+
 msgid "Pidgin smileys"
 msgstr "Smiley di Pidgin"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Penguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Selezionando questo tema disabiliti gli emoticon grafici."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "nessuno"
 
-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr "Mostra le statistiche"
-
-#: ../pidgin/plugins/cap/cap.c:464
-#: ../pidgin/plugins/cap/cap.c:467
-#, fuzzy
 msgid "Response Probability:"
-msgstr "Risposte perse"
+msgstr "Probabilità di risposta:"
 
-#: ../pidgin/plugins/cap/cap.c:813
-#, fuzzy
 msgid "Statistics Configuration"
-msgstr "Configurazione dei gesti del mouse"
+msgstr "Configurazione delle statistiche"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "Timeout massimo per la risposta:"
 
-#: ../pidgin/plugins/cap/cap.c:819
-#: ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833
-#: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minuti"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr "Differenza massima per \"visto l'ultima volta\":"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "Soglia:"
 
@@ -16979,56 +12948,47 @@ msgstr "Soglia:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "Predizione della disponibilità del contatto"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "Plugin per la predizione della disponibilità del contatto."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:941
-msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
-msgstr "Il plugin per la predizione della disponibilità del contatto (cap) è utilizzato per mostrare delle informazioni statistiche sui contatti presenti nella lista dell'utente."
+msgid "Displays statistical information about your buddies' availability"
+msgstr "Mostra informazioni statistiche sulla disponibilità dei tuoi contatti"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Il contatto è inattivo"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Il contatto è assente"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Il contatto è ancora assente"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "L'utente è al cellulare"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Il contatto non è in linea"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Punti da utilizzare quando..."
 
-#: ../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"
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
 msgstr ""
+"Il contatto con il <i>punteggio più alto</i> è quello che avrà la priorità "
+"più alta nella lista.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
-msgstr ""
+msgstr "Usa l'ultimo contatto quando i punteggi sono uguali"
 
-#: ../pidgin/plugins/contact_priority.c:130
-#, fuzzy
 msgid "Point values to use for account..."
 msgstr "Punti da utilizzare per l'account..."
 
@@ -17038,89 +12998,80 @@ msgstr "Punti da utilizzare per l'account..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Priorità nella lista"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Permette di controllare i valori associati a differenti stati del contatto."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Permette di controllare i valori associati a differenti stati del contatto."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Permette di cambiare i punti da assegnare agli stati di inattività/assenza/disconnesso per i contatti nel calcolo della priorità all'interno della lista."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Permette di cambiare i punti da assegnare agli stati di inattività/assenza/"
+"disconnesso per i contatti nel calcolo della priorità all'interno della "
+"lista."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Conversazioni colorate"
 
-#: ../pidgin/plugins/convcolors.c:25
-#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Personalizza i colori nella finestra delle conversazioni"
 
-#: ../pidgin/plugins/convcolors.c:82
 msgid "Error Messages"
 msgstr "Messaggi di errore"
 
-#: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr "Messaggi evidenziati"
 
-#: ../pidgin/plugins/convcolors.c:84
 msgid "System Messages"
 msgstr "Messaggi di sistema"
 
-#: ../pidgin/plugins/convcolors.c:85
 msgid "Sent Messages"
 msgstr "Messaggi inviati"
 
-#: ../pidgin/plugins/convcolors.c:86
 msgid "Received Messages"
 msgstr "Messaggi ricevuti"
 
-#: ../pidgin/plugins/convcolors.c:210
-#: ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Scegli il colore per %s"
 
-#: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignora la formattazione dei messaggi in ingresso"
 
-#: ../pidgin/plugins/convcolors.c:311
 msgid "Apply in Chats"
 msgstr "Applica alle chat"
 
-#: ../pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
 msgstr "Applica ai MI"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Per numero di conversazioni"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Posizionamento delle conversazioni"
 
 #. 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 "Nota: Il valore della preferenza \"Nuove conversazioni\" deve essere impostato a \"Per numero di conversazioni\"."
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Nota: Il valore della preferenza \"Nuove conversazioni\" deve essere "
+"impostato a \"Per numero di conversazioni\"."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Numero di conversazioni per finestra"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separa le finestre dei MI e delle chat quando sono posizionate per numero"
+msgstr ""
+"Separa le finestre dei MI e delle chat quando sono posizionate per numero"
 
 #. *< type
 #. *< ui_requirement
@@ -17128,37 +13079,34 @@ msgstr "Separa le finestre dei MI e delle chat quando sono posizionate per numer
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Posizionamento extra"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Opzioni extra per il posizionamento delle conversazioni."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Limita il numero di conversazioni per finestra, separando opzionalmente i MI e le chat"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Limita il numero di conversazioni per finestra, separando opzionalmente i MI "
+"e le chat"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configurazione dei gesti del mouse"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Pulsante centrale"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Pulsante destro"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Mostra la traccia del mouse quando si esegue un gesto"
 
@@ -17168,105 +13116,95 @@ msgstr "_Mostra la traccia del mouse quando si esegue un gesto"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Gesti del mouse"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Fornisce un supporto per i gesti del mouse"
 
 #. *  description
-#: ../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"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"Permette di utilizzare nelle finestre di conversazione alcuni gesti del mouse\n"
-"Tieni premuto il pulsante centrale e trascina il mouse per le seguenti azioni:\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Permette di utilizzare nelle finestre di conversazione alcuni gesti del "
+"mouse\n"
+"Tieni premuto il pulsante centrale e trascina il mouse per le seguenti "
+"azioni:\n"
 "\n"
-"Trascina il mouse prima giù e poi a destra per chiudere una conversazione.\n"
-"Trascina il mouse prima su e poi a sinistra per passare alla conversazione precedente.\n"
-"Trascina il mouse prima su e poi a destra per passare alla conversazione successiva."
+" • Trascina il mouse prima giù e poi a destra per chiudere una "
+"conversazione.\n"
+" • Trascina il mouse prima su e poi a sinistra per passare alla "
+"conversazione precedente.\n"
+" • Trascina il mouse prima su e poi a destra per passare alla conversazione "
+"successiva."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Messaggi immediati"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Scegli una persona dalla tua rubrica qui sotto oppure aggiungi una nuova persona."
+msgstr ""
+"Scegli una persona dalla tua rubrica qui sotto oppure aggiungi una nuova "
+"persona."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Gruppo:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Nuova persona"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Seleziona il contatto"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Seleziona una persona dalla tua rubrica da aggiungere a questo contatto oppure crea una nuova persona."
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Seleziona una persona dalla tua rubrica da aggiungere a questo contatto "
+"oppure crea una nuova persona."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Dettagli utente"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Associa il contatto"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send email"
 msgstr "Impossibile inviare l'email"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "L'eseguibile di evolution non è stato trovato nel PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An email address was not found for this buddy."
 msgstr "Non è stato trovato nessun indirizzo email per questo contatto."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Aggiungi alla rubrica"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send Email"
 msgstr "Invia email"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Configurazione dell'integrazione con Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Seleziona tutti gli account ai quali i contatti dovrebbero essere aggiunti automaticamente."
+msgstr ""
+"Seleziona tutti gli account ai quali i contatti dovrebbero essere aggiunti "
+"automaticamente."
 
 #. *< type
 #. *< ui_requirement
@@ -17274,7 +13212,6 @@ msgstr "Seleziona tutti gli account ai quali i contatti dovrebbero essere aggiun
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integrazione con Evolution"
 
@@ -17282,37 +13219,28 @@ msgstr "Integrazione con Evolution"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Fornisce l'integrazione con Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Inserisci qui sotto le informazioni sulla persona."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
+msgid "Please enter the buddy's username and account type below."
 msgstr "Inserisci qui sotto il nome utente del contatto e il tipo di account."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Tipo di account:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Informazioni opzionali:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Cognome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "Email:"
 msgstr "Email:"
 
@@ -17322,7 +13250,6 @@ msgstr "Email:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Test dei segnali GTK"
 
@@ -17330,12 +13257,10 @@ msgstr "Test dei segnali GTK"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
-msgstr "Verifica se tutti i segnali dell'interfaccia utente funzionano correttamente."
+msgstr ""
+"Verifica se tutti i segnali dell'interfaccia utente funzionano correttamente."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17344,7 +13269,6 @@ msgstr ""
 "\n"
 "<b>Note per il contatto</b>: %s"
 
-#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Storico"
 
@@ -17354,7 +13278,6 @@ msgstr "Storico"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Riduci a icona se assente"
 
@@ -17362,80 +13285,67 @@ msgstr "Riduci a icona se assente"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85
-#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Riduce a icona la lista dei contatti quando sei assente."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Controllo posta"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Controlla se ci sono nuovi messaggi di posta."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Aggiunge una piccola casella alla lista contatti che mostra se c'è posta per te."
+msgstr ""
+"Aggiunge una piccola casella alla lista contatti che mostra se c'è posta per "
+"te."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Linea di demarcazione"
 
-#: ../pidgin/plugins/markerline.c:25
-#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Disegna una linea per indicare i nuovi messaggi in una conversazione."
 
-#: ../pidgin/plugins/markerline.c:246
+msgid "Jump to markerline"
+msgstr "Vai alla linea di demarcazione"
+
 msgid "Draw Markerline in "
-msgstr "Disegna una linea nelle"
+msgstr "Disegna una linea nelle "
 
-#: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Finestre dei _messaggi immediati"
 
-#: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Finestre delle _chat"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "E' stata richiesta una sessione di messaggi musicali. Fare clic sull'icona MM per accettare."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"E' stata richiesta una sessione di messaggi musicali. Fare clic sull'icona "
+"MM per accettare."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Sessione di messaggi musicali confermata."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Messaggi musicali"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Si è verificato un conflitto nell'esecuzione del comando:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Errore nell'esecuzione dell'editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Si è verificato il seguente errore:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configurazione dei messaggi musicali"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Percorso dell'editor di partiture"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Applica"
 
@@ -17447,84 +13357,76 @@ msgstr "_Applica"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Messaggi musicali, per la composizione collaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-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 "Il plugin per i messaggi musicali consente ad un gruppo di utenti di lavorare simultaneamente su di un brano musicale modificando in tempo reale una partitura comune."
+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 ""
+"Il plugin per i messaggi musicali consente ad un gruppo di utenti di "
+"lavorare simultaneamente su di un brano musicale modificando in tempo reale "
+"una partitura comune."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notifica per"
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
+msgid "\t_Only when someone says your username"
 msgstr "\t_Solamente quando qualcuno pronuncia il tuo nome"
 
-#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "Finestre in _primo piano"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Metodi di notifica"
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Anteponi la seguente _stringa nel titolo della finestra:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserisci il c_onteggio dei nuovi messaggi nel titolo della finestra"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Inserisci il conteggio dei nuovi messaggi nelle proprietà di _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Invia il messaggio \"_URGENTE\" al window manager"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Porta la finestra di conversazione in _primo piano"
 
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "Finestra di conversazione _attuale"
+
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Rimozione della notifica"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Rimuovi quando la finestra di conversazione va in _primo piano"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Rimuovi quando si fa c_lic sulla finestra di conversazione"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Rimuovi quando si scri_ve nella finestra di conversazione"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Rimuovi quando un _messaggio viene inviato"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Rimuovi quando si _passa ad un'altra scheda"
 
@@ -17534,7 +13436,6 @@ msgstr "Rimuovi quando si _passa ad un'altra scheda"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Notifica messaggi"
 
@@ -17542,8 +13443,6 @@ msgstr "Notifica messaggi"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910
-#: ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Fornisce diversi modi per notificare i messaggi non letti."
 
@@ -17553,19 +13452,16 @@ msgstr "Fornisce diversi modi per notificare i messaggi non letti."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Plugin dimostrativo per Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un plugin di esempio che fa alcune cose - guarda la descrizione."
 
 #. *  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"
@@ -17575,57 +13471,51 @@ msgstr ""
 "Questo è un fantastico plugin che fa un sacco di cose:\n"
 "- Ti dice chi ha scritto il programma quando ti connetti\n"
 "- Inverte il testo dei messaggi in arrivo\n"
-"- Invia un messaggio ai tuoi contatti non appena ti connetti"
+"- Invia un messaggio ai tuoi contatti non appena questi si connettono"
 
-#: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Colore del cursore"
 
-#: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
-msgstr "Colore secondario del cursore"
+msgstr "Colore per il cursore secondario"
 
-#: ../pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr "Colore per i collegamenti"
 
-#: ../pidgin/plugins/pidginrc.c:54
+#, fuzzy
+msgid "Highlighted Message Name Color"
+msgstr "Messaggi evidenziati"
+
+#, fuzzy
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "Una versione a scorrimento orizzontale della lista contatti."
 
-#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Finestra di conversazione"
 
-#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Finestra di richiesta"
 
-#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Finestra di notifica"
 
-#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Scegli il colore"
 
-#: ../pidgin/plugins/pidginrc.c:294
 #, c-format
 msgid "Select Interface Font"
 msgstr "Scegli il carattere per l'interfaccia"
 
-#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Scegli il carattere per %s"
 
-#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Carattere per l'interfaccia GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#, fuzzy
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "Controllo del tema GTK+"
 
 #.
 #. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
@@ -17647,64 +13537,57 @@ msgstr ""
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Colori dell'interfaccia"
 
-#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Dimensioni dei widget"
 
-#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Strumenti per il file gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Salva le impostazioni in %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Rileggi il file gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Controllo del tema GTK+ per Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:545
-#: ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Fornisce accesso alle impostazioni gtk usate comunemente."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Raw"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permette di inviare input raw ai protocolli text-based."
 
-#: ../pidgin/plugins/raw.c:178
-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 "Permette di inviare input raw ai protocolli text-based (XMPP, MSN, IRC, TOC). Premi 'Invio' nella casella di immissione per inviare il testo. Controlla la finestra di debug."
+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 ""
+"Permette di inviare input raw ai protocolli text-based (XMPP, MSN, IRC, "
+"TOC). Premi 'Invio' nella casella di immissione per inviare il testo. "
+"Controlla la finestra di debug."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
-msgstr "Stai utilizzando %s, versione %s. La versione corrente è la %s. Puoi scaricarla da <a href=\"%s\">%s</a><hr>"
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
+msgstr ""
+"Stai utilizzando %s, versione %s. La versione corrente è la %s. Puoi "
+"scaricarla da <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
-msgstr "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Elenco delle modifiche:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84
-#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nuova versione disponibile"
 
@@ -17714,89 +13597,99 @@ msgstr "Nuova versione disponibile"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notifica nuove versioni"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Controlla periodicamente l'esistenza di nuove versioni."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Controlla periodicamente l'esistenza di nuove versioni e notifica all'utente il ChangeLog."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Controlla periodicamente l'esistenza di nuove versioni e notifica all'utente "
+"l'elenco delle modifiche."
 
-#: ../pidgin/plugins/spellchk.c:1962
-msgid "Duplicate Correction"
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Pulsante 'Invia'"
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr "Pulsante 'Invia' per la finestra di conversazione."
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
 msgstr ""
+"Aggiunge un pulsante 'Invia' accanto alla casella di testo. Utile quando non "
+"si usa una tastiera reale."
+
+msgid "Duplicate Correction"
+msgstr "Correzione già esistente"
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "La parola specificata esiste già nella lista delle correzioni."
 
-#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Sostituzione del testo"
 
-#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Testo digitato"
 
-#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Testo inviato"
 
-#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Solo parole intere"
 
-#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "MAIUSCOLE/minuscole"
 
-#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Aggiungi una nuova regola di sostituzione"
 
-#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Testo _digitato:"
 
-#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Testo _inviato:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Verifica in maniera _esatta MAIUSCOLE/minuscole\n"
 "(deseleziona per verificare automaticamente)"
 
-#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Sostituisci solamente parole _intere"
 
-#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Opzioni generali per la sostituzione del testo"
 
-#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
-msgstr ""
+msgstr "Abilita la sostituzione dell'ultima parola all'invio"
 
-#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "Sostituzione del testo"
 
-#: ../pidgin/plugins/spellchk.c:2374
-#: ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Sostituisce il testo nei messaggi in uscita secondo delle regole definite dall'utente."
+msgstr ""
+"Sostituisce il testo nei messaggi in uscita secondo delle regole definite "
+"dall'utente."
 
 #. *< type
 #. *< ui_requirement
@@ -17804,8 +13697,6 @@ msgstr "Sostituisce il testo nei messaggi in uscita secondo delle regole definit
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74
-#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Ticker contatti"
 
@@ -17813,12 +13704,9 @@ msgstr "Ticker contatti"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359
-#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versione a scorrimento orizzontale della lista contatti."
 
-#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "Mostra un timestamp ogni"
 
@@ -17828,50 +13716,38 @@ msgstr "Mostra un timestamp ogni"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Timestamp"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
-msgstr "Mostra timestamp in stile iChat "
+msgstr "Mostra timestamp in stile iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Mostra informazioni sul tempo nello stile di iChat ogni N minuti."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Opzioni per il formato dei timestamp"
 
-#: ../pidgin/plugins/timestamp_format.c:26
 #, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Forza il formato 24 ore"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Mostra le date per..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Co_nversazioni:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Per i messaggi ritardati"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Per i messaggi ritardati e nelle chat"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Log dei _messaggi:"
 
@@ -17881,60 +13757,49 @@ msgstr "Log dei _messaggi:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Formato del timestamp per i messaggi"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Personalizza il formato del timestamp dei messaggi."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Questo plugin consente di personalizzare i formati dei timestamp per i messaggi nelle conversazioni e nei log."
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Questo plugin consente di personalizzare i formati dei timestamp per i "
+"messaggi nelle conversazioni e nei log."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacità:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
-msgstr "Finestre dei messaggi istantanei"
+msgstr "Finestre dei messaggi immediati"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_Rendi trasparente la finestra"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Mostra la barra di scorrimento nella finestra "
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Rimuovi la trasparenza della finestra dei MI quando va in primo piano"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Sempre in primo piano"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Finestra della lista contatti"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Rendi _trasparente la finestra della lista contatti"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Rimuovi la trasparenza della lista contatti quando va in primo piano"
 
@@ -17944,73 +13809,65 @@ msgstr "Rimuovi la trasparenza della lista contatti quando va in primo piano"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Trasparenza"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Trasparenza variabile per la lista contatti e le finestre di conversazione."
+msgstr ""
+"Trasparenza regolabile per la lista contatti e le finestre di conversazione."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 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 ""
-"Questo plugin imposta una trasparenza variabile sulle finestre di conversazione e sulla lista contatti.\n"
+"Questo plugin imposta una trasparenza regolabile sulle finestre di "
+"conversazione e sulla lista contatti.\n"
 "\n"
-"* Nota: Questo plugin richiede Windows 2000 o maggiore."
+"* Nota: Questo plugin richiede Windows 2000 o superiore."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
-msgstr "Versione di GTK+"
+msgstr "Versione dell'ambiente runtime GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Avvio"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Lancia %s all'avvio di Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
-msgstr "Lista contatti _agganciabile"
+msgstr "Lista contatti in modalità _dock"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "Mantieni la finestra della lista contatti in _primo piano:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
-msgstr ""
+msgstr "Solo in modalità dock"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Illumina la finestra quando arriva un messaggio di chat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opzioni di Pidgin per Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opzioni specifiche di Pidgin per Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "Fornisce opzioni specifiche per Pidgin per Windows, come la lista contatti agganciabile."
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Fornisce opzioni specifiche per Pidgin per Windows, come la lista contatti "
+"in modalità dock."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Disconnesso.</font>"
 
@@ -18020,40 +13877,37 @@ msgstr "<font color='#777777'>Disconnesso.</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749
-#: ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Console XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
-msgstr "Account:"
+msgstr "Account: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Non connesso a XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Inserisci una stanza <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Inserisci una stanza <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Inserisci una stanza <message/>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
+msgstr ""
+"Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
+
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Codice [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Errore di operazione sul gruppo"
diff --git a/po/nl.po b/po/nl.po
index 07fb0ee22a..3414bac8f5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,7 +1,6 @@
-# translation of gaim.po to Dutch
 # translation of nl.po to
-# Pdgin Dutch translation
-# Copyright (C) 2003-2004, Vincent van Adrighem <adrighem@gnome.org>
+# Pidgin Dutch translation
+# Copyright (C) 2008, Daniël Heres <danielheres@gmail.com>
 # This file is distributed under the same license as the Gaim package.
 #
 #
@@ -11,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 09:11-0400\n"
-"PO-Revision-Date: 2008-05-07 21:15+0100\n"
-"Last-Translator: Daniël Heres <danielheres@gmail.com>\n"
+"POT-Creation-Date: 2008-08-06 03:06-0400\n"
+"PO-Revision-Date: 2008-08-06 14:55+0100\n"
+"Last-Translator: Daniël <danielheres@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,17 +22,19 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:64
+#: ../finch/finch.c:302
+#: ../finch/finch.c:331
+#: ../finch/finch.c:419
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Probeer '%s -h' voor meer informatie.\n"
 
-#: ../finch/finch.c:208
+#: ../finch/finch.c:210
 #, c-format
 msgid ""
 "%s\n"
@@ -54,131 +55,166 @@ msgstr ""
 "  -n, --nologin       niet automatisch aanmelden\n"
 "  -v, --version       versie-info weergeven\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:738
+#: ../finch/finch.c:329
+#: ../pidgin/gtkmain.c:736
 #, 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 zorgde voor fouten tijdens het verplaatsen van je instellingen van %s "
-"naar %s. Verplaats het alstublieft handmatig. Rapporteer deze fout "
-"alstublieft op http://developer.pidgin.im"
-
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:595
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772 ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244 ../finch/gntrequest.c:380 ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310 ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121 ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2080
-#: ../libpurple/protocols/jabber/chat.c:682
-#: ../libpurple/protocols/jabber/chat.c:693
-#: ../libpurple/protocols/jabber/jabber.c:1595
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
+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 zorgde voor fouten tijdens het verplaatsen van je instellingen van %s naar %s. Verplaats het handmatig. Rapporteer deze fout alstublieft op http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:126
+#: ../finch/gntaccount.c:505
+#: ../finch/gntblist.c:595
+#: ../finch/gntblist.c:759
+#: ../finch/gntblist.c:772
+#: ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244
+#: ../finch/gntrequest.c:380
+#: ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2053
+#: ../libpurple/protocols/jabber/chat.c:702
+#: ../libpurple/protocols/jabber/chat.c:713
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/qq/group_join.c:310
+#: ../libpurple/protocols/qq/im.c:561
+#: ../libpurple/protocols/silc/ops.c:76
 #: ../libpurple/protocols/silc/ops.c:1473
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Fout"
 
-#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:126
 msgid "Account was not added"
 msgstr "Account niet toegevoegd"
 
-#: ../finch/gntaccount.c:125
+#: ../finch/gntaccount.c:127
 msgid "Username of an account must be non-empty."
 msgstr "Gebruikersnaam van een acount mag niet leeg zijn."
 
-#: ../finch/gntaccount.c:437
+#: ../finch/gntaccount.c:458
 msgid "New mail notifications"
-msgstr "Nieuwe email meldingen"
+msgstr "Nieuwe e-mailmeldingen"
 
-#: ../finch/gntaccount.c:447
+#: ../finch/gntaccount.c:468
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
-#: ../finch/gntaccount.c:485
+#: ../finch/gntaccount.c:506
 msgid "There's no protocol plugins installed."
 msgstr "Er is geen protocol-plugin geïnstalleerd"
 
-#: ../finch/gntaccount.c:486
+#: ../finch/gntaccount.c:507
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Je bent waarschijnlijk 'make install' vergeten.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1449 ../pidgin/gtkblist.c:4672
+#: ../finch/gntaccount.c:517
+#: ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1501
+#: ../pidgin/gtkblist.c:4761
 msgid "Modify Account"
 msgstr "Account bewerken"
 
-#: ../finch/gntaccount.c:496
+#: ../finch/gntaccount.c:517
 msgid "New Account"
 msgstr "Nieuw account"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:674
+#: ../finch/gntaccount.c:542
+#: ../pidgin/gtkft.c:698
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:529
+#: ../finch/gntaccount.c:550
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: ../finch/gntaccount.c:542
+#: ../finch/gntaccount.c:563
 msgid "Password:"
 msgstr "Wachtwoord: "
 
-#: ../finch/gntaccount.c:552
+#: ../finch/gntaccount.c:573
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+#: ../finch/gntaccount.c:584
+msgid "Create this account on the server"
+msgstr "Maak dit account op de server aan"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:641 ../finch/gntblist.c:747
-#: ../finch/gntblist.c:782 ../finch/gntblist.c:1134 ../finch/gntblist.c:1360
-#: ../finch/gntblist.c:1494 ../finch/gntblist.c:2661 ../finch/gntblist.c:2712
-#: ../finch/gntblist.c:2776 ../finch/gntblist.c:2838 ../finch/gntcertmgr.c:90
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:471 ../finch/gntpounce.c:679
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1064 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:178 ../libpurple/account.c:1118
-#: ../libpurple/account.c:1437 ../libpurple/account.c:1472
-#: ../libpurple/conversation.c:1235 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:517 ../libpurple/protocols/gg/gg.c:676
-#: ../libpurple/protocols/gg/gg.c:813 ../libpurple/protocols/gg/gg.c:895
+#: ../finch/gntaccount.c:600
+#: ../finch/gntaccount.c:664
+#: ../finch/gntaccount.c:915
+#: ../finch/gntblist.c:641
+#: ../finch/gntblist.c:747
+#: ../finch/gntblist.c:782
+#: ../finch/gntblist.c:1134
+#: ../finch/gntblist.c:1360
+#: ../finch/gntblist.c:1494
+#: ../finch/gntblist.c:2661
+#: ../finch/gntblist.c:2712
+#: ../finch/gntblist.c:2786
+#: ../finch/gntblist.c:2848
+#: ../finch/gntcertmgr.c:90
+#: ../finch/gntconv.c:596
+#: ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:471
+#: ../finch/gntpounce.c:679
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1064
+#: ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610
+#: ../finch/plugins/gnthistory.c:178
+#: ../libpurple/account.c:1118
+#: ../libpurple/account.c:1437
+#: ../libpurple/account.c:1472
+#: ../libpurple/conversation.c:1235
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:509
+#: ../libpurple/protocols/gg/gg.c:671
+#: ../libpurple/protocols/gg/gg.c:808
+#: ../libpurple/protocols/gg/gg.c:890
 #: ../libpurple/protocols/jabber/buddy.c:759
-#: ../libpurple/protocols/jabber/buddy.c:2474
-#: ../libpurple/protocols/jabber/buddy.c:2510
-#: ../libpurple/protocols/jabber/chat.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#: ../libpurple/protocols/jabber/jabber.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1788
-#: ../libpurple/protocols/jabber/si.c:1113
+#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2483
+#: ../libpurple/protocols/jabber/chat.c:811
+#: ../libpurple/protocols/jabber/jabber.c:1093
+#: ../libpurple/protocols/jabber/jabber.c:1102
+#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/si.c:1109
 #: ../libpurple/protocols/jabber/usermood.c:199
 #: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:403
-#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
-#: ../libpurple/protocols/msn/msn.c:373 ../libpurple/protocols/msnp9/msn.c:284
-#: ../libpurple/protocols/msnp9/msn.c:301
-#: ../libpurple/protocols/msnp9/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:356
+#: ../libpurple/protocols/jabber/xdata.c:401
+#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:393
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/msnp9/msn.c:354
+#: ../libpurple/protocols/msnp9/msn.c:375
 #: ../libpurple/protocols/myspace/user.c:582
 #: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6209
+#: ../libpurple/protocols/oscar/oscar.c:6299
 #: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
+#: ../libpurple/protocols/qq/buddy_info.c:684
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/buddy_opt.c:414
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:120
-#: ../libpurple/protocols/qq/group_opt.c:375
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/group_join.c:132
+#: ../libpurple/protocols/qq/group_join.c:347
+#: ../libpurple/protocols/qq/group_opt.c:122
+#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:272
 #: ../libpurple/protocols/sametime/sametime.c:3440
 #: ../libpurple/protocols/sametime/sametime.c:3526
 #: ../libpurple/protocols/sametime/sametime.c:3700
@@ -191,124 +227,177 @@ msgstr "Alias:"
 #: ../libpurple/protocols/silc/chat.c:619
 #: ../libpurple/protocols/silc/chat.c:753
 #: ../libpurple/protocols/silc/ops.c:1833
-#: ../libpurple/protocols/silc/silc.c:1039
-#: ../libpurple/protocols/silc/silc.c:1247
+#: ../libpurple/protocols/silc/silc.c:1058
+#: ../libpurple/protocols/silc/silc.c:1266
 #: ../libpurple/protocols/silc10/buddy.c:468
 #: ../libpurple/protocols/silc10/buddy.c:1087
 #: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:742
-#: ../libpurple/protocols/silc10/silc.c:948
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
-#: ../libpurple/protocols/yahoo/yahoo.c:3575 ../pidgin/gtkaccount.c:1843
-#: ../pidgin/gtkaccount.c:2404 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkblist.c:6880 ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:769 ../pidgin/gtkdialogs.c:908
-#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1044 ../pidgin/gtkdialogs.c:1066
-#: ../pidgin/gtkdialogs.c:1114 ../pidgin/gtkdialogs.c:1155
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkdialogs.c:1250
-#: ../pidgin/gtkdialogs.c:1277 ../pidgin/gtkimhtmltoolbar.c:438
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:302 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1619
+#: ../libpurple/protocols/silc10/silc.c:761
+#: ../libpurple/protocols/silc10/silc.c:967
+#: ../libpurple/protocols/yahoo/yahoo.c:994
+#: ../libpurple/protocols/yahoo/yahoo.c:3571
+#: ../libpurple/protocols/yahoo/yahoo.c:3582
+#: ../pidgin/gtkaccount.c:1865
+#: ../pidgin/gtkaccount.c:2417
+#: ../pidgin/gtkblist.c:686
+#: ../pidgin/gtkblist.c:6989
+#: ../pidgin/gtkcertmgr.c:197
+#: ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911
+#: ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkimhtmltoolbar.c:439
+#: ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:302
+#: ../pidgin/gtkpounce.c:1137
+#: ../pidgin/gtkprivacy.c:509
+#: ../pidgin/gtkprivacy.c:525
+#: ../pidgin/gtkprivacy.c:550
+#: ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:347
+#: ../pidgin/gtkstatusbox.c:1622
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1471 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:758 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkdebug.c:746 ../pidgin/gtkrequest.c:279
+#: ../finch/gntaccount.c:604
+#: ../finch/gntcertmgr.c:310
+#: ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:477
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1061
+#: ../finch/gntstatus.c:488
+#: ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1471
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:758
+#: ../pidgin/gtkblist.c:686
+#: ../pidgin/gtkdebug.c:746
+#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1834
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1613
+#: ../finch/gntaccount.c:657
+#: ../pidgin/gtkaccount.c:1856
+#: ../pidgin/gtksavedstatuses.c:335
+#: ../pidgin/gtkstatusbox.c:1616
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Wilt u %s echt verwijderen?"
+msgstr "Wil je %s echt verwijderen?"
 
-#: ../finch/gntaccount.c:635
+#: ../finch/gntaccount.c:660
 msgid "Delete Account"
 msgstr "Account verwijderen"
 
 #. Delete button
-#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1842 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1618
+#: ../finch/gntaccount.c:663
+#: ../finch/gntaccount.c:733
+#: ../finch/gntcertmgr.c:318
+#: ../finch/gntpounce.c:678
+#: ../finch/gntpounce.c:741
+#: ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1864
+#: ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1136
+#: ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:346
+#: ../pidgin/gtkstatusbox.c:1621
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2528 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2263 ../pidgin/gtkdocklet.c:716
+#: ../finch/gntaccount.c:695
+#: ../finch/gntblist.c:2528
+#: ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2278
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../finch/gntaccount.c:676
+#: ../finch/gntaccount.c:701
 msgid "You can enable/disable accounts from the following list."
-msgstr "U kunt accounts inschakelen/uitschakelen in de volgende lijst."
+msgstr "Je kunt accounts inschakelen/uitschakelen in de volgende lijst."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:640
-#: ../finch/gntblist.c:747 ../finch/gntblist.c:782 ../finch/gntblist.c:2947
-#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:894 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../finch/gntaccount.c:724
+#: ../finch/gntaccount.c:914
+#: ../finch/gntblist.c:640
+#: ../finch/gntblist.c:747
+#: ../finch/gntblist.c:782
+#: ../finch/gntblist.c:2968
+#: ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:390
+#: ../finch/gntpounce.c:725
+#: ../finch/gntroomlist.c:274
+#: ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:889
+#: ../libpurple/protocols/qq/sys_msg.c:117
+#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:273
 #: ../libpurple/protocols/sametime/sametime.c:5542
 #: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2403
-#: ../pidgin/gtkblist.c:6879 ../pidgin/gtkconv.c:1721
+#: ../libpurple/protocols/silc10/chat.c:599
+#: ../pidgin/gtkaccount.c:2416
+#: ../pidgin/gtkblist.c:6988
+#: ../pidgin/gtkconv.c:1740
 #: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Toevoegen"
 
 #. Modify button
-#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
+#: ../finch/gntaccount.c:729
+#: ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Bewerken"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2350
+#: ../finch/gntaccount.c:837
+#: ../pidgin/gtkaccount.c:2363
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s heeft %s in zijn/haar contactenlijst gezet%s%s"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2402
+#: ../finch/gntaccount.c:910
+#: ../pidgin/gtkaccount.c:2415
 msgid "Add buddy to your list?"
-msgstr "Gebruiker toevoegen aan uw lijst?"
+msgstr "Gebruiker toevoegen aan je lijst?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:970
+#: ../pidgin/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr ""
-"De gebruiker %s%s%s%s wil %s toevoegen aan zijn/haar contactenlijst%s%s."
+msgstr "De gebruiker %s%s%s%s wil %s toevoegen aan zijn/haar contactenlijst%s%s."
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2483
-#: ../pidgin/gtkaccount.c:2490
+#: ../finch/gntaccount.c:995
+#: ../finch/gntaccount.c:998
+#: ../finch/gntaccount.c:1025
+#: ../pidgin/gtkaccount.c:2496
+#: ../pidgin/gtkaccount.c:2503
 msgid "Authorize buddy?"
 msgstr "Gebruiker toestemmen?"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2484 ../pidgin/gtkaccount.c:2491
+#: ../finch/gntaccount.c:1002
+#: ../finch/gntaccount.c:1029
+#: ../pidgin/gtkaccount.c:2497
+#: ../pidgin/gtkaccount.c:2504
 msgid "Authorize"
 msgstr "Toestemmen"
 
-#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkaccount.c:2492
+#: ../finch/gntaccount.c:1003
+#: ../finch/gntaccount.c:1030
+#: ../pidgin/gtkaccount.c:2498
+#: ../pidgin/gtkaccount.c:2505
 msgid "Deny"
 msgstr "Blokkeren"
 
@@ -318,7 +407,7 @@ msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"On-line: %d\n"
+"Online: %d\n"
 "Totaal: %d"
 
 #: ../finch/gntblist.c:274
@@ -335,7 +424,8 @@ msgstr ""
 "\n"
 "Voor Het Laatst Gezien: %s geleden"
 
-#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../finch/gntblist.c:306
+#: ../pidgin/gtkprefs.c:327
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Standaard"
@@ -346,11 +436,11 @@ msgstr "Je moet een gebruikersnaam voor het contactpersoon opgeven."
 
 #: ../finch/gntblist.c:586
 msgid "You must provide a group."
-msgstr "U moet wel een groep aangeven."
+msgstr "Je moet een groep aangeven."
 
 #: ../finch/gntblist.c:588
 msgid "You must select an account."
-msgstr "U moet een account aangeven."
+msgstr "Je moet een account aangeven."
 
 #: ../finch/gntblist.c:590
 msgid "The selected account is not online."
@@ -360,46 +450,57 @@ msgstr "De geselecteerde account is niet online"
 msgid "Error adding buddy"
 msgstr "Fout bij toevoegen van contact"
 
-#: ../finch/gntblist.c:622 ../libpurple/protocols/irc/irc.c:974
-#: ../libpurple/protocols/irc/msgs.c:364
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:976
-#: ../libpurple/protocols/oscar/oscar.c:2944
-#: ../libpurple/protocols/oscar/oscar.c:3961
-#: ../libpurple/protocols/silc/buddy.c:1542
+#: ../finch/gntblist.c:622
+#: ../libpurple/protocols/irc/irc.c:995
+#: ../libpurple/protocols/irc/msgs.c:368
+#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/oscar/oscar.c:4087
+#: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc/ops.c:1210
 #: ../libpurple/protocols/silc/ops.c:1213
 #: ../libpurple/protocols/silc/ops.c:1349
 #: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc/silc.c:1221
-#: ../libpurple/protocols/silc10/buddy.c:1542
+#: ../libpurple/protocols/silc/silc.c:1240
+#: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtksavedstatuses.c:971
+#: ../libpurple/protocols/silc10/silc.c:941
+#: ../pidgin/gtkaccount.c:1938
+#: ../pidgin/gtksavedstatuses.c:1011
 msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: ../finch/gntblist.c:625
 msgid "Alias (optional)"
-msgstr "Alias (optioneel) :"
+msgstr "Alias (optioneel)"
 
 #: ../finch/gntblist.c:628
 msgid "Add in group"
 msgstr "In groep toevoegen"
 
-#: ../finch/gntblist.c:632 ../finch/gntblist.c:726 ../finch/gntblist.c:1705
-#: ../finch/gntblist.c:2642 ../finch/gntblist.c:2698 ../finch/gntblist.c:2763
-#: ../finch/gntblist.c:2823 ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3320 ../pidgin/gtknotify.c:530
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:465
+#: ../finch/gntblist.c:632
+#: ../finch/gntblist.c:726
+#: ../finch/gntblist.c:1705
+#: ../finch/gntblist.c:2642
+#: ../finch/gntblist.c:2698
+#: ../finch/gntblist.c:2773
+#: ../finch/gntblist.c:2833
+#: ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3409
+#: ../pidgin/gtknotify.c:530
+#: ../pidgin/gtkpounce.c:1305
+#: ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Account"
 
-#: ../finch/gntblist.c:638 ../finch/gntblist.c:1183
+#: ../finch/gntblist.c:638
+#: ../finch/gntblist.c:1183
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -408,8 +509,9 @@ msgstr "Account"
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6428
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../libpurple/protocols/yahoo/yahoo.c:3407
+#: ../pidgin/gtkblist.c:6537
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "Contact toevoegen"
 
@@ -417,49 +519,63 @@ msgstr "Contact toevoegen"
 msgid "Please enter buddy information."
 msgstr "Geef contactinformatie."
 
-#: ../finch/gntblist.c:694 ../libpurple/blist.c:1237
+#: ../finch/gntblist.c:694
+#: ../libpurple/blist.c:1246
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:732 ../finch/gntblist.c:2637 ../finch/gntblist.c:2693
-#: ../finch/gntblist.c:2818 ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/jabber/jabber.c:994
-#: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1595
-#: ../libpurple/protocols/msnp9/msn.c:1660
-#: ../libpurple/protocols/msnp9/msn.c:1687
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:766
-#: ../pidgin/gtkroomlist.c:749
+#: ../finch/gntblist.c:732
+#: ../finch/gntblist.c:2637
+#: ../finch/gntblist.c:2693
+#: ../finch/gntblist.c:2828
+#: ../finch/gntconv.c:584
+#: ../finch/gntroomlist.c:298
+#: ../libpurple/protocols/jabber/jabber.c:1021
+#: ../libpurple/protocols/jabber/jabber.c:1024
+#: ../libpurple/protocols/msn/msn.c:1968
+#: ../libpurple/protocols/msn/msn.c:2033
+#: ../libpurple/protocols/msn/msn.c:2060
+#: ../libpurple/protocols/msnp9/msn.c:1724
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1816
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../pidgin/gtkplugin.c:770
+#: ../pidgin/gtkroomlist.c:739
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Naam"
 
-#: ../finch/gntblist.c:735 ../finch/gntblist.c:1646
-#: ../libpurple/protocols/msn/msn.c:1573
-#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../finch/gntblist.c:735
+#: ../finch/gntblist.c:1646
+#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/msnp9/msn.c:1542
 #: ../libpurple/protocols/silc/chat.c:609
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1019
-#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1171
+#: ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:1046
+#: ../pidgin/gtkdialogs.c:1068
 #: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:738 ../finch/gntblist.c:2963
+#: ../finch/gntblist.c:738
+#: ../finch/gntblist.c:2984
 msgid "Group"
 msgstr "Groep"
 
-#: ../finch/gntblist.c:742 ../finch/gntblist.c:1150
+#: ../finch/gntblist.c:742
+#: ../finch/gntblist.c:1150
 msgid "Auto-join"
-msgstr "Auto-deelnemen"
+msgstr "Automatisch deelnemen"
 
-#: ../finch/gntblist.c:745 ../finch/gntblist.c:1185 ../pidgin/gtkblist.c:6793
+#: ../finch/gntblist.c:745
+#: ../finch/gntblist.c:1185
+#: ../pidgin/gtkblist.c:6902
 msgid "Add Chat"
 msgstr "Chat toevoegen"
 
@@ -467,21 +583,24 @@ msgstr "Chat toevoegen"
 msgid "You can edit more information from the context menu later."
 msgstr "Je kan meer informatie van het context-menu later veranderen"
 
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772
+#: ../finch/gntblist.c:759
+#: ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "Fout bij toevoegen van groep"
 
 #: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
-msgstr "Geef alstublieft de naam van de toe te voegen groep."
+msgstr "Geef de naam van de toe te voegen groep."
 
 #: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
 msgstr "Die groep bestaat al."
 
-#: ../finch/gntblist.c:780 ../finch/gntblist.c:1187
+#: ../finch/gntblist.c:780
+#: ../finch/gntblist.c:1187
 #: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5540 ../pidgin/gtkblist.c:6876
+#: ../libpurple/protocols/sametime/sametime.c:5540
+#: ../pidgin/gtkblist.c:6985
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
@@ -489,15 +608,17 @@ msgstr "Groep toevoegen"
 msgid "Enter the name of the group"
 msgstr "Geef de naam van de groep"
 
-#: ../finch/gntblist.c:1133 ../pidgin/gtkblist.c:683
+#: ../finch/gntblist.c:1133
+#: ../pidgin/gtkblist.c:685
 msgid "Edit Chat"
-msgstr "Chat Bewerken"
+msgstr "Chat bewerken"
 
 #: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "Update de belangrijke velden"
 
-#: ../finch/gntblist.c:1134 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1134
+#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Bewerken"
 
@@ -505,38 +626,47 @@ msgstr "Bewerken"
 msgid "Edit Settings"
 msgstr "Instellingen bewerken"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
+#: ../finch/gntblist.c:1195
+#: ../pidgin/gtkutils.c:982
 msgid "Information"
 msgstr "Informatie"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
+#: ../finch/gntblist.c:1195
+#: ../pidgin/gtkutils.c:982
 msgid "Retrieving..."
 msgstr "Ophalen..."
 
-#: ../finch/gntblist.c:1249 ../finch/gntconv.c:591
+#: ../finch/gntblist.c:1249
+#: ../finch/gntconv.c:633
 #: ../libpurple/protocols/silc/chat.c:906
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
-msgstr "Extra info"
+msgstr "Verkrijg info"
 
 #: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
-msgstr "Contact-alarm toevoegen"
+msgstr "Contactalarm toevoegen"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1260 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1113
-#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1669
+#: ../finch/gntblist.c:1260
+#: ../finch/gntconv.c:645
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/qq/qq.c:664
+#: ../pidgin/gtkconv.c:1679
 msgid "Send File"
-msgstr "Bestanden Verzenden"
+msgstr "Bestanden verzenden"
 
-#: ../finch/gntblist.c:1267 ../libpurple/protocols/gg/gg.c:1860
-#: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
+#: ../finch/gntblist.c:1267
+#: ../libpurple/protocols/gg/gg.c:1625
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/msnp9/msn.c:581
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: ../finch/gntblist.c:1273 ../finch/gntblist.c:1662 ../finch/gntblist.c:2832
+#: ../finch/gntblist.c:1273
+#: ../finch/gntblist.c:1662
+#: ../finch/gntblist.c:2842
 msgid "View Log"
 msgstr "Logboek"
 
@@ -545,13 +675,14 @@ msgstr "Logboek"
 msgid "Please enter the new name for %s"
 msgstr "Geef de nieuwe naam voor %s"
 
-#: ../finch/gntblist.c:1357 ../finch/gntblist.c:1646
+#: ../finch/gntblist.c:1357
+#: ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "Hernoemen"
 
 #: ../finch/gntblist.c:1357
 msgid "Set Alias"
-msgstr "Alias Instellen"
+msgstr "Alias instellen"
 
 #: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
@@ -559,8 +690,7 @@ msgstr "Niets invullen om de naam te herstellen."
 
 #: ../finch/gntblist.c:1472
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
-"Verwijderen van dit contact verwijdert ook de gebruikers in het contact"
+msgstr "Verwijderen van dit contact verwijdert ook de gebruikers in het contact"
 
 #: ../finch/gntblist.c:1480
 msgid "Removing this group will also remove all the buddies in the group"
@@ -569,137 +699,165 @@ msgstr "Verwijderen van deze groep verwijdert ook de gebruikers in deze groep"
 #: ../finch/gntblist.c:1485
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Wilt u %s echt verwijderen?"
+msgstr "Wil je %s echt verwijderen?"
 
 #. XXX: anything to do with the returned ui-handle?
 #: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "Verwijderen bevestigen"
 
-#: ../finch/gntblist.c:1493 ../finch/gntblist.c:1648 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1718 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:268
+#: ../finch/gntblist.c:1493
+#: ../finch/gntblist.c:1648
+#: ../finch/gntft.c:245
+#: ../pidgin/gtkconv.c:1737
+#: ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:269
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. Buddy List
-#: ../finch/gntblist.c:1622 ../finch/gntblist.c:3004 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5167
+#: ../finch/gntblist.c:1622
+#: ../finch/gntblist.c:3025
+#: ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95
+#: ../pidgin/gtkblist.c:5261
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Contactenlijst"
 
 #: ../finch/gntblist.c:1653
 msgid "Place tagged"
-msgstr "Plaats getagged"
+msgstr "Tag aan bladwijzer toegevoegd"
 
 #: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
-msgstr "Wissel Tag"
+msgstr "Tag wisselen"
 
 #. General
-#: ../finch/gntblist.c:1698 ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1134
-#: ../libpurple/protocols/gg/gg.c:2618
+#: ../finch/gntblist.c:1698
+#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:1059
+#: ../libpurple/protocols/gg/gg.c:1132
+#: ../libpurple/protocols/gg/gg.c:2247
 #: ../libpurple/protocols/jabber/buddy.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1285
-#: ../libpurple/protocols/jabber/buddy.c:2265
-#: ../libpurple/protocols/jabber/buddy.c:2457
-#: ../libpurple/protocols/jabber/jabber.c:1002
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1671
-#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1598
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/jabber/buddy.c:1280
+#: ../libpurple/protocols/jabber/buddy.c:2238
+#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1647
+#: ../libpurple/protocols/jabber/jabber.c:1661
+#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1689
+#: ../libpurple/protocols/jabber/jabber.c:1703
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1971
+#: ../libpurple/protocols/msnp9/msn.c:1550
+#: ../libpurple/protocols/msnp9/msn.c:1727
+#: ../libpurple/protocols/qq/buddy_info.c:44
+#: ../libpurple/protocols/silc/buddy.c:1550
 #: ../libpurple/protocols/silc/ops.c:1016
 #: ../libpurple/protocols/silc/ops.c:1199
 #: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc10/buddy.c:1538
+#: ../libpurple/protocols/silc10/buddy.c:1550
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3344
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1069
+#: ../pidgin/gtkblist.c:3433
 msgid "Nickname"
 msgstr "Bijnaam/Adres"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1720 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:982
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:541
+#: ../finch/gntblist.c:1720
+#: ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:991
+#: ../libpurple/protocols/msn/msn.c:713
+#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:739
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:560
 #: ../libpurple/protocols/msnp9/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2968
-#: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3372
-#: ../pidgin/gtkblist.c:3832 ../pidgin/gtkprefs.c:2056
+#: ../libpurple/protocols/oscar/oscar.c:3142
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
+#: ../pidgin/gtkblist.c:3461
+#: ../pidgin/gtkblist.c:3921
+#: ../pidgin/gtkprefs.c:2053
 msgid "Idle"
 msgstr "Inactief"
 
 #: ../finch/gntblist.c:1734
 msgid "On Mobile"
-msgstr "Op Mobieltje"
+msgstr "Op mobieltje"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:2035
+#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nieuw..."
 
-#: ../finch/gntblist.c:2042 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:2042
+#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Opgeslagen..."
 
-#: ../finch/gntblist.c:2496 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:715
+#: ../finch/gntblist.c:2496
+#: ../finch/gntplugin.c:352
+#: ../finch/gntui.c:100
+#: ../pidgin/gtkplugin.c:719
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2650 ../finch/gntblist.c:2655
+#: ../finch/gntblist.c:2650
+#: ../finch/gntblist.c:2655
 msgid "Block/Unblock"
-msgstr "Blokkeren/Deblokkeren"
+msgstr "Blokkeren/deblokkeren"
 
-#: ../finch/gntblist.c:2651 ../libpurple/protocols/gg/gg.c:1896
+#: ../finch/gntblist.c:2651
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../finch/gntblist.c:2652 ../libpurple/protocols/gg/gg.c:1892
+#: ../finch/gntblist.c:2652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Unblock"
 msgstr "Deblokkeren"
 
 #: ../finch/gntblist.c:2657
-msgid ""
-"Please enter the username or alias of the person you would like to Block/"
-"Unblock."
-msgstr ""
-"Geef alsjeblieft de gebruikersnaam of bijnaam van de persoon wie je wilt "
-"Blokkeren/Deblokkeren."
+msgid "Please enter the username or alias of the person you would like to Block/Unblock."
+msgstr "Geef de gebruikersnaam of bijnaam van de persoon wie je wilt Blokkeren/Deblokkeren."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2660 ../finch/gntblist.c:2711 ../finch/gntblist.c:2837
-#: ../finch/gntcertmgr.c:89 ../finch/gntconn.c:137 ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
-#: ../libpurple/account.c:1436 ../libpurple/protocols/gg/gg.c:516
-#: ../libpurple/protocols/gg/gg.c:675 ../libpurple/protocols/gg/gg.c:812
-#: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/jabber/xdata.c:402
-#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
-#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
-#: ../libpurple/protocols/msnp9/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:300
-#: ../libpurple/protocols/msnp9/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:334
+#: ../finch/gntblist.c:2660
+#: ../finch/gntblist.c:2711
+#: ../finch/gntblist.c:2847
+#: ../finch/gntcertmgr.c:89
+#: ../finch/gntconn.c:137
+#: ../finch/gntconv.c:595
+#: ../finch/gntnotify.c:80
+#: ../finch/plugins/gnthistory.c:177
+#: ../libpurple/account.c:1117
+#: ../libpurple/account.c:1436
+#: ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:670
+#: ../libpurple/protocols/gg/gg.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:371
+#: ../libpurple/protocols/msnp9/msn.c:302
+#: ../libpurple/protocols/msnp9/msn.c:319
+#: ../libpurple/protocols/msnp9/msn.c:336
+#: ../libpurple/protocols/msnp9/msn.c:353
 #: ../libpurple/protocols/myspace/user.c:581
 #: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6298
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:448
@@ -707,7 +865,7 @@ msgstr ""
 #: ../libpurple/protocols/silc/chat.c:752
 #: ../libpurple/protocols/silc/ops.c:1306
 #: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1038
+#: ../libpurple/protocols/silc/silc.c:1057
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
@@ -715,150 +873,169 @@ msgstr ""
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1909
-#: ../libpurple/protocols/silc10/silc.c:741
-#: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3563
-#: ../libpurple/protocols/yahoo/yahoo.c:3574 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:768 ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/silc10/silc.c:760
+#: ../libpurple/protocols/yahoo/yahoo.c:993
+#: ../libpurple/protocols/yahoo/yahoo.c:3570
+#: ../libpurple/protocols/yahoo/yahoo.c:3581
+#: ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:771
+#: ../pidgin/gtkdialogs.c:910
+#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2706 ../pidgin/gtkdialogs.c:763
+#: ../finch/gntblist.c:2706
+#: ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
-msgstr "Nieuw express-bericht"
+msgstr "Nieuw bericht"
 
-#: ../finch/gntblist.c:2708 ../pidgin/gtkdialogs.c:765
-#, fuzzy
+#: ../finch/gntblist.c:2708
+#: ../pidgin/gtkdialogs.c:768
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr ""
-"Geef alstublieft de gebruikersnaam van de persoon aan wie u een bericht zou "
-"willen sturen."
+msgstr "Geef de gebruikersnaam van de persoon aan wie je een bericht zou willen sturen."
 
-#: ../finch/gntblist.c:2759
+#: ../finch/gntblist.c:2769
 msgid "Channel"
 msgstr "Ruimte"
 
-#: ../finch/gntblist.c:2771 ../pidgin/gtkblist.c:1036
+#: ../finch/gntblist.c:2781
+#: ../pidgin/gtkblist.c:1038
 msgid "Join a Chat"
-msgstr "Chat Openen"
+msgstr "Chat openen"
 
-#: ../finch/gntblist.c:2773
+#: ../finch/gntblist.c:2783
 msgid "Please enter the name of the chat you want to join."
 msgstr "Voer de naam in van het gesprek waarin je wilt deelnemen."
 
-#: ../finch/gntblist.c:2775 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2785
+#: ../finch/gntnotify.c:399
 msgid "Join"
 msgstr "Deelnemen"
 
-#: ../finch/gntblist.c:2834 ../pidgin/gtkdialogs.c:996
-msgid ""
-"Please enter the username or alias of the person whose log you would like to "
-"view."
-msgstr ""
-"Geef alsjeblieft de gebruikersnaam of bijnaam van de persoon waarvan u het "
-"logboek wilt opvragen."
+#: ../finch/gntblist.c:2844
+#: ../pidgin/gtkdialogs.c:999
+msgid "Please enter the username or alias of the person whose log you would like to view."
+msgstr "Geef de gebruikersnaam of bijnaam van de persoon waarvan je het logboek wilt opvragen."
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2882 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2898
+#: ../finch/gntpounce.c:459
+#: ../pidgin/gtkpounce.c:826
 msgid "Options"
 msgstr "Opties"
 
-#: ../finch/gntblist.c:2888
+#: ../finch/gntblist.c:2904
 msgid "Send IM..."
-msgstr "Verzend Bericht..."
+msgstr "Bericht verzenden..."
 
-#: ../finch/gntblist.c:2893
+#: ../finch/gntblist.c:2909
 msgid "Block/Unblock..."
-msgstr "Blokkeren/Deblokkeren..."
+msgstr "Blokkeren/deblokkeren..."
 
-#: ../finch/gntblist.c:2898
+#: ../finch/gntblist.c:2914
+#: ../pidgin/gtkdocklet.c:711
 msgid "Join Chat..."
 msgstr "Chat openen..."
 
-#: ../finch/gntblist.c:2903 ../finch/gntconv.c:611
+#: ../finch/gntblist.c:2919
+#: ../finch/gntconv.c:657
 msgid "View Log..."
 msgstr "Bekijk logboek"
 
-#: ../finch/gntblist.c:2908
+#: ../finch/gntblist.c:2924
+msgid "View All Logs"
+msgstr "Alle logboeken bekijken"
+
+#: ../finch/gntblist.c:2929
 msgid "Show"
 msgstr "Weergeven"
 
-#: ../finch/gntblist.c:2913
+#: ../finch/gntblist.c:2934
 msgid "Empty groups"
 msgstr "Lege groepen"
 
-#: ../finch/gntblist.c:2920
+#: ../finch/gntblist.c:2941
 msgid "Offline buddies"
 msgstr "Offline contacten"
 
-#: ../finch/gntblist.c:2927
+#: ../finch/gntblist.c:2948
 msgid "Sort"
 msgstr "Sorteren"
 
-#: ../finch/gntblist.c:2932
+#: ../finch/gntblist.c:2953
 msgid "By Status"
 msgstr "Op status"
 
-#: ../finch/gntblist.c:2937 ../pidgin/gtkblist.c:4323
+#: ../finch/gntblist.c:2958
+#: ../pidgin/gtkblist.c:4412
 msgid "Alphabetically"
 msgstr "Alfabetisch"
 
-#: ../finch/gntblist.c:2942
+#: ../finch/gntblist.c:2963
 msgid "By Log Size"
 msgstr "Op logboekgrootte"
 
-#: ../finch/gntblist.c:2953
+#: ../finch/gntblist.c:2974
 msgid "Buddy"
 msgstr "Contact"
 
-#: ../finch/gntblist.c:2958 ../libpurple/protocols/oscar/oscar.c:649
-#: ../libpurple/protocols/silc/silc.c:984
+#: ../finch/gntblist.c:2979
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/silc/silc.c:1003
 #: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/silc.c:704
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Chat"
 
-#: ../finch/gntblist.c:2968 ../finch/plugins/grouping.c:255
+#: ../finch/gntblist.c:2989
+#: ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Groeperen"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntcertmgr.c:85
+#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Import certificaat"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86
+#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Geef een hostnaam"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:87
+#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Geef de computernaam waar dit certificaat voor is."
 
-#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96
+#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 "Bestand %s kon niet worden geïmporteerd.\n"
-"Ben er zeker van dat het bestand llesbaar is en in PEM formaat is "
-"gecodeerd.\n"
+"Ben er zeker van dat het bestand leesbaar is en in PEM formaat is gecodeerd.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:98
+#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Certificaat import fout"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99
+#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "X.509 certificaat import mislukt"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109
+#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Selecteer een PEM-certificaat"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126
+#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -867,17 +1044,20 @@ msgstr ""
 "Exporteren naar bestand %s msilukt.\n"
 "Controleer of je schrijf-toegang tot de doelmap hebt\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:128
+#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr "Certificaat Export Fout"
+msgstr "Certificaat export fout"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129
+#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "X.509 certificaat export milsukt"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+#: ../finch/gntcertmgr.c:158
+#: ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.509 Certificaat Export"
+msgstr "PEM X.509 certificaat export"
 
 #: ../finch/gntcertmgr.c:187
 #, c-format
@@ -899,40 +1079,54 @@ msgstr ""
 
 #: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
-msgstr "SSL Host Certificaat"
+msgstr "SSL host certificaat"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
+#: ../finch/gntcertmgr.c:232
+#: ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Ben je er zeker van om het certificaat voor %s te verwijderen?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
+#: ../finch/gntcertmgr.c:235
+#: ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Bevestig het verwijderen van het certificaat."
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
+#: ../finch/gntcertmgr.c:292
+#: ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
-msgstr "Certificaat Beheerder"
+msgstr "Certificaat beheerder"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:695
-#: ../libpurple/protocols/silc/silc.c:1223
-#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
+#: ../finch/gntcertmgr.c:297
+#: ../libpurple/protocols/bonjour/bonjour.c:705
+#: ../libpurple/protocols/silc/silc.c:1242
+#: ../libpurple/protocols/silc10/silc.c:943
+#: ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Hostnaam"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1697
+#: ../finch/gntcertmgr.c:314
+#: ../finch/gntnotify.c:393
+#: ../pidgin/gtkconv.c:1716
 #: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:417 ../libpurple/protocols/msnp9/msn.c:400
+#: ../finch/gntcertmgr.c:323
+#: ../finch/gntft.c:255
+#: ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:220
+#: ../finch/gntplugin.c:413
+#: ../finch/gntpounce.c:750
+#: ../finch/gntroomlist.c:275
+#: ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:476
+#: ../libpurple/protocols/msnp9/msn.c:419
 #: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2377
+#: ../libpurple/protocols/silc10/util.c:377
+#: ../pidgin/gtkaccount.c:2390
 #: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Sluiten"
@@ -952,67 +1146,66 @@ msgstr "%s heeft de verbinding verbroken."
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"Finch zal geen verbinding meer proberen te maken tot je de fout is verhelpt "
-"en het account weer inschakeld."
+"Finch zal geen verbinding meer proberen te maken tot je de fout is verhelpt en het account weer inschakeld."
 
 #: ../finch/gntconn.c:139
 msgid "Re-enable Account"
-msgstr "Weer aanzetten"
+msgstr "Account opnieuw inschakelen"
 
 #: ../finch/gntconn.c:156
-msgid ""
-"The account has disconnected and you are no longer in this chat. You will be "
-"automatically rejoined in the chat when the account reconnects."
-msgstr ""
-"Het account is niet meer verbonden en je neemt niet meer deel aan dit "
-"gesprek. Je komt er automatisch weer in het gesprek als de verbinding van "
-"het account hersteld word."
+msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
+msgstr "Het account is niet meer verbonden en je neemt niet meer deel aan dit gesprek. Je komt automatisch weer in het gesprek als de verbinding van het account hersteld word."
 
-#: ../finch/gntconv.c:159
+#: ../finch/gntconv.c:160
 msgid "No such command."
 msgstr "Opdracht bestaat niet."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:164
+#: ../pidgin/gtkconv.c:493
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Syntax-fout:  U gaf de verkeerde hoeveelheid argumenten bij die opdracht."
+msgstr "Syntax-fout:  Je gaf de verkeerde hoeveelheid argumenten bij die opdracht."
 
-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:500
+#: ../finch/gntconv.c:169
+#: ../pidgin/gtkconv.c:499
 msgid "Your command failed for an unknown reason."
 msgstr "Uw opdracht mislukte om een onbekende reden."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:174
+#: ../pidgin/gtkconv.c:506
 msgid "That command only works in chats, not IMs."
 msgstr "Die opdracht werkt alleen in chats, niet in gewone gesprekken."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:177
+#: ../pidgin/gtkconv.c:509
 msgid "That command only works in IMs, not chats."
 msgstr "Die opdracht werkt alleen in gewone gesprekken, niet in chats."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:515
+#: ../finch/gntconv.c:181
+#: ../pidgin/gtkconv.c:514
 msgid "That command doesn't work on this protocol."
 msgstr "Die opdracht werkt niet met dit protocol."
 
-#: ../finch/gntconv.c:188
+#: ../finch/gntconv.c:189
 msgid "Message was not sent, because you are not signed on."
 msgstr "Kan bericht niet versturen omdatje niet aangemeld bent."
 
-#: ../finch/gntconv.c:268
+#: ../finch/gntconv.c:269
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:291
+#: ../finch/gntconv.c:292
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3587
+#: ../finch/gntconv.c:297
+#: ../finch/gntconv.c:974
+#: ../pidgin/gtkconv.c:3611
 #, c-format
 msgid ""
 "\n"
@@ -1021,66 +1214,94 @@ msgstr ""
 "\n"
 "%s typt..."
 
-#: ../finch/gntconv.c:315
+#: ../finch/gntconv.c:316
 msgid "You have left this chat."
-msgstr "U heeft dit gesprek verlaten."
+msgstr "Je hebt dit gesprek verlaten."
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1403
+#: ../finch/gntconv.c:434
+#: ../pidgin/gtkconv.c:1402
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Logboek wordt vanaf nu bijgehouden."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1411
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+#: ../finch/gntconv.c:438
+#: ../pidgin/gtkconv.c:1410
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Logboek wordt vanaf nu niet meer bijgehouden."
 
-#: ../finch/gntconv.c:523
+#: ../finch/gntconv.c:524
 msgid "Send To"
-msgstr "Verzenden Aan"
+msgstr "Verzenden aan"
+
+#: ../finch/gntconv.c:588
+msgid "Invite message"
+msgstr "Uitnodigingsbericht"
+
+#: ../finch/gntconv.c:590
+#: ../finch/gntnotify.c:402
+#: ../libpurple/protocols/sametime/sametime.c:3525
+msgid "Invite"
+msgstr "Uitnodigen"
+
+#: ../finch/gntconv.c:592
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Geef de bijnaam van de persoon die u wilt uitnodigen,\n"
+"eventueel met een uitnodigende tekst."
 
-#: ../finch/gntconv.c:568
+#: ../finch/gntconv.c:610
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: ../finch/gntconv.c:574
+#: ../finch/gntconv.c:616
 msgid "Clear Scrollback"
-msgstr "Gesprek Opschonen"
+msgstr "Gesprek opschonen"
 
-#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:620
+#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Tijd in gesprek"
 
-#: ../finch/gntconv.c:596
-#, fuzzy
+#: ../finch/gntconv.c:638
 msgid "Add Buddy Pounce..."
-msgstr "Contact-alarm toevoegen"
+msgstr "Contactalarm toevoegen..."
+
+#: ../finch/gntconv.c:652
+msgid "Invite..."
+msgstr "Uitnodigen.."
 
-#: ../finch/gntconv.c:615
+#: ../finch/gntconv.c:661
 msgid "Enable Logging"
 msgstr "Logboek bijhouden"
 
-#: ../finch/gntconv.c:621
+#: ../finch/gntconv.c:667
 msgid "Enable Sounds"
-msgstr "Geluiden Inschakelen"
+msgstr "Geluiden inschakelen"
 
-#: ../finch/gntconv.c:835
+#: ../finch/gntconv.c:927
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-ANTWOORD>"
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:970
-msgid "List of users:\n"
-msgstr "Gebruikerslijst:\n"
+#: ../finch/gntconv.c:1067
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lijst van %d gebruiker:\n"
+msgstr[1] "Lijst van %d gebruikers:\n"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:339
+#: ../finch/gntconv.c:1227
+#: ../pidgin/gtkconv.c:338
 msgid "Supported debug options are:  version"
 msgstr "Ondersteunde debug-opties zijn:  version"
 
-#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:391
+#: ../finch/gntconv.c:1263
+#: ../pidgin/gtkconv.c:390
 msgid "No such command (in this context)."
 msgstr "Opdracht onbekend (in deze context)."
 
-#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:394
+#: ../finch/gntconv.c:1266
+#: ../pidgin/gtkconv.c:393
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1088,67 +1309,85 @@ msgstr ""
 "Gebruik \"/help &lt;opdracht&gt;\" voor hulp bij een bepaalde opdracht.\n"
 "De volgende opdrachten zijn hiervoor beschikbaar:\n"
 
-#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7960
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+#: ../finch/gntconv.c:1310
+#, c-format
+msgid "%s is not a valid message class. See '/help msgcolor' for valid message classes."
 msgstr ""
-"say &lt;bericht&gt;:  Stuur een bericht alsof je geen opdracht hiervoor "
-"gebruikt."
 
-#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7963
+#: ../finch/gntconv.c:1317
+#: ../finch/gntconv.c:1324
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s is geen geldige kleur. Bekijk '/help msgcolor' voor geldige kleuren."
+
+#: ../finch/gntconv.c:1380
+#: ../pidgin/gtkconv.c:7809
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "say &lt;bericht&gt;:  Stuur een bericht alsof je geen opdracht hiervoor gebruikt."
+
+#: ../finch/gntconv.c:1383
+#: ../pidgin/gtkconv.c:7812
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;actie&gt;:  Een IRC-achtige actie naar persoon / chat sturen."
 
-#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7966
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;optie&gt;:  Diverse debug-gegevens naar het huidige gesprek sturen."
+#: ../finch/gntconv.c:1386
+#: ../pidgin/gtkconv.c:7815
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;optie&gt;:  Diverse debug-gegevens naar het huidige gesprek sturen."
 
-#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7969
+#: ../finch/gntconv.c:1389
+#: ../pidgin/gtkconv.c:7818
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Maakt het gespreksvenster schoon."
 
-#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7975
+#: ../finch/gntconv.c:1392
+#: ../pidgin/gtkconv.c:7824
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;opdracht&gt;:  Hulp bij een specifieke opdracht."
 
-#: ../finch/gntconv.c:1259
+#: ../finch/gntconv.c:1395
 msgid "users:  Show the list of users in the chat."
 msgstr "gebruikers: Laat de lijst van gebruikers in het gesprek zien."
 
-#: ../finch/gntconv.c:1264
+#: ../finch/gntconv.c:1400
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Plugins-venster weergeven."
 
-#: ../finch/gntconv.c:1267
+#: ../finch/gntconv.c:1403
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Contactenlijst weergeven."
 
-#: ../finch/gntconv.c:1270
+#: ../finch/gntconv.c:1406
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Accounts-venster weergeven."
 
-#: ../finch/gntconv.c:1273
+#: ../finch/gntconv.c:1409
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Debugvenster weergeven."
 
-#: ../finch/gntconv.c:1276
+#: ../finch/gntconv.c:1412
 msgid "prefs: Show the preference window."
 msgstr "prefs: Voorkeuren weergeven."
 
-#: ../finch/gntconv.c:1279
+#: ../finch/gntconv.c:1415
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Venster met opgeslagen statussen weergeven."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:967 ../pidgin/gtkconv.c:2728
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:531
+#: ../finch/gntconv.c:1420
+msgid "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color for different classes of messages in the conversation window.<br>    &lt;class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
+#: ../finch/gntdebug.c:231
+#: ../pidgin/gtkconv.c:966
+#: ../pidgin/gtkconv.c:2722
+#: ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:545
 msgid "Unable to open file."
 msgstr "Kan het bestand niet openen."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
+#: ../finch/gntdebug.c:271
+#: ../finch/gntui.c:98
+#: ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Debugvenster"
 
@@ -1156,7 +1395,8 @@ msgstr "Debugvenster"
 #. * 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:292 ../pidgin/gtkdebug.c:751
+#: ../finch/gntdebug.c:292
+#: ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1164,198 +1404,230 @@ msgstr "Wissen"
 msgid "Filter:"
 msgstr "Filteren:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
+#: ../finch/gntdebug.c:309
+#: ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: ../finch/gntft.c:120 ../pidgin/gtkft.c:227
+#: ../finch/gntft.c:120
+#: ../pidgin/gtkft.c:229
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Bestandsoverdrachten - %d%% van %d bestanden"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Bestandsoverdrachten - %d%% van %d bestand"
+msgstr[1] "Bestandsoverdrachten - %d%% van %d bestanden"
 
 #. Create the window.
-#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:232 ../pidgin/gtkft.c:739
+#: ../finch/gntft.c:127
+#: ../finch/gntft.c:214
+#: ../finch/gntui.c:99
+#: ../pidgin/gtkft.c:236
+#: ../pidgin/gtkft.c:763
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:623
+#: ../finch/gntft.c:219
+#: ../pidgin/gtkft.c:647
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:630
+#: ../finch/gntft.c:219
+#: ../pidgin/gtkft.c:654
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:637
+#: ../finch/gntft.c:219
+#: ../pidgin/gtkft.c:661
 msgid "Size"
 msgstr "Grootte"
 
-#: ../finch/gntft.c:217
+#: ../finch/gntft.c:219
 msgid "Speed"
 msgstr "Snelheid"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:219
+#: ../pidgin/gtkft.c:668
 msgid "Remaining"
 msgstr "Nog te gaan"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1815
-#: ../libpurple/protocols/gg/gg.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:809
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:972
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../finch/gntft.c:219
+#: ../finch/gntstatus.c:547
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:369
+#: ../libpurple/protocols/gg/gg.c:1048
+#: ../libpurple/protocols/gg/gg.c:1580
+#: ../libpurple/protocols/gg/gg.c:1588
+#: ../libpurple/protocols/jabber/buddy.c:836
+#: ../libpurple/protocols/jabber/buddy.c:840
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/msn/msn.c:738
+#: ../libpurple/protocols/msn/msn.c:741
+#: ../libpurple/protocols/msnp9/msn.c:559
 #: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:822
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:2756
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/oscar/oscar.c:910
+#: ../libpurple/protocols/oscar/oscar.c:2949
 #: ../libpurple/protocols/sametime/sametime.c:3315
 #: ../libpurple/protocols/sametime/sametime.c:4206
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3416
-#: ../pidgin/gtkblist.c:3430 ../pidgin/gtkblist.c:3432
-#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../pidgin/gtkblist.c:3505
+#: ../pidgin/gtkblist.c:3519
+#: ../pidgin/gtkblist.c:3521
+#: ../pidgin/gtksavedstatuses.c:1030
+#: ../pidgin/gtksavedstatuses.c:1181
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:227
+#: ../finch/gntft.c:229
 msgid "Close this window when all transfers finish"
 msgstr "Venster sluiten nadat alles is voltooid"
 
-#: ../finch/gntft.c:234
+#: ../finch/gntft.c:236
 msgid "Clear finished transfers"
 msgstr "Verwerkte overdrachten uit lijst verwijderen"
 
-#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
+#: ../finch/gntft.c:250
+#: ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../finch/gntft.c:321 ../pidgin/gtkft.c:167 ../pidgin/gtkft.c:902
+#: ../finch/gntft.c:323
+#: ../pidgin/gtkft.c:169
+#: ../pidgin/gtkft.c:936
 msgid "Waiting for transfer to begin"
 msgstr "Wacht op starten van overdracht"
 
-#: ../finch/gntft.c:388 ../pidgin/gtkft.c:161 ../pidgin/gtkft.c:983
+#: ../finch/gntft.c:390
+#: ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1017
 msgid "Canceled"
 msgstr "Afgebroken"
 
-#: ../finch/gntft.c:390 ../pidgin/gtkft.c:985
+#: ../finch/gntft.c:392
+#: ../pidgin/gtkft.c:1019
 msgid "Failed"
 msgstr "Mislukt"
 
-#: ../finch/gntft.c:436 ../pidgin/gtkft.c:132
+#: ../finch/gntft.c:438
+#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:447
+#: ../finch/gntft.c:449
 msgid "Sent"
 msgstr "Verzonden"
 
-#: ../finch/gntft.c:447
+#: ../finch/gntft.c:449
 msgid "Received"
 msgstr "Ontvangen"
 
-#: ../finch/gntft.c:448 ../pidgin/gtkft.c:158 ../pidgin/gtkft.c:1048
+#: ../finch/gntft.c:450
+#: ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1082
 msgid "Finished"
 msgstr "Klaar"
 
-#: ../finch/gntft.c:450
+#: ../finch/gntft.c:452
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Het bestand werd opgeslagen als %s."
 
-#: ../finch/gntft.c:457
+#: ../finch/gntft.c:459
 msgid "Sending"
 msgstr "Verzenden"
 
-#: ../finch/gntft.c:457
+#: ../finch/gntft.c:459
 msgid "Receiving"
 msgstr "Ontvangen"
 
-#: ../finch/gntlog.c:184
+#: ../finch/gntlog.c:192
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Gesprekken in %s op %s"
 
-#: ../finch/gntlog.c:187
+#: ../finch/gntlog.c:195
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Gesprekken met %s op %s"
 
-#: ../finch/gntlog.c:230 ../pidgin/gtklog.c:516
+#: ../finch/gntlog.c:238
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:270 ../pidgin/gtklog.c:563
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Systeemgebeurtenissen worden alleen bijgehouden als \"Statusveranderingen "
-"opslaan in systeemlogboek\" is aangevinkt."
+#: ../finch/gntlog.c:278
+#: ../pidgin/gtklog.c:550
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "Systeemgebeurtenissen worden alleen bijgehouden als \"Statusveranderingen opslaan in systeemlogboek\" is aangevinkt."
 
-#: ../finch/gntlog.c:274 ../pidgin/gtklog.c:567
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Berichten worden alleen bijgehouden als \"Alle gesprekken opslaan\" is "
-"aangevinkt."
+#: ../finch/gntlog.c:282
+#: ../pidgin/gtklog.c:554
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "Berichten worden alleen bijgehouden als \"Alle gesprekken opslaan\" is aangevinkt."
 
-#: ../finch/gntlog.c:277 ../pidgin/gtklog.c:570
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Chats worden alleen bijgehoudenn als \"Alle chats opslaan\" is aangevinkt."
+#: ../finch/gntlog.c:285
+#: ../pidgin/gtklog.c:557
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "Chats worden alleen bijgehoudenn als \"Alle chats opslaan\" is aangevinkt."
 
-#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:579
+#: ../finch/gntlog.c:291
+#: ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "Geen logboek gevonden"
 
-#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:659
+#: ../finch/gntlog.c:338
+#: ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Totale logboekgrootte:"
 
 #. Search box *********
-#: ../finch/gntlog.c:338
+#: ../finch/gntlog.c:346
 msgid "Scroll/Search: "
-msgstr "Scrollen/Zoeken: "
+msgstr "Scrollen/zoeken: "
 
-#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:729
+#: ../finch/gntlog.c:404
+#: ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Gesprekken in %s"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:737
-#: ../pidgin/gtklog.c:812
+#: ../finch/gntlog.c:412
+#: ../finch/gntlog.c:485
+#: ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Gesprekken met %s"
 
-#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:837
+#: ../finch/gntlog.c:414
+msgid "All Conversations"
+msgstr "Alle gesprekken"
+
+#: ../finch/gntlog.c:510
+#: ../pidgin/gtklog.c:824
 msgid "System Log"
 msgstr "Systeemlogboek"
 
 #: ../finch/gntnotify.c:165
 msgid "Emails"
-msgstr "Emails"
+msgstr "E-mails"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
+#: ../finch/gntnotify.c:171
+#: ../finch/gntnotify.c:231
 msgid "You have mail!"
-msgstr "Er is email!"
+msgstr "Je hebt post!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:537
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:537
 msgid "Sender"
 msgstr "Verzender"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:544
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:544
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -1366,41 +1638,43 @@ msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) heeft %d nieuw bericht."
 msgstr[1] "%s (%s) heeft %d nieuwe berichten."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
+#: ../finch/gntnotify.c:231
+#: ../pidgin/gtknotify.c:352
 msgid "New Mail"
-msgstr "Nieuwe email"
+msgstr "Nieuwe e-mail"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:984
+#: ../finch/gntnotify.c:296
+#: ../pidgin/gtknotify.c:984
 #, c-format
 msgid "Info for %s"
 msgstr "Info voor %s"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:297
+#: ../libpurple/protocols/toc/toc.c:476
 #: ../pidgin/gtknotify.c:985
 msgid "Buddy Information"
 msgstr "Contactinformatie"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:387
+#: ../libpurple/protocols/qq/group_join.c:349
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1658
+#: ../finch/gntnotify.c:396
+#: ../pidgin/gtkconv.c:1666
 msgid "IM"
 msgstr "Bericht"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3525
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#: ../finch/gntnotify.c:400
+#: ../finch/gntnotify.c:405
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../finch/gntnotify.c:426
+#: ../finch/gntnotify.c:431
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
+#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "FOUT"
 
@@ -1446,11 +1720,8 @@ msgid "The selected file is not a valid plugin."
 msgstr "Het geselecteerde bestand is geen geldige plugin."
 
 #: ../finch/gntplugin.c:268
-msgid ""
-"Please open the debug window and try again to see the exact error message."
-msgstr ""
-"Open het debug-venster en probeer opnieuw om de exacte fout-melding te "
-"bekijken."
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr "Open het debug-venster en probeer opnieuw om de exacte fout-melding te bekijken."
 
 #: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
@@ -1462,7 +1733,7 @@ msgstr "U kunt plugins aan-/uitzetten in de volgende lijst."
 
 #: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
-msgstr "Installeer Plugin..."
+msgstr "Plugin installeren..."
 
 #: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
@@ -1473,29 +1744,36 @@ msgstr "Plugin instellen"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2180
+#: ../finch/gntplugin.c:524
+#: ../finch/gntplugin.c:531
+#: ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103
+#: ../pidgin/gtkprefs.c:2177
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193
+#: ../pidgin/gtkpounce.c:270
 msgid "Please enter a buddy to pounce."
 msgstr "Vul een vriend in om een alarm voor in te stellen."
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338
+#: ../pidgin/gtkpounce.c:538
 msgid "New Buddy Pounce"
-msgstr "Nieuw Contact-alarm"
+msgstr "Nieuw contactalarm"
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338
+#: ../pidgin/gtkpounce.c:538
 msgid "Edit Buddy Pounce"
-msgstr "Contact-alarm bewerken"
+msgstr "Contactalarm bewerken"
 
 #: ../finch/gntpounce.c:343
 msgid "Pounce Who"
-msgstr "Wie Alarmeren"
+msgstr "Wie alarmeren"
 
 #. Account:
-#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346
+#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Account:"
 
@@ -1504,52 +1782,54 @@ msgid "Buddy name:"
 msgstr "Contactnaam:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
+#: ../finch/gntpounce.c:386
+#: ../pidgin/gtkpounce.c:606
 msgid "Pounce When Buddy..."
-msgstr "Wanneer alarmeren..."
+msgstr "Alarmeren als contactpersoon..."
 
 #: ../finch/gntpounce.c:388
 msgid "Signs on"
-msgstr "Meld aan"
+msgstr "...zich aanmeldt"
 
 #: ../finch/gntpounce.c:389
 msgid "Signs off"
-msgstr "Meld af"
+msgstr "...zich afmeldt"
 
 #: ../finch/gntpounce.c:390
 msgid "Goes away"
-msgstr "Gaat weg"
+msgstr "...weggaat"
 
 #: ../finch/gntpounce.c:391
 msgid "Returns from away"
-msgstr "Terugkeren van afwezigheid"
+msgstr "...van afwezigheid terugkeert "
 
 #: ../finch/gntpounce.c:392
 msgid "Becomes idle"
-msgstr "Wordt Inactief"
+msgstr "...inactief wordt"
 
 #: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
-msgstr "Is weer actief"
+msgstr "...weer actief wordt"
 
 #: ../finch/gntpounce.c:394
 msgid "Starts typing"
-msgstr "Start met typen"
+msgstr "...start met typen"
 
 #: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
-msgstr "Pauzeert tijdens het typen"
+msgstr "...pauzeert tijdens het typen"
 
 #: ../finch/gntpounce.c:396
 msgid "Stops typing"
-msgstr "Stopt met typen"
+msgstr "...stopt met typen"
 
 #: ../finch/gntpounce.c:397
 msgid "Sends a message"
-msgstr "Verstuurt een bericht"
+msgstr "...een bericht verstuurt"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
+#: ../finch/gntpounce.c:426
+#: ../pidgin/gtkpounce.c:667
 msgid "Action"
 msgstr "Actie"
 
@@ -1571,21 +1851,20 @@ msgstr "Opdracht uitvoeren"
 
 #: ../finch/gntpounce.c:432
 msgid "Play a sound"
-msgstr "Geluid afspelen"
+msgstr "Een geluidje afspelen"
 
 #: ../finch/gntpounce.c:460
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "Contactalarm alleen wanneer mijn status niet beschikbaar is"
+msgstr "Contactalarm alleen actief wanneer mijn status niet beschikbaar is"
 
-#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
+#: ../finch/gntpounce.c:462
+#: ../pidgin/gtkpounce.c:1318
 msgid "Recurring"
 msgstr "Herhalend"
 
 #: ../finch/gntpounce.c:630
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "Kan bijnaam niet veranderen"
+msgstr "Kan contactalarm niet aanmaken"
 
 #: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
@@ -1595,106 +1874,127 @@ msgstr "Je hebt geen accounts."
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
+#: ../finch/gntpounce.c:674
+#: ../pidgin/gtkpounce.c:1132
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Wilt u het contact-alarm van %s op %s echt verwijderen?"
+msgstr "Wilt u het contactalarm van %s op %s echt verwijderen?"
 
-#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
+#: ../finch/gntpounce.c:708
+#: ../finch/gntui.c:96
+#: ../pidgin/gtkpounce.c:1361
 msgid "Buddy Pounces"
-msgstr "Contact-alarmen"
+msgstr "Contactalarmen"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s tikt een bericht aan u (%s)"
+msgstr "%s is een bericht voor je aan het typen (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
+#: ../finch/gntpounce.c:818
+#: ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s pauzeert tijdens tikken van een bericht aan u (%s)"
+msgstr "%s pauzeert tijdens typen van het bericht (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s heeft zich aangemeld (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
+#: ../finch/gntpounce.c:820
+#: ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s is weer actief (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s is weer actief (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
+#: ../finch/gntpounce.c:822
+#: ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s is gestopt met tikken (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s heeft zich afgemeld (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
+#: ../finch/gntpounce.c:824
+#: ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s is inactief (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s is afwezig. (%s)"
+msgstr "%s is weggegaan. (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:826
+#: ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s heeft u een bericht toegestuurd. (%s)"
 
-#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#: ../finch/gntpounce.c:845
+#: ../pidgin/gtkpounce.c:1479
 msgid "Unknown pounce event. Please report this!"
-msgstr "Onbekend contact-alarm. Rapporteer dit alstublieft!"
+msgstr "Onbekend contactalarm. Rapporteer dit alstublieft!"
 
 #: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Afhankelijk van gebruik van toetsenbord en muis"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2061
+#: ../finch/gntprefs.c:94
+#: ../pidgin/gtkprefs.c:2058
 msgid "From last sent message"
 msgstr "Laatst verstuurde bericht"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:948 ../pidgin/gtkprefs.c:956
-#: ../pidgin/gtkprefs.c:2060 ../pidgin/gtkprefs.c:2074
+#: ../finch/gntprefs.c:96
+#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:953
+#: ../pidgin/gtkprefs.c:2057
+#: ../pidgin/gtkprefs.c:2071
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nooit"
 
 #: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
-msgstr "Tijd Van Inactiviteit Weergeven"
+msgstr "Tijd van inactiviteit weergeven"
 
 #: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
-msgstr "Off-line Contacten Weergeven"
+msgstr "Off-line contacten weergeven"
 
 #: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Laat anderen weten dat je aan het typen bent"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
+#: ../finch/gntprefs.c:198
+#: ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Logboekopmaak"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
+#: ../finch/gntprefs.c:199
+#: ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
-msgstr "IM's bijhouden"
+msgstr "Gesprekken bijhouden"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
+#: ../finch/gntprefs.c:200
+#: ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
-msgstr "Chats opslaan"
+msgstr "Chats bijhouden"
 
 #: ../finch/gntprefs.c:201
 msgid "Log status change events"
@@ -1717,15 +2017,19 @@ msgid "Change status to"
 msgstr "Status veranderen in "
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1046 ../pidgin/gtkprefs.c:2147
+#: ../finch/gntprefs.c:259
+#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:2144
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Gesprekken"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1617 ../pidgin/gtkprefs.c:2158
+#: ../finch/gntprefs.c:260
+#: ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1614
+#: ../pidgin/gtkprefs.c:2155
 msgid "Logging"
-msgstr "Logboek"
+msgstr "Logboek bijhouden"
 
 #: ../finch/gntrequest.c:381
 msgid "You must fill all the required fields."
@@ -1739,19 +2043,21 @@ msgstr "De benodigde velden zijn onderstreept."
 msgid "Not implemented yet."
 msgstr "Nog niet geïmplementeerd."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1553
+#: ../finch/gntrequest.c:745
+#: ../pidgin/gtkrequest.c:1553
 #: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "Bestand opslaan..."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1554
+#: ../finch/gntrequest.c:745
+#: ../pidgin/gtkrequest.c:1554
 #: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "Bestand openen..."
 
 #: ../finch/gntrequest.c:762
 msgid "Choose Location..."
-msgstr "Kies Lokatie..."
+msgstr "Kies locatie..."
 
 #: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
@@ -1762,60 +2068,82 @@ msgid "Get"
 msgstr "Verkrijg"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
+#: ../finch/gntroomlist.c:285
+#: ../finch/gntui.c:101
+#: ../pidgin/gtkroomlist.c:523
 msgid "Room List"
 msgstr "Lijst van ruimtes"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
+#: ../finch/gntsound.c:96
+#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Contact meldt zich aan"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Contact meldt zich af"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Bericht ontvangen"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Ontvangen bericht begint een gesprek"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Bericht verzonden"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Persoon komt chatruimte binnen"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Persoon verlaat chatruimte"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103
+#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "U praat in de chatruimte"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Anderen praten in de chatruimte"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
+#: ../finch/gntsound.c:106
+#: ../pidgin/gtksound.c:73
 msgid "Someone says your username in chat"
 msgstr "Iemand zegt uw gebruikersnaam in de chatruimte"
 
-#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:367
+#: ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "GStreamer-probleem"
 
-#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:368
+#: ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer kan niet starten."
 
-#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1741
-#: ../pidgin/gtkprefs.c:1830 ../pidgin/gtkprefs.c:2003
+#: ../finch/gntsound.c:722
+#: ../finch/gntsound.c:808
+#: ../pidgin/gtkpounce.c:178
+#: ../pidgin/gtkpounce.c:189
+#: ../pidgin/gtkpounce.c:321
+#: ../pidgin/gtkpounce.c:691
+#: ../pidgin/gtkpounce.c:951
+#: ../pidgin/gtkprefs.c:1738
+#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:2000
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1831,7 +2159,8 @@ msgstr "Geluidsvoorkeuren"
 msgid "Profiles"
 msgstr "Profielen"
 
-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1868
+#: ../finch/gntsound.c:960
+#: ../pidgin/gtkprefs.c:1865
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -1839,15 +2168,17 @@ msgstr "Automatisch"
 msgid "Console Beep"
 msgstr "Terminal-pieptoon"
 
-#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:964
+#: ../pidgin/gtkprefs.c:1869
 msgid "Command"
 msgstr "Opdracht"
 
 #: ../finch/gntsound.c:965
 msgid "No Sound"
-msgstr "Geen Geluid"
+msgstr "Geen geluid"
 
-#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1863
+#: ../finch/gntsound.c:967
+#: ../pidgin/gtkprefs.c:1860
 msgid "Sound Method"
 msgstr "Methode"
 
@@ -1861,11 +2192,12 @@ msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Geluids Odracht:\n"
+"Geluids opdracht:\n"
 "(%s voor bestandsnaam)"
 
 #. Sound options
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1894
+#: ../finch/gntsound.c:987
+#: ../pidgin/gtkprefs.c:1891
 msgid "Sound Options"
 msgstr "Geluidsinstellingen"
 
@@ -1873,18 +2205,23 @@ msgstr "Geluidsinstellingen"
 msgid "Sounds when conversation has focus"
 msgstr "Geluiden wanneer gesprek de aandacht heeft"
 
-#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:946 ../pidgin/gtkprefs.c:958
-#: ../pidgin/gtkprefs.c:1901 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:996
+#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:955
+#: ../pidgin/gtkprefs.c:1898
+#: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Altijd"
 
-#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1899
+#: ../finch/gntsound.c:997
+#: ../pidgin/gtkprefs.c:1896
 msgid "Only when available"
 msgstr "Alleen wanneer beschikbaar"
 
-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1900
+#: ../finch/gntsound.c:998
+#: ../pidgin/gtkprefs.c:1897
 msgid "Only when not available"
 msgstr "Alleen wanneer onbeschikbaar"
 
@@ -1893,11 +2230,13 @@ msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1929
+#: ../finch/gntsound.c:1024
+#: ../pidgin/gtkprefs.c:1926
 msgid "Sound Events"
 msgstr "Geluidsgebeurtenissen"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1988
+#: ../finch/gntsound.c:1026
+#: ../pidgin/gtkprefs.c:1985
 msgid "Event"
 msgstr "Gebeurtenis"
 
@@ -1905,42 +2244,46 @@ msgstr "Gebeurtenis"
 msgid "File"
 msgstr "Bestand"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:2007
+#: ../finch/gntsound.c:1045
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:2011
+#: ../finch/gntsound.c:1048
+#: ../pidgin/gtkpounce.c:695
 msgid "Reset"
 msgstr "Wissen"
 
-#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:2015
+#: ../finch/gntsound.c:1051
 msgid "Choose..."
 msgstr "Bladeren..."
 
 #: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Wilt u \"%s\" echt verwijderen?"
+msgstr "Wil je \"%s\" echt verwijderen?"
 
 #: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Status verwijderen"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:176
+#: ../pidgin/gtksavedstatuses.c:629
 msgid "Saved Statuses"
 msgstr "Opgeslagen statussen"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1397
-#: ../libpurple/protocols/msn/msn.c:747
+#: ../libpurple/protocols/jabber/buddy.c:1387
+#: ../libpurple/protocols/msn/msn.c:839
 #: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
+#: ../pidgin/gtksavedstatuses.c:528
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:183
+#: ../pidgin/gtksavedstatuses.c:543
 msgid "Type"
 msgstr "Type"
 
@@ -1952,50 +2295,60 @@ msgstr "Type"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:293
-#: ../libpurple/protocols/bonjour/bonjour.c:300
-#: ../libpurple/protocols/bonjour/bonjour.c:383
-#: ../libpurple/protocols/gg/gg.c:1088 ../libpurple/protocols/gg/gg.c:1818
-#: ../libpurple/protocols/gg/gg.c:1836 ../libpurple/protocols/gg/gg.c:1846
-#: ../libpurple/protocols/gg/gg.c:1852 ../libpurple/protocols/gg/gg.c:1861
-#: ../libpurple/protocols/gg/gg.c:1866 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
-#: ../libpurple/protocols/jabber/jabber.c:1654
-#: ../libpurple/protocols/jabber/jabber.c:1668
-#: ../libpurple/protocols/jabber/jabber.c:1684
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
-#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:564
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:281
+#: ../libpurple/protocols/bonjour/bonjour.c:288
+#: ../libpurple/protocols/bonjour/bonjour.c:371
+#: ../libpurple/protocols/gg/gg.c:1086
+#: ../libpurple/protocols/gg/gg.c:1583
+#: ../libpurple/protocols/gg/gg.c:1601
+#: ../libpurple/protocols/gg/gg.c:1611
+#: ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1626
+#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/irc/irc.c:245
+#: ../libpurple/protocols/jabber/jabber.c:1644
+#: ../libpurple/protocols/jabber/jabber.c:1658
+#: ../libpurple/protocols/jabber/jabber.c:1672
+#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1700
+#: ../libpurple/protocols/jabber/jabber.c:1716
+#: ../libpurple/protocols/msn/msn.c:791
+#: ../libpurple/protocols/msn/msn.c:797
+#: ../libpurple/protocols/msn/msn.c:803
+#: ../libpurple/protocols/msn/msn.c:809
+#: ../libpurple/protocols/msn/msn.c:814
+#: ../libpurple/protocols/msn/msn.c:819
 #: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2856
 #: ../libpurple/protocols/novell/novell.c:2959
 #: ../libpurple/protocols/novell/novell.c:2965
 #: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5669
-#: ../libpurple/protocols/oscar/oscar.c:5887
-#: ../libpurple/protocols/oscar/oscar.c:5901
-#: ../libpurple/protocols/oscar/oscar.c:5917
-#: ../libpurple/protocols/oscar/oscar.c:5924
-#: ../libpurple/protocols/oscar/oscar.c:5931
+#: ../libpurple/protocols/oscar/oscar.c:5977
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6007
+#: ../libpurple/protocols/oscar/oscar.c:6014
+#: ../libpurple/protocols/oscar/oscar.c:6021
 #: ../libpurple/protocols/sametime/sametime.c:3338
 #: ../libpurple/protocols/sametime/sametime.c:3344
 #: ../libpurple/protocols/sametime/sametime.c:3350
 #: ../libpurple/protocols/sametime/sametime.c:3429
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/silc/buddy.c:1566
+#: ../libpurple/protocols/silc10/buddy.c:1566
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3817
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
-#: ../libpurple/protocols/zephyr/zephyr.c:2352
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
+#: ../libpurple/protocols/yahoo/yahoo.c:3824
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/zephyr/zephyr.c:2356
+#: ../pidgin/gtksavedstatuses.c:558
+#: ../pidgin/gtksavedstatuses.c:1045
 msgid "Message"
 msgstr "Bericht"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:194
+#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -2014,13 +2367,14 @@ msgstr "Dubbele titel"
 #  Different status message expander
 #: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
-msgstr "Geef alstublieft een andere titel aan de status."
+msgstr "Geef een andere titel aan de status."
 
 #: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:677
+#: ../finch/gntstatus.c:464
+#: ../pidgin/gtkft.c:701
 msgid "Status:"
 msgstr "Status:"
 
@@ -2046,7 +2400,8 @@ msgstr "Opslaan & gebruiken"
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2149
+#: ../finch/gntui.c:102
+#: ../pidgin/gtkprefs.c:2146
 msgid "Sounds"
 msgstr "Geluiden"
 
@@ -2054,7 +2409,8 @@ msgstr "Geluiden"
 msgid "Statuses"
 msgstr "Statussen"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Fout opgetreden bij het laden van de plugin."
@@ -2069,9 +2425,7 @@ msgstr "Kan venster niet vinden"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
-"De plugin kon niet worden geladen omdat het niet gemaakt is met X11 "
-"ondersteuning."
+msgstr "De plugin kon niet worden geladen omdat het niet gemaakt is met X11 ondersteuning."
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -2079,15 +2433,11 @@ msgstr "GntClipboard"
 
 #: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
-msgstr "Clipboard plugin"
+msgstr "Klembord-plugin"
 
 #: ../finch/plugins/gntclipboard.c:161
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
-msgstr ""
-"Wanneer het gnt klembord van inhoud verandert, wordt de inhoud beschikbaar "
-"gesteld aan X, indien mogelijk."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+msgstr "Wanneer het gnt-klembord van inhoud verandert, wordt de inhoud beschikbaar gesteld aan X, indien mogelijk."
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -2102,12 +2452,12 @@ msgstr "%s heeft zich afgemeld"
 #: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
-msgstr "%s heeft u een bericht gestuurd"
+msgstr "%s heeft je een bericht gestuurd"
 
 #: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%s heeft uw naam gezegd in %s"
+msgstr "%s heeft jouw naam gezegd in %s"
 
 #: ../finch/plugins/gntgf.c:267
 #, c-format
@@ -2120,7 +2470,7 @@ msgstr "Contact meldt zich aan/af"
 
 #: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
-msgstr "U ontvangt een IM"
+msgstr "Je ontvangt een bericht"
 
 #: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
@@ -2128,7 +2478,7 @@ msgstr "Iemand spreekt in een chatgesprek"
 
 #: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
-msgstr "Iemand zegt uw naam in de chatgesprek"
+msgstr "Iemand zegt je in de chatgesprek"
 
 #: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
@@ -2146,67 +2496,73 @@ msgstr "Stel URGENT in in het terminal-venster"
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
-msgstr "Toaster plugin"
+msgstr "Toaster-plugin"
 
-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:132
+#: ../finch/plugins/gnthistory.c:114
+#: ../pidgin/plugins/history.c:132
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Gesprek met %s op %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:159
+#: ../finch/plugins/gnthistory.c:172
+#: ../pidgin/plugins/history.c:159
 msgid "History Plugin Requires Logging"
 msgstr "De geschiedenisplugin vereist bijhouden van logboek"
 
-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:160
+#: ../finch/plugins/gnthistory.c:173
+#: ../pidgin/plugins/history.c:160
 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 ""
-"Logboek bijhouden kan worden ingeschakeld via Extra -> Voorkeuren -> "
-"Logboek.\n"
+"Logboek bijhouden kan worden ingeschakeld via Extra -> Voorkeuren -> Logboek.\n"
 "\n"
-"Het inschakelen hiervan zal u de mogelijkheid geven om geschiedenis op te "
-"vragen."
+"Het inschakelen hiervan zal u de mogelijkheid geven om geschiedenis op te vragen."
 
 #: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntGeschiedenis"
 
-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:203
+#: ../finch/plugins/gnthistory.c:219
+#: ../pidgin/plugins/history.c:203
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Geeft recente gesprekken weer in een nieuw gesprek"
 
-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:204
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"Wanneer een nieuw gesprek wordt gestart, voegt deze plugin het vorige "
-"gesprek in."
+#: ../finch/plugins/gnthistory.c:220
+#: ../pidgin/plugins/history.c:204
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "Wanneer een nieuw gesprek wordt gestart, voegt deze plugin het vorige gesprek in."
 
-#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+#: ../finch/plugins/grouping.c:42
+#: ../libpurple/protocols/oscar/oscar.c:745
 msgid "Online"
-msgstr "On-line"
+msgstr "Online"
 
-#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:2082
+#: ../finch/plugins/grouping.c:44
+#: ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:2055
 #: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:155
-#: ../pidgin/gtkblist.c:3416 ../pidgin/gtkblist.c:3808
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/oscar/oscar.c:904
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:220
+#: ../libpurple/protocols/qq/qq.c:367
+#: ../libpurple/protocols/yahoo/yahoo.c:3163
+#: ../libpurple/status.c:159
+#: ../pidgin/gtkblist.c:3505
+#: ../pidgin/gtkblist.c:3897
+#: ../pidgin/gtkdocklet.c:561
+#: ../pidgin/gtkstatusbox.c:1093
 msgid "Offline"
-msgstr "Off-line "
+msgstr "Offline "
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3452
+#: ../finch/plugins/grouping.c:117
+#: ../pidgin/gtkblist.c:3541
 msgid "Online Buddies"
 msgstr "Online contacten"
 
@@ -2216,20 +2572,20 @@ msgstr "Offline contacten"
 
 #: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
-msgstr "Online/Offline"
+msgstr "Online/offline"
 
 #: ../finch/plugins/grouping.c:168
 msgid "Meebo"
-msgstr ""
+msgstr "Meebo"
 
 #: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr "Geen groepering"
 
-#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
-#, fuzzy
+#: ../finch/plugins/grouping.c:257
+#: ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
-msgstr "Verzorgt de integratie met Evolution."
+msgstr "Levert alternatieve groepeer-opties voor contactenlijst."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -2238,14 +2594,14 @@ msgstr "Geschiedenis"
 #. Translator Note: The "backlog" is the conversation buffer/history.
 #: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
-"geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenis-logboek."
+msgstr "geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenis-logboek."
 
 #: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntGeschiedenis"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Geschiedenis plugin."
 
@@ -2253,8 +2609,9 @@ msgstr "Geschiedenis plugin."
 msgid "accounts"
 msgstr "accounts"
 
-#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:204
-#: ../libpurple/protocols/silc/silc.c:473
+#: ../libpurple/account.c:1063
+#: ../libpurple/protocols/jabber/auth.c:204
+#: ../libpurple/protocols/silc/silc.c:474
 msgid "Password is required to sign on."
 msgstr "Wachtwoord nodig voor aanmelden."
 
@@ -2272,18 +2629,21 @@ msgstr "Voer wachtwoord in"
 msgid "Save password"
 msgstr "Wachtwoord opslaan"
 
-#: ../libpurple/account.c:1144 ../libpurple/connection.c:118
+#: ../libpurple/account.c:1144
+#: ../libpurple/connection.c:118
 #: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Protocolplugin voor %s niet gevonden"
 
-#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
+#: ../libpurple/account.c:1146
+#: ../libpurple/connection.c:121
 msgid "Connection Error"
-msgstr "Verbindingfout"
+msgstr "Verbindingsfout"
 
-#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:717
-#: ../libpurple/protocols/jabber/jabber.c:1740
+#: ../libpurple/account.c:1357
+#: ../libpurple/protocols/gg/gg.c:712
+#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "New passwords do not match."
 msgstr "Nieuwe wachtwoorden zijn niet gelijk."
 
@@ -2293,15 +2653,15 @@ msgstr "Vul alle velden volledig in."
 
 #: ../libpurple/account.c:1402
 msgid "Original password"
-msgstr "Oude wachtwoord"
+msgstr "Oud wachtwoord"
 
 #: ../libpurple/account.c:1410
 msgid "New password"
-msgstr "Nieuwe wachtwoord"
+msgstr "Nieuw wachtwoord"
 
 #: ../libpurple/account.c:1418
 msgid "New password (again)"
-msgstr "Nieuwe wachtwoord (herhalen)"
+msgstr "Nieuw wachtwoord (herhalen)"
 
 #: ../libpurple/account.c:1425
 #, c-format
@@ -2317,22 +2677,29 @@ msgstr "Geef uw oude wachtwoord en nieuwe wachtwoord."
 msgid "Change user information for %s"
 msgstr "Gebruikersinformatie aanpassen voor %s"
 
-#: ../libpurple/account.c:1467 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1467
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Gebruikersinfo instellen"
 
-#: ../libpurple/account.c:1938 ../libpurple/protocols/gg/gg.c:1028
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:2078
-#: ../libpurple/protocols/jabber/buddy.c:2095
+#: ../libpurple/account.c:1938
+#: ../libpurple/protocols/gg/gg.c:1026
+#: ../libpurple/protocols/jabber/buddy.c:840
+#: ../libpurple/protocols/jabber/buddy.c:2051
+#: ../libpurple/protocols/jabber/buddy.c:2068
 #: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:164
+#: ../libpurple/protocols/qq/qq.c:273
+#: ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3442 ../pidgin/gtkblist.c:6318
+#: ../libpurple/blist.c:521
+#: ../libpurple/blist.c:1347
+#: ../libpurple/blist.c:1559
+#: ../libpurple/blist.c:1561
+#: ../libpurple/protocols/jabber/roster.c:99
+#: ../libpurple/protocols/myspace/myspace.c:3459
+#: ../pidgin/gtkblist.c:6423
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2350,9 +2717,7 @@ msgstr "(KOMEN NIET OVEREEN)"
 #: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-"% s heeft het volgende certificaat voor alleen-deze-keer gebruik "
-"gepresenteerd:"
+msgstr "% s heeft het volgende certificaat voor alleen-deze-keer gebruik gepresenteerd:"
 
 #: ../libpurple/certificate.c:563
 #, c-format
@@ -2366,60 +2731,57 @@ msgstr ""
 #. TODO: Find what the handle ought to be
 #: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr "Eenmalig Certificaat Controle"
+msgstr "Eenmalig certificaat controle"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:894
+#: ../libpurple/certificate.c:897
 msgid "Certificate Authorities"
 msgstr "Certificaat Identiteit"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1062
+#: ../libpurple/certificate.c:1065
 msgid "SSL Peers Cache"
-msgstr "SSL Peer Cache"
+msgstr "SSL peer cache"
 
 #. Make messages
-#: ../libpurple/certificate.c:1193
+#: ../libpurple/certificate.c:1196
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Certificaat voor %s accepteren?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
+#: ../libpurple/certificate.c:1202
 msgid "SSL Certificate Verification"
 msgstr "SSL certificaat controle"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1208
+#: ../libpurple/certificate.c:1211
 msgid "Accept"
 msgstr "Accepteren"
 
-#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
+#: ../libpurple/certificate.c:1212
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:105
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:252
 msgid "Reject"
 msgstr "Weigeren"
 
-#: ../libpurple/certificate.c:1210
+#: ../libpurple/certificate.c:1213
 msgid "_View Certificate..."
 msgstr "_Bekijk certificaat..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1311
+#: ../libpurple/certificate.c:1314
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch "
-"gecontroleerd worden."
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr "Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch gecontroleerd worden."
 
-#: ../libpurple/certificate.c:1329
+#: ../libpurple/certificate.c:1332
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "De certificaat-keten van %s is niet geldig."
@@ -2429,38 +2791,31 @@ msgstr "De certificaat-keten van %s is niet geldig."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
+#: ../libpurple/certificate.c:1340
+#: ../libpurple/certificate.c:1410
 msgid "SSL Certificate Error"
 msgstr "SSL Certificaat Fout"
 
-#: ../libpurple/certificate.c:1338
+#: ../libpurple/certificate.c:1341
 msgid "Invalid certificate chain"
 msgstr "Dit is een ongeldige certificaat-keten"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1359
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Je hebt geen databank van belangrijke certificaten, dus deze kan niet worden "
-"gecontroleerd."
+#: ../libpurple/certificate.c:1362
+msgid "You have no database of root certificates, so this certificate cannot be validated."
+msgstr "Je hebt geen databank van belangrijke certificaten, dus deze kan niet worden gecontroleerd."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
+#: ../libpurple/certificate.c:1385
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1399
+#: ../libpurple/certificate.c:1402
 #, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1411
 msgid "Invalid certificate authority signature"
 msgstr "Ongeldige certificaat identiteit handtekening"
 
@@ -2468,18 +2823,13 @@ msgstr "Ongeldige certificaat identiteit handtekening"
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1434
+#: ../libpurple/certificate.c:1437
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Het certificaat dat komt van \"%s\" zegt in plaats van dat  van \"%s\" te "
-"zijn.  Dit kan betekenen dat je niet verbonden bent met de dienst welke je "
-"zou denken."
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgstr "Het certificaat dat komt van \"%s\" zegt in plaats van dat  van \"%s\" te zijn.  Dit kan betekenen dat je niet verbonden bent met de dienst welke je zou denken."
 
 #. Make messages
-#: ../libpurple/certificate.c:1896
+#: ../libpurple/certificate.c:1899
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2489,14 +2839,14 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
-#msgstr ""
-#"Gemeenschappelijke naam: %s\n"
-#"\n"
-#"Vingerafdruk (SHA1): %s\n"
-#"\n"
 
+# msgstr ""
+# "Gemeenschappelijke naam: %s\n"
+# "\n"
+# "Vingerafdruk (SHA1): %s\n"
+# "\n"
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1905
+#: ../libpurple/certificate.c:1908
 msgid "Certificate Information"
 msgstr "Certificaat informatie"
 
@@ -2518,10 +2868,11 @@ msgstr "+++ %s heeft zich aangemeld"
 msgid "+++ %s signed off"
 msgstr "+++ %s heeft zich afgemeld"
 
-#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2398
+#: ../libpurple/connection.c:530
+#: ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2371
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:384
 #: ../libpurple/protocols/msnp9/servconn.c:139
 #: ../libpurple/protocols/msnp9/session.c:343
 #: ../libpurple/protocols/oscar/family_chatnav.c:63
@@ -2532,7 +2883,8 @@ msgstr "Onbekende fout"
 msgid "Unable to send message: The message is too large."
 msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan het bericht niet verzenden aan %s."
@@ -2541,7 +2893,8 @@ msgstr "Kan het bericht niet verzenden aan %s."
 msgid "The message is too large."
 msgstr "Afwezigheidsbericht te groot."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:296
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:296
 #: ../libpurple/protocols/bonjour/jabber.c:339
 msgid "Unable to send message."
 msgstr "Kan het bericht niet verzenden."
@@ -2567,7 +2920,7 @@ msgstr "%s [<I>%s</I>] is de ruimte binnengekomen."
 #: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
-msgstr "U heet nu %s"
+msgstr "Je heet nu %s"
 
 #: ../libpurple/conversation.c:1773
 #, c-format
@@ -2584,17 +2937,17 @@ msgstr "%s is weggegaan."
 msgid "%s left the room (%s)."
 msgstr "%s is weggegaan (%s)."
 
-#: ../libpurple/dbus-server.c:586
+#: ../libpurple/dbus-server.c:587
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kan geen nieuwe verbinding maken: %s"
 
-#: ../libpurple/dbus-server.c:598
+#: ../libpurple/dbus-server.c:599
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kan naam niet ophalen: %s"
 
-#: ../libpurple/dbus-server.c:612
+#: ../libpurple/dbus-server.c:613
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kan servernaam niet ophalen: %s"
@@ -2604,21 +2957,23 @@ msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-BUS server is niet acitef vanwege de volgende reden"
 
 # was eerst: geen
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:287
+#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Geen naam"
 
-#: ../libpurple/dnsquery.c:532
+#: ../libpurple/dnsquery.c:535
 #, fuzzy
 msgid "Unable to create new resolver process\n"
 msgstr "Kan geen socket aanmaken"
 
-#: ../libpurple/dnsquery.c:537
+#: ../libpurple/dnsquery.c:540
 #, fuzzy
 msgid "Unable to send request to resolver process\n"
 msgstr "Kan het bericht niet verzenden (%s)."
 
-#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
+#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:722
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2627,30 +2982,31 @@ msgstr ""
 "Fout bij opzoeken van %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
-#: ../libpurple/dnsquery.c:851
+#: ../libpurple/dnsquery.c:576
+#: ../libpurple/dnsquery.c:736
+#: ../libpurple/dnsquery.c:854
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Fout bij opzoeken van %s: %d"
 
-#: ../libpurple/dnsquery.c:595
+#: ../libpurple/dnsquery.c:598
 #, fuzzy, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
 
-#: ../libpurple/dnsquery.c:599
+#: ../libpurple/dnsquery.c:602
 #, fuzzy
 msgid "EOF while reading from resolver process"
 msgstr "Fout opgetreden bij lezen van socket."
 
-#: ../libpurple/dnsquery.c:783
+#: ../libpurple/dnsquery.c:786
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Aanmaken thread mislukt: %s"
 
-#: ../libpurple/dnsquery.c:784
+#: ../libpurple/dnsquery.c:787
 msgid "Unknown reason"
 msgstr "Reden onbekend"
 
@@ -2756,7 +3112,7 @@ msgstr "Bestandsoverdracht voltooid"
 #: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
-msgstr "U heeft de overdracht van %s afgebroken"
+msgstr "Je de overdracht van %s afgebroken"
 
 #: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
@@ -2788,51 +3144,35 @@ msgstr "Voer het commando uit in een terminal"
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"aim\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"aim\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"gg\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"gg\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"icq\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"icq\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"irc\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"irc\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"msnim\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"msnim\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"sip\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"sip\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"xmpp\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"xmpp\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
-"De opdracht die gebruikt wordt om \"ymsgr\" URLs af te handelen, indien "
-"ingeschakeld."
+msgstr "De opdracht die gebruikt wordt om \"ymsgr\" URLs af te handelen, indien ingeschakeld."
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
@@ -2867,76 +3207,40 @@ msgid "The handler for \"ymsgr\" URLs"
 msgstr "De afhandelaar voor \"ymsgr\" URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"aim\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"aim\" URLs moet afhandelen."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"gg\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"gg\" URLs moet afhandelen."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"icq\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"icq\" URLs moet afhandelen."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"irc\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"irc\" URLs moet afhandelen."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"msnim\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"msnim\" URLs moet afhandelen."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"sip\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"sip\" URLs moet afhandelen."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"xmpp\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"xmpp\" URLs moet afhandelen."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"ymsgr\" URLs moet "
-"afhandelen."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "Waar indien de opdracht in de \"command\" sleutel \"ymsgr\" URLs moet afhandelen."
 
 #: ../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 ""
-"Waar indien de opdracht die gebruikt wordt om dit type URLs af te handelen "
-"moet uitgevoerd worden in een terminal."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "Waar indien de opdracht die gebruikt wordt om dit type URLs af te handelen moet uitgevoerd worden in een terminal."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2988,7 +3292,7 @@ msgstr ""
 
 #: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
-msgstr "Kan logboek niet bijhouden."
+msgstr "Kan logboek van dit gesprek niet bijhouden."
 
 #: ../libpurple/log.c:1293
 msgid "XML"
@@ -2996,27 +3300,21 @@ msgstr "XML"
 
 #: ../libpurple/log.c:1377
 #, 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;AUTO-"
-"ANTWOORD&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;AUTO-ANTWOORD&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1379
 #, 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;AUTO-"
-"ANTWOORD&gt;:</b></font> %s<br/>\n"
+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;AUTO-ANTWOORD&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1570
+#: ../libpurple/log.c:1437
+#: ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kan pad naar logboek niet vinden!</b></font>"
 
-#: ../libpurple/log.c:1449 ../libpurple/log.c:1579
+#: ../libpurple/log.c:1449
+#: ../libpurple/log.c:1579
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kan bestand niet lezen: %s</b></font>"
@@ -3029,7 +3327,7 @@ msgstr "(%s) %s <AUTO-ANTWOORD>: %s\n"
 #: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "je geruikt %s, maar de plugin heeft %s nodig."
+msgstr "je gebruikt %s, maar de plugin heeft %s nodig."
 
 #: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
@@ -3046,17 +3344,13 @@ msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI-versie komt niet overeen %d.%d.x (nodig: %d.%d.x)"
 
 #: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
-msgstr "Plugin implementeert niet alle vereiste functies"
+msgid "Plugin does not implement all required functions (list_icon, login and close)"
+msgstr "Plugin implementeert niet alle vereiste functies (iconenlijst, inloggen en afsluiten)"
 
 #: ../libpurple/plugin.c:542
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"De vereiste plugin %s is niet gevonden. Installeer de plugin en probeer "
-"opnieuw."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "De vereiste plugin %s is niet gevonden. Installeer de plugin en probeer opnieuw."
 
 #: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
@@ -3078,67 +3372,69 @@ msgstr "%s is afhankelijk van %s, maar kan niet uitgeschakeld worden."
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
-msgstr "Automatisch Accepteren"
+msgstr "Automatisch accepteren"
 
-#: ../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 ""
-"Bestandsoverdrachten automatisch accepteren van geselecteerde gebruikers."
+msgstr "Bestandsoverdrachten automatisch accepteren van geselecteerde gebruikers."
 
-#: ../libpurple/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:81
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr ""
-"Automatische geaccepteerde bestands-overdracht van \"%s\" van \"%s\" klaar."
+msgstr "Automatische geaccepteerde bestands-overdracht van \"%s\" van \"%s\" klaar."
 
-#: ../libpurple/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:83
 msgid "Autoaccept complete"
 msgstr "Autoaccepteren compleet"
 
-#: ../libpurple/plugins/autoaccept.c:171
+#: ../libpurple/plugins/autoaccept.c:176
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Als een bestands-overdracht aanvraag komt van %s"
 
-#: ../libpurple/plugins/autoaccept.c:173
+#: ../libpurple/plugins/autoaccept.c:178
 msgid "Set Autoaccept Setting"
-msgstr "Autoaccepteren Instellingen Instellen"
+msgstr "Automatisch accepteren instellen"
 
-#: ../libpurple/plugins/autoaccept.c:175
+#: ../libpurple/plugins/autoaccept.c:180
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2338
-#: ../libpurple/protocols/oscar/oscar.c:6001
-#: ../libpurple/protocols/oscar/oscar.c:6056
-#: ../libpurple/protocols/oscar/oscar.c:6283
-#: ../libpurple/protocols/oscar/oscar.c:6353 ../libpurple/request.h:1401
+#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:2483
+#: ../libpurple/protocols/oscar/oscar.c:2531
+#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6443
+#: ../libpurple/request.h:1401
 #: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../libpurple/plugins/autoaccept.c:179
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Ask"
 msgstr "Vraag"
 
-#: ../libpurple/plugins/autoaccept.c:180
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Auto Accept"
-msgstr "Automatisch Accepteren"
+msgstr "Automatisch accepteren"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:186
 msgid "Auto Reject"
-msgstr "Verbinding Automatisch Afwijzen"
+msgstr "Automatisch afwijzen"
 
-#: ../libpurple/plugins/autoaccept.c:196
+#: ../libpurple/plugins/autoaccept.c:201
 msgid "Autoaccept File Transfers..."
-msgstr "Bestandsoverdrachten Automatisch Accepteren..."
+msgstr "Bestandsoverdrachten automatisch accepteren..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
+#: ../libpurple/plugins/autoaccept.c:231
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3146,12 +3442,11 @@ msgstr ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 
-#: ../libpurple/plugins/autoaccept.c:231
-#, fuzzy
+#: ../libpurple/plugins/autoaccept.c:236
 msgid "Automatically reject from users not in buddy list"
-msgstr "Alleen inschakelen voor gebruikers uit mijn contactenlijst"
+msgstr "Automatisch verwerpen van gebruikers die niet in contactenlijst staan"
 
-#: ../libpurple/plugins/autoaccept.c:235
+#: ../libpurple/plugins/autoaccept.c:240
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3159,10 +3454,15 @@ msgstr ""
 "Meld met een pop-up wanneer een automatisch geaccepteerde\n"
 "bestandsoverdracht compleet is"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msn/msn.c:1860
-#: ../libpurple/protocols/msnp9/msn.c:1671
-#: ../libpurple/protocols/msnp9/msn.c:1701
+#: ../libpurple/plugins/autoaccept.c:245
+msgid "Create a new directory for each user"
+msgstr "Een nieuwe map voor elke gebruiker aanmaken"
+
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:2044
+#: ../libpurple/protocols/msn/msn.c:2074
+#: ../libpurple/protocols/msnp9/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1830
 msgid "Notes"
 msgstr "Opmerkingen"
 
@@ -3172,7 +3472,7 @@ msgstr "Voeg je opmerkingen hieronder toe..."
 
 #: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
-msgstr "Bewerk Opmerkingen..."
+msgstr "Bewerk opmerkingen..."
 
 #. *< major version
 #. *< minor version
@@ -3182,18 +3482,21 @@ msgstr "Bewerk Opmerkingen..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
-msgstr "Contact Opmerkingen"
+msgstr "Contact-opmerkingen"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Sla opmerkingen op bij bepaalde vrienden."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Contacten toevoegen aan de lijst"
 
@@ -3221,7 +3524,8 @@ msgstr "Codering testen"
 #. *< 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 "De met libpurple meegeleverde coderingen testen."
 
@@ -3250,7 +3554,7 @@ msgstr "DBus-voorbeeld"
 #: ../libpurple/plugins/dbus-example.c:158
 #: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
-msgstr "DBus Voorbeeldplugin"
+msgstr "DBus voorbeeldplugin"
 
 #. *< type
 #. *< ui_requirement
@@ -3266,26 +3570,32 @@ msgstr "Bestands-controle"
 #. *< 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 "Besturing inschakelen door opdrachten in een bestand te zetten."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuten"
 
 #. 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 "'k ben d'r nie"
+msgstr "'k ben d'r eventjes nie"
 
-#: ../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 "Afwezigheidstijd instellen"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Activeren"
 
@@ -3293,7 +3603,8 @@ msgstr "_Activeren"
 msgid "None of your accounts are idle."
 msgstr "Geen van uw accounts is inactief."
 
-#: ../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 "Afwezigheid uitschakelen"
 
@@ -3301,7 +3612,8 @@ msgstr "Afwezigheid uitschakelen"
 msgid "_Unset"
 msgstr "_Uitschakelen"
 
-#: ../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 "Inactiviteit instellen voor alle accounts"
 
@@ -3309,7 +3621,8 @@ msgstr "Inactiviteit instellen voor alle accounts"
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Inactiviteit uitzetten voor alle accounts"
 
-#: ../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 "Stelt u in staat om zelf in te stellen hoe lang u afwezig bent"
 
@@ -3321,7 +3634,7 @@ msgstr "Stelt u in staat om zelf in te stellen hoe lang u afwezig bent"
 #. *< id
 #: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
-msgstr "IPC Test Client"
+msgstr "IPC test client"
 
 #. *< name
 #. *< version
@@ -3332,12 +3645,8 @@ msgstr "Test plugin IPC-ondersteuning, als een client."
 
 #. *  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 ""
-"Test plugin IPC-ondersteuning, als een client. Deze zoekt de server-plugin "
-"en start de geregistreerde opdrachten."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "Test plugin IPC-ondersteuning, als een client. Deze zoekt de server-plugin en start de geregistreerde opdrachten."
 
 #. *< type
 #. *< ui_requirement
@@ -3359,17 +3668,15 @@ msgstr "Test plugin IPC-ondersteuning, als een server."
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Test plugin PIC-ondersteuning, als een server. Deze registreert de IPC-"
-"opdrachten."
+msgstr "Test plugin PIC-ondersteuning, als een server. Deze registreert de IPC-opdrachten."
 
 #: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
-msgstr "Toetreden/Delen Verborgen Instellingen"
+msgstr "Instellingen om notificaties over deelnemen/verlaten te verbergen"
 
 #: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
-msgstr "Minimale Kamer Grootte"
+msgstr "Minimale grootte van gespreksruimte"
 
 #: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
@@ -3383,7 +3690,7 @@ msgstr "Gebruikers-activiteit verlopen (in minuten)"
 #. *< id
 #: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
-msgstr "Deelnemen/Verlaten Verbergen"
+msgstr "Deelnemen/verlaten verbergen"
 
 #. *< name
 #. *< version
@@ -3394,12 +3701,8 @@ msgstr "Verbergt vreemde deelnemen/verlaten meldingen."
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:274
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"Deze plugin verbergt deelnemen/verlaten meldingen, behalve voor de "
-"gebruikerd die actief deelnemen aan een gesprek."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "Deze plugin verbergt deelnemen/verlaten meldingen, behalve voor de gebruikerd die actief deelnemen aan een gesprek."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -3433,12 +3736,8 @@ msgid "You were disconnected from the server."
 msgstr "De verbinding met de server is verbroken."
 
 #: ../libpurple/plugins/log_reader.c:1605
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"U bent op dit moment niet aangemeld. U kunt geen berichten ontvangen totdat "
-"u zich aanmeld."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "U bent op dit moment niet aangemeld. U kunt geen berichten ontvangen totdat u zich aanmeld."
 
 #: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
@@ -3546,18 +3845,13 @@ msgstr "Logboeken van andere clients tonen in ons logboek."
 #. * description
 #: ../libpurple/plugins/log_reader.c:2918
 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 ""
-"Bij het weergeven van logboeken zal deze plugin ook de logboeken van andere "
-"clients voor expresberichten tonen. Op dit moment kunnen we dit doen voor "
-"Adium, MSN Messenger en Trillian.\n"
+"Bij het weergeven van logboeken zal deze plugin ook de logboeken van andere clients voor berichten tonen. Op dit moment kunnen we dit doen voor Adium, MSN Messenger en Trillian.\n"
 "\n"
-"WAARSCHUWING: Deze plugin is testcode en kan (regelmatig) crashen. Op eigen "
-"risico dus!"
+"WAARSCHUWING: Deze plugin is testcode en kan (regelmatig) crashen. Op eigen risico dus!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -3587,7 +3881,7 @@ msgstr "Voeg nieuwe lijn in gesprek toe"
 #. *< id
 #: ../libpurple/plugins/newline.c:104
 msgid "New Line"
-msgstr "Nieuwe Lijn"
+msgstr "Nieuwe lijn"
 
 #. *< name
 #. *< version
@@ -3597,33 +3891,25 @@ msgstr "Maakt een enter aan in weergegeven berichy"
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:107
-#, fuzzy
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the username in the conversation window."
-msgstr ""
-"Voegt een enter toe in berichten zodat de rest van het bericht onder de naam "
-"komt te staan."
+msgid "Prepends a newline to messages so that the rest of the message appears below the username in the conversation window."
+msgstr "Voegt een enter toe in berichten zodat de rest van het bericht ine het gespreksvenster onder de naam komt te staan."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline berichten emulatie"
 
-#: ../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 ""
 
 #: ../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."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, 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?"
+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 ""
 
 #: ../libpurple/plugins/offlinemsg.c:160
@@ -3632,45 +3918,49 @@ msgstr "Off-line bericht"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "Je kan de alarmen bewerken/verwijderen uit het 'Contactalarm'-venster."
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:675
+#: ../libpurple/protocols/msn/msn.c:767
 #: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/msnp9/msn.c:566
+#: ../libpurple/protocols/msnp9/msn.c:582
 #: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
+#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/silc10/wb.c:307
+#: ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Ja"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:675
+#: ../libpurple/protocols/msn/msn.c:767
 #: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/msnp9/msn.c:566
+#: ../libpurple/protocols/msnp9/msn.c:582
 #: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
+#: ../libpurple/protocols/silc/pk.c:114
+#: ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
+#: ../libpurple/protocols/silc10/wb.c:308
+#: ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Nee"
 
 #: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "Offline berichten in alarm opslaan."
 
 #: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "Vraag niet. Altijd in alarm opslaan."
 
 #. *< type
 #. *< ui_requirement
@@ -3678,14 +3968,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
+#: ../libpurple/plugins/perl/perl.c:657
 msgid "Perl Plugin Loader"
 msgstr "Perl-plugin lader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:659
+#: ../libpurple/plugins/perl/perl.c:660
 msgid "Provides support for loading perl plugins."
 msgstr "Geeft de mogelijkheid om perl-plugins te laden."
 
@@ -3698,16 +3989,12 @@ msgid "Psychic mode for incoming conversation"
 msgstr "Paragnost-stand voor inkomend gesprek"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"Zorgt ervoor dat gespreksvensters verschijnen wanneer gebruikers berichten "
-"sturen. Dit werkt met AIM, ICQ, XMPP, Sametime, en Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Zorgt ervoor dat gespreksvensters verschijnen wanneer gebruikers berichten sturen. Dit werkt met AIM, ICQ, XMPP, Sametime, en Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
-msgstr "U krijgt het gevoel dat iemand contact met u zoekt..."
+msgstr "Je krijgt het gevoel dat iemand contact met je zoekt..."
 
 #: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
@@ -3732,7 +4019,7 @@ msgstr "In verborgen gesprekken"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:775
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Signalentest"
 
@@ -3740,8 +4027,8 @@ msgstr "Signalentest"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:778
-#: ../libpurple/plugins/signals-test.c:780
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Test om te zien of alle signalen correct werken."
 
@@ -3759,7 +4046,8 @@ msgstr "Simpele plugin"
 #. *< 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 "Test om te zien of de meeste dingen werken."
 
@@ -3821,7 +4109,8 @@ msgstr "SSL"
 #. *< 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 "Zorgt voor een schil om de SSL-bibliotheken"
 
@@ -3882,85 +4171,77 @@ msgstr "Contactstatusmelding"
 #. *  description
 #: ../libpurple/plugins/statenotify.c:155
 #: ../libpurple/plugins/statenotify.c:158
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Geeft in een venster weer wanneer de status van een contact verandert naar "
-"of van afwezig."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "Geeft in een venster weer wanneer de status van een contact verandert naar of van afwezig."
 
 #: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-plugin lader"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
+#: ../libpurple/plugins/tcl/tcl.c:425
+#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Geeft de mogelijkheid om tcl-plugins te laden"
 
 #: ../libpurple/plugins/tcl/tcl.c:509
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"Niet mogelijk om ActiveTCL installatie te detecteren. Als je wenst gebruik "
-"te maken van TCL-plugins, installeer ActiveTCL vanaf http://www.activestate."
-"com\n"
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "Niet mogelijk om ActiveTCL installatie te detecteren. Als je wenst gebruik te maken van TCL-plugins, installeer ActiveTCL vanaf http://www.activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:102
-msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
-msgstr ""
-"De Apple Bonjour For Windows toolkit is niet geconden, bekijk de FAQ op: "
-"http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging voor meer informatie."
+#: ../libpurple/protocols/bonjour/bonjour.c:93
+msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d.pidgin.im/BonjourWindows for more information."
+msgstr "De Apple Bonjour For Windows toolkit is niet geconden, bekijk de FAQ op http://d.pidgin.im/BonjourWindow voor meer informatie."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:121
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kan niet luisteren naar binnenkomende gespreksverzoeken\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"Kan geen verbinding maken met de lokale mDNS server. Is deze wel gestart?"
+#: ../libpurple/protocols/bonjour/bonjour.c:139
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Kan geen verbinding maken met de lokale mDNS server. Is deze wel gestart?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:393
-#: ../libpurple/protocols/bonjour/bonjour.c:699
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/bonjour/bonjour.c:381
+#: ../libpurple/protocols/bonjour/bonjour.c:709
+#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1036
 msgid "First name"
 msgstr "Voornaam"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:395
-#: ../libpurple/protocols/bonjour/bonjour.c:702
-#: ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1010
+#: ../libpurple/protocols/bonjour/bonjour.c:383
+#: ../libpurple/protocols/bonjour/bonjour.c:712
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:1040
 msgid "Last name"
 msgstr "Achternaam"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:399
+#: ../libpurple/protocols/bonjour/bonjour.c:387
+#: ../libpurple/protocols/bonjour/bonjour.c:715
+#: ../libpurple/protocols/gg/gg.c:479
 #: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/jabber/buddy.c:1373
-#: ../libpurple/protocols/jabber/buddy.c:2267
+#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1364
+#: ../libpurple/protocols/jabber/buddy.c:2240
+#: ../libpurple/protocols/jabber/jabber.c:1028
+#: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1055
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1246
 #: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/silc.c:706
+#: ../libpurple/protocols/silc10/silc.c:947
 #: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1064
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:402
-#: ../libpurple/protocols/bonjour/bonjour.c:708
+#: ../libpurple/protocols/bonjour/bonjour.c:390
+#: ../libpurple/protocols/bonjour/bonjour.c:718
 msgid "AIM Account"
 msgstr "AIM-account"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:405
-#: ../libpurple/protocols/bonjour/bonjour.c:711
+#: ../libpurple/protocols/bonjour/bonjour.c:393
+#: ../libpurple/protocols/bonjour/bonjour.c:721
 msgid "XMPP Account"
 msgstr "XMPP-account"
 
@@ -3974,12 +4255,12 @@ msgstr "XMPP-account"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:509
-#: ../libpurple/protocols/bonjour/bonjour.c:511
+#: ../libpurple/protocols/bonjour/bonjour.c:526
+#: ../libpurple/protocols/bonjour/bonjour.c:528
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-protocol plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "Purple Person"
 msgstr "Purple mens"
 
@@ -3995,374 +4276,400 @@ msgstr "%s heeft het gesprek gesloten."
 #: ../libpurple/protocols/bonjour/jabber.c:481
 #: ../libpurple/protocols/bonjour/jabber.c:546
 #: ../libpurple/protocols/bonjour/jabber.c:591
-#: ../libpurple/protocols/bonjour/jabber.c:768
-#: ../libpurple/protocols/bonjour/jabber.c:786
+#: ../libpurple/protocols/bonjour/jabber.c:759
+#: ../libpurple/protocols/bonjour/jabber.c:777
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan het bericht niet verzenden. Kan geen gesprek starten."
 
-#: ../libpurple/protocols/bonjour/jabber.c:685
+#: ../libpurple/protocols/bonjour/jabber.c:684
 msgid "Cannot open socket"
 msgstr "Kan geen socket openen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:695
-msgid "Error setting socket options"
-msgstr "Kan socket niet instellen"
-
-#: ../libpurple/protocols/bonjour/jabber.c:721
+#: ../libpurple/protocols/bonjour/jabber.c:712
 msgid "Could not bind socket to port"
 msgstr "Kan socket niet koppelen aan poort"
 
-#: ../libpurple/protocols/bonjour/jabber.c:731
+#: ../libpurple/protocols/bonjour/jabber.c:722
 msgid "Could not listen on socket"
 msgstr "Kan niet luisteren naar socket"
 
 #: ../libpurple/protocols/bonjour/mdns_win32.c:110
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "Fout opgetreden bij communicatie met de server"
+msgstr "Fout bij het communiceren met lokale mDNSResponder"
 
-#: ../libpurple/protocols/gg/gg.c:85 ../libpurple/proxy.c:1908
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1919
 msgid "Invalid proxy settings"
 msgstr "Ongeldige proxy-instellingen"
 
-#: ../libpurple/protocols/gg/gg.c:86 ../libpurple/proxy.c:1908
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
+#: ../libpurple/protocols/gg/gg.c:77
+#: ../libpurple/proxy.c:1919
+msgid "Either the host name or port number specified for your given proxy type is invalid."
 msgstr "De computernaam of poort voor uw gegeven proxy-type is ongeldig."
 
-#: ../libpurple/protocols/gg/gg.c:124 ../libpurple/protocols/gg/gg.c:146
-#: ../libpurple/protocols/gg/gg.c:189
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/protocols/gg/gg.c:125 ../libpurple/protocols/gg/gg.c:147
-#: ../libpurple/protocols/gg/gg.c:190
+#: ../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 "Kan teken niet ophalen.\n"
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:283
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:267
+#: ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Contactenlijst opslaan..."
 
-#: ../libpurple/protocols/gg/gg.c:277
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Uw lijst is leeg, niets weggeschreven naar het bestand."
 
-#: ../libpurple/protocols/gg/gg.c:284
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Contactenlijst opgeslagen."
 
-#: ../libpurple/protocols/gg/gg.c:287
+#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "Kan contactenlijst niet beschrijven van %s naar %s"
 
-#: ../libpurple/protocols/gg/gg.c:312 ../libpurple/protocols/gg/gg.c:313
+#: ../libpurple/protocols/gg/gg.c:303
+#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "kan contactenlijst niet laden"
 
-#: ../libpurple/protocols/gg/gg.c:329
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Contactenlijst laden..."
 
-#: ../libpurple/protocols/gg/gg.c:330
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Contactenlijst geladen."
 
-#: ../libpurple/protocols/gg/gg.c:341
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Contactenlijst opslaan..."
 
-#: ../libpurple/protocols/gg/gg.c:391
+#: ../libpurple/protocols/gg/gg.c:346
+#: ../libpurple/protocols/gg/gg.c:2088
+msgid "Load buddylist from file..."
+msgstr "Contactenlijst laden uit bestand..."
+
+#: ../libpurple/protocols/gg/gg.c:383
 msgid "Fill in the registration fields."
 msgstr "Registratievelden invullen."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:390
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:400
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kan geen nieuw account registreren. Er is een fout opgetreden.\n"
 
-#: ../libpurple/protocols/gg/gg.c:421
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nieuw Gadu-Gadu account geregistreerd"
 
-#: ../libpurple/protocols/gg/gg.c:422
+#: ../libpurple/protocols/gg/gg.c:414
 msgid "Registration completed successfully!"
 msgstr "Registratie voltooid."
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/jabber/jabber.c:1773
+#: ../libpurple/protocols/gg/gg.c:484
+#: ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/jabber/jabber.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:489
+#: ../libpurple/protocols/gg/gg.c:785
 msgid "Password (retype)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Enter current token"
 msgstr "Geef huidige teken"
 
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:801
+#: ../libpurple/protocols/gg/gg.c:500
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Current token"
 msgstr "Huidige teken"
 
-#: ../libpurple/protocols/gg/gg.c:512 ../libpurple/protocols/gg/gg.c:513
+#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Register New Gadu-Gadu Account"
 msgstr "Nieuw Gadu-gadu-account registreren"
 
-#: ../libpurple/protocols/gg/gg.c:514
+#: ../libpurple/protocols/gg/gg.c:506
 msgid "Please, fill in the following fields"
-msgstr "Vult u alstublieft de volgende velden in"
-
-#: ../libpurple/protocols/gg/gg.c:652 ../libpurple/protocols/gg/gg.c:1065
-#: ../libpurple/protocols/gg/gg.c:1137
-#: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/oscar/oscar.c:3828
-#: ../libpurple/protocols/oscar/oscar.c:3841
-#: ../libpurple/protocols/qq/buddy_info.c:49
+msgstr "Vul de volgende velden in"
+
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:1063
+#: ../libpurple/protocols/gg/gg.c:1135
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:3963
+#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "City"
 msgstr "Stad"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Year of birth"
 msgstr "Geboortejaar"
 
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/gg/gg.c:655
+#: ../libpurple/protocols/msn/msn.c:1973
+#: ../libpurple/protocols/msnp9/msn.c:1729
 #: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
+#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/qq.c:267
+#: ../libpurple/protocols/qq/qq.c:270
+#: ../libpurple/protocols/qq/qq.c:273
+#: ../libpurple/protocols/qq/qq.c:277
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1094
 msgid "Gender"
 msgstr "Geslacht"
 
-#: ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:656
 msgid "Male or female"
 msgstr "Man of Vrouw"
 
-#: ../libpurple/protocols/gg/gg.c:662
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:267
 msgid "Male"
 msgstr "Man"
 
-#: ../libpurple/protocols/gg/gg.c:663
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/qq/buddy_info.c:85
+#: ../libpurple/protocols/qq/qq.c:270
 msgid "Female"
 msgstr "Vrouw"
 
-#: ../libpurple/protocols/gg/gg.c:667
+#: ../libpurple/protocols/gg/gg.c:662
 msgid "Only online"
-msgstr "Alleen on-line"
+msgstr "Alleen online"
 
-#: ../libpurple/protocols/gg/gg.c:671 ../libpurple/protocols/gg/gg.c:672
+#: ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:667
 msgid "Find buddies"
 msgstr "Contacten zoeken"
 
-#: ../libpurple/protocols/gg/gg.c:673
+#: ../libpurple/protocols/gg/gg.c:668
 msgid "Please, enter your search criteria below"
 msgstr "Geef hieronder uw zoekcriteria"
 
-#: ../libpurple/protocols/gg/gg.c:711
+#: ../libpurple/protocols/gg/gg.c:706
 msgid "Fill in the fields."
 msgstr "Vul de velden in."
 
-#: ../libpurple/protocols/gg/gg.c:723
+#: ../libpurple/protocols/gg/gg.c:718
 msgid "Your current password is different from the one that you specified."
-msgstr "Uw huidige wachtwoord wijkt af van het door u gegeven wachtwoord."
+msgstr "Je  huidige wachtwoord wijkt af van het door u gegeven wachtwoord."
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan wachtwoord niet wijzigen. Er is een fout opgetreden.\n"
 
-#: ../libpurple/protocols/gg/gg.c:746
+#: ../libpurple/protocols/gg/gg.c:741
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Wachtwoord wijzigen voor het gadu-gadu-account"
 
-#: ../libpurple/protocols/gg/gg.c:747
+#: ../libpurple/protocols/gg/gg.c:742
 msgid "Password was changed successfully!"
 msgstr "Wachtwoord gewijzigd."
 
-#: ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:775
 msgid "Current password"
 msgstr "Huidige wachtwoord"
 
-#: ../libpurple/protocols/gg/gg.c:805
+#: ../libpurple/protocols/gg/gg.c:800
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Geef uw huidige wachtwoord en nieuwe wachtwoord voor UIN: "
+msgstr "Geef je huidige wachtwoord en nieuwe wachtwoord voor UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:809 ../libpurple/protocols/gg/gg.c:810
+#: ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:805
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-gadu-wachtwoord wijzigen"
 
-#: ../libpurple/protocols/gg/gg.c:887
+#: ../libpurple/protocols/gg/gg.c:882
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Kies een chatgesprek voor het contact: %s"
 
-#: ../libpurple/protocols/gg/gg.c:890 ../libpurple/protocols/gg/gg.c:891
+#: ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/gg/gg.c:886
 msgid "Add to chat..."
 msgstr "Toevoegen aan chatgesprek..."
 
-#: ../libpurple/protocols/gg/gg.c:1022
-#: ../libpurple/protocols/jabber/buddy.c:2084
-#: ../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/gg/gg.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:2057
+#: ../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/msnp9/state.c:29
 #: ../libpurple/protocols/msnp9/state.c:30
 #: ../libpurple/protocols/msnp9/state.c:37
 #: ../libpurple/protocols/msnp9/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1086
+#: ../libpurple/protocols/qq/qq.c:355
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/status.c:160
+#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkstatusbox.c:1089
 msgid "Available"
 msgstr "Beschikbaar"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1025 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:358
-#: ../libpurple/protocols/jabber/buddy.c:2088
+#: ../libpurple/protocols/gg/gg.c:1023
+#: ../libpurple/protocols/irc/irc.c:561
+#: ../libpurple/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/jabber/buddy.c:2061
 #: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:734
-#: ../libpurple/protocols/oscar/oscar.c:5747
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3719
-#: ../libpurple/protocols/yahoo/yahoo.c:3793 ../libpurple/status.c:159
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2070
-#: ../pidgin/gtkstatusbox.c:1087
+#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:5837
+#: ../libpurple/protocols/qq/qq.c:223
+#: ../libpurple/protocols/qq/qq.c:359
+#: ../libpurple/protocols/silc/buddy.c:1491
+#: ../libpurple/protocols/silc10/buddy.c:1491
+#: ../libpurple/protocols/yahoo/yahoo.c:3726
+#: ../libpurple/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/status.c:163
+#: ../pidgin/gtkdocklet.c:549
+#: ../pidgin/gtkprefs.c:2067
+#: ../pidgin/gtkstatusbox.c:1090
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/oscar/oscar.c:2755
-#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/gg/gg.c:1052
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:2948
+#: ../libpurple/protocols/oscar/oscar.c:3889
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1057 ../libpurple/protocols/gg/gg.c:1131
-#: ../libpurple/protocols/jabber/buddy.c:2261
-#: ../libpurple/protocols/jabber/buddy.c:2447
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/gg/gg.c:1055
+#: ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/jabber/buddy.c:2234
+#: ../libpurple/protocols/jabber/buddy.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:3900
 #: ../libpurple/protocols/silc/ops.c:1004
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Voornaam"
 
-#: ../libpurple/protocols/gg/gg.c:1070 ../libpurple/protocols/gg/gg.c:1140
+#: ../libpurple/protocols/gg/gg.c:1068
+#: ../libpurple/protocols/gg/gg.c:1138
 msgid "Birth Year"
 msgstr "Geboortejaar"
 
-#: ../libpurple/protocols/gg/gg.c:1122 ../libpurple/protocols/gg/gg.c:1191
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:1189
+#: ../libpurple/protocols/oscar/oscar.c:4076
 msgid "Unable to display the search results."
 msgstr "kan zoekresultaten niet weergeven."
 
-#: ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/gg/gg.c:1180
 msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu Adresboek"
+msgstr "Gadu-Gadu-adresboek"
 
-#: ../libpurple/protocols/gg/gg.c:1183
+#: ../libpurple/protocols/gg/gg.c:1181
 msgid "Search results"
 msgstr "Zoekresultaten"
 
-#: ../libpurple/protocols/gg/gg.c:1226
+#: ../libpurple/protocols/gg/gg.c:1224
 msgid "No matching users found"
 msgstr "Niet overeenkomende gebruikers gevonden"
 
-#: ../libpurple/protocols/gg/gg.c:1227
+#: ../libpurple/protocols/gg/gg.c:1225
 msgid "There are no users matching your search criteria."
 msgstr "Er zijn geen overeenkomende gebruikers voor uw zoekcriteria"
 
-#: ../libpurple/protocols/gg/gg.c:1539 ../libpurple/protocols/gg/gg.c:1700
+#: ../libpurple/protocols/gg/gg.c:1321
+#: ../libpurple/protocols/gg/gg.c:1476
 msgid "Unable to read socket"
 msgstr "Kan niet lezen van socket."
 
-#: ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1406
 msgid "Buddy list downloaded"
 msgstr "Contactenlijst gedownload"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Your buddy list was downloaded from the server."
 msgstr "Uw contactenlijst is gedownload van de server."
 
-#: ../libpurple/protocols/gg/gg.c:1638
+#: ../libpurple/protocols/gg/gg.c:1414
 msgid "Buddy list uploaded"
 msgstr "Contactenlijst verzonden"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1415
 msgid "Your buddy list was stored on the server."
 msgstr "Uw contactenlijst is opgeslagen op de server."
 
-#: ../libpurple/protocols/gg/gg.c:1748 ../libpurple/protocols/gg/gg.c:1957
+#: ../libpurple/protocols/gg/gg.c:1513
+#: ../libpurple/protocols/gg/gg.c:1726
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: ../libpurple/protocols/gg/gg.c:1883
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Add to chat"
 msgstr "Toevoegen aan chatgesprek"
 
-#: ../libpurple/protocols/gg/gg.c:1913
+#: ../libpurple/protocols/gg/gg.c:1678
 msgid "Chat _name:"
 msgstr "_Naam chatgesprek:"
 
-#: ../libpurple/protocols/gg/gg.c:2323
+#: ../libpurple/protocols/gg/gg.c:1951
 msgid "Chat error"
 msgstr "Chatfout"
 
-#: ../libpurple/protocols/gg/gg.c:2324
+#: ../libpurple/protocols/gg/gg.c:1952
 msgid "This chat name is already in use"
 msgstr "De naam bestaat reeds"
 
-#: ../libpurple/protocols/gg/gg.c:2409
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Not connected to the server."
 msgstr "Niet verbonden met de server."
 
-#: ../libpurple/protocols/gg/gg.c:2432
+#: ../libpurple/protocols/gg/gg.c:2060
 msgid "Find buddies..."
 msgstr "Contacten zoeken..."
 
-#: ../libpurple/protocols/gg/gg.c:2438
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Change password..."
 msgstr "Wachtwoord wijzigen..."
 
-#: ../libpurple/protocols/gg/gg.c:2444
+#: ../libpurple/protocols/gg/gg.c:2072
 msgid "Upload buddylist to Server"
 msgstr "Contactenlijst opslaan op de server"
 
-#: ../libpurple/protocols/gg/gg.c:2448
+#: ../libpurple/protocols/gg/gg.c:2076
 msgid "Download buddylist from Server"
 msgstr "Contactenlijst van server downloaden"
 
-#: ../libpurple/protocols/gg/gg.c:2452
+#: ../libpurple/protocols/gg/gg.c:2080
 msgid "Delete buddylist from Server"
 msgstr "Contactenlijst verwijderen van server"
 
-#: ../libpurple/protocols/gg/gg.c:2456
+#: ../libpurple/protocols/gg/gg.c:2084
 msgid "Save buddylist to file..."
 msgstr "Contactenlijst opslaan in bestand..."
 
-#: ../libpurple/protocols/gg/gg.c:2460
-msgid "Load buddylist from file..."
-msgstr "Contactenlijst laden uit bestand..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -4374,39 +4681,39 @@ msgstr "Contactenlijst laden uit bestand..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2564
+#: ../libpurple/protocols/gg/gg.c:2193
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu-protocol plugin"
+msgstr "Gadu-Gadu-protocol-plugin"
 
 #  summary
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2565
+#: ../libpurple/protocols/gg/gg.c:2194
 msgid "Polish popular IM"
-msgstr "Populaire Poolse client voor Expresberichten"
+msgstr "Populaire Poolse client voor berichten"
 
-#: ../libpurple/protocols/gg/gg.c:2619
+#: ../libpurple/protocols/gg/gg.c:2248
 msgid "Gadu-Gadu User"
 msgstr "Gadu-gadu-gebruiker"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1853
-#: ../libpurple/protocols/silc10/silc.c:1572
+#: ../libpurple/protocols/silc/silc.c:1890
+#: ../libpurple/protocols/silc10/silc.c:1609
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende opdracht: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:509
-#: ../libpurple/protocols/jabber/chat.c:596
-#: ../libpurple/protocols/silc/silc.c:1561
-#: ../libpurple/protocols/silc10/silc.c:1280
+#: ../libpurple/protocols/irc/cmds.c:537
+#: ../libpurple/protocols/jabber/chat.c:616
+#: ../libpurple/protocols/silc/silc.c:1580
+#: ../libpurple/protocols/silc10/silc.c:1299
 #, c-format
 msgid "current topic is: %s"
 msgstr "huidige onderwerp is: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:513
-#: ../libpurple/protocols/jabber/chat.c:600
-#: ../libpurple/protocols/silc/silc.c:1565
-#: ../libpurple/protocols/silc10/silc.c:1284
+#: ../libpurple/protocols/irc/cmds.c:541
+#: ../libpurple/protocols/jabber/chat.c:620
+#: ../libpurple/protocols/silc/silc.c:1584
+#: ../libpurple/protocols/silc10/silc.c:1303
 msgid "No topic is set"
 msgstr "Geen onderwerp ingesteld"
 
@@ -4443,9 +4750,11 @@ msgstr "Er is geen MOTD geassocieerd met deze verbinding."
 msgid "MOTD for %s"
 msgstr "MOTD voor %s"
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2539
+#: ../libpurple/protocols/irc/irc.c:129
+#: ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:650
+#: ../libpurple/protocols/irc/irc.c:679
+#: ../libpurple/protocols/myspace/myspace.c:2554
 msgid "Server has disconnected"
 msgstr "Server heeft verbinding verbroken"
 
@@ -4453,13 +4762,15 @@ msgstr "Server heeft verbinding verbroken"
 msgid "View MOTD"
 msgstr "MOTD weergeven"
 
-#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272
+#: ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Ruimte:"
 
 #: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
+#: ../libpurple/protocols/jabber/chat.c:59
+#: ../pidgin/gtkaccount.c:550
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
@@ -4470,23 +4781,23 @@ msgstr "IRC-bijnamen mogen geen spaties bevatten"
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1347
-#: ../libpurple/protocols/msn/session.c:416
+#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/msn/session.c:409
 #: ../libpurple/protocols/msnp9/session.c:368
 #: ../libpurple/protocols/myspace/myspace.c:295
 #: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1335
-#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/oscar/oscar.c:1446
 #: ../libpurple/protocols/sametime/sametime.c:3778
 #: ../libpurple/protocols/simple/simple.c:1931
-#: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:686
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:1589
+#: ../pidgin/gtkstatusbox.c:687
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
 #: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:674
-#: ../libpurple/protocols/jabber/jabber.c:1155
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "SSL support unavailable"
 msgstr "SSL niet beschikbaar"
 
@@ -4497,24 +4808,25 @@ msgstr "SSL niet beschikbaar"
 msgid "Couldn't create socket"
 msgstr "Kan geen socket aanmaken"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1331
+#: ../libpurple/protocols/irc/irc.c:453
+#: ../libpurple/protocols/oscar/oscar.c:1442
 msgid "Couldn't connect to host"
 msgstr "Kan geen verbinding maken met host"
 
-#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2533
+#: ../libpurple/protocols/irc/irc.c:645
+#: ../libpurple/protocols/irc/irc.c:674
+#: ../libpurple/protocols/myspace/myspace.c:2548
 msgid "Read error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/irc/irc.c:798
+#: ../libpurple/protocols/irc/irc.c:815
 #: ../libpurple/protocols/silc/chat.c:1401
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../libpurple/protocols/irc/irc.c:801
+#: ../libpurple/protocols/irc/irc.c:818
 #: ../libpurple/protocols/sametime/sametime.c:3426
 #: ../libpurple/protocols/silc/chat.c:1404
 #: ../libpurple/protocols/silc/ops.c:1406
@@ -4532,21 +4844,22 @@ msgstr "Onderwerp"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:939
+#: ../libpurple/protocols/irc/irc.c:957
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protocol plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:940
+#: ../libpurple/protocols/irc/irc.c:958
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "De IRC-protocol plugin die minder zuigt"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:371
-#: ../libpurple/protocols/msn/msn.c:2357
-#: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6749
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:983
+#: ../libpurple/protocols/irc/msgs.c:375
+#: ../libpurple/protocols/msn/msn.c:2571
+#: ../libpurple/protocols/msnp9/msn.c:2326
+#: ../libpurple/protocols/oscar/oscar.c:6836
+#: ../libpurple/protocols/qq/qq.c:805
 #: ../libpurple/protocols/sametime/sametime.c:5783
 #: ../libpurple/protocols/silc/ops.c:1262
 #: ../libpurple/protocols/silc/ops.c:1356
@@ -4558,24 +4871,30 @@ msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6752
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:986
+#: ../libpurple/protocols/msn/msn.c:2576
+#: ../libpurple/protocols/msnp9/msn.c:2331
+#: ../libpurple/protocols/oscar/oscar.c:6839
+#: ../libpurple/protocols/qq/qq.c:808
 #: ../libpurple/protocols/sametime/sametime.c:5788
-#: ../libpurple/protocols/silc/silc.c:2143
-#: ../libpurple/protocols/silc10/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:2181
+#: ../libpurple/protocols/silc10/silc.c:1904
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Poort"
 
-#: ../libpurple/protocols/irc/irc.c:971
+#: ../libpurple/protocols/irc/irc.c:989
 msgid "Encodings"
 msgstr "Coderingen"
 
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:365
-#: ../libpurple/protocols/silc/silc.c:1225
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/irc/irc.c:992
+msgid "Auto-detect incoming UTF-8"
+msgstr "Inkomende UTF-8 automatisch herkennen"
+
+#: ../libpurple/protocols/irc/irc.c:998
+#: ../libpurple/protocols/irc/msgs.c:369
+#: ../libpurple/protocols/silc/silc.c:1244
+#: ../libpurple/protocols/silc10/silc.c:945
 msgid "Real name"
 msgstr "Echte naam"
 
@@ -4583,225 +4902,219 @@ msgstr "Echte naam"
 #. 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:985
+#: ../libpurple/protocols/irc/irc.c:1006
 msgid "Use SSL"
 msgstr "SSL gebruiken"
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:196
 msgid "Bad mode"
 msgstr "Slechte modus"
 
-#: ../libpurple/protocols/irc/msgs.c:214
+#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "Ban op %s door%s, %ld seconden geleden ingesteld"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Ban op %s door %s, %s geleden ingesteld"
 
-#: ../libpurple/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:221
 #, c-format
 msgid "Ban on %s"
 msgstr "Ban op %s"
 
-#: ../libpurple/protocols/irc/msgs.c:232
+#: ../libpurple/protocols/irc/msgs.c:236
 msgid "End of ban list"
 msgstr "Einde van blokkeerlijst"
 
-#: ../libpurple/protocols/irc/msgs.c:246
+#: ../libpurple/protocols/irc/msgs.c:250
 #, c-format
 msgid "You are banned from %s."
-msgstr "U bent uit %s verbannen."
+msgstr "Je bent uit %s verbannen."
 
-#: ../libpurple/protocols/irc/msgs.c:247
+#: ../libpurple/protocols/irc/msgs.c:251
 msgid "Banned"
 msgstr "Verbannen"
 
-#: ../libpurple/protocols/irc/msgs.c:264
+#: ../libpurple/protocols/irc/msgs.c:268
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kan %s niet verbannen. De lijst is vol"
 
-#: ../libpurple/protocols/irc/msgs.c:349
+#: ../libpurple/protocols/irc/msgs.c:353
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:350
+#: ../libpurple/protocols/irc/msgs.c:354
 msgid " <i>(identified)</i>"
 msgstr " <i>(geïdentificeerd)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:351
-#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/irc/msgs.c:355
+#: ../libpurple/protocols/oscar/oscar.c:3890
 #: ../libpurple/protocols/silc/ops.c:1435
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Bijnaam"
 
-#: ../libpurple/protocols/irc/msgs.c:377
+#: ../libpurple/protocols/irc/msgs.c:381
 #: ../libpurple/protocols/silc/ops.c:1281
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Nu aanwezig"
 
-#: ../libpurple/protocols/irc/msgs.c:382
+#: ../libpurple/protocols/irc/msgs.c:386
 msgid "Idle for"
 msgstr "Inactief in"
 
-#: ../libpurple/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Online since"
-msgstr "On-line sinds"
+msgstr "Online sinds"
 
-#: ../libpurple/protocols/irc/msgs.c:389
+#: ../libpurple/protocols/irc/msgs.c:393
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Gedefinieerde eigenschap:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:389
+#: ../libpurple/protocols/irc/msgs.c:393
 msgid "Glorious"
 msgstr "Glorieus"
 
-#: ../libpurple/protocols/irc/msgs.c:473
+#: ../libpurple/protocols/irc/msgs.c:477
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s heeft het onderwerp veranderd naar: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:475
+#: ../libpurple/protocols/irc/msgs.c:479
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s heeft het onderwerp gewist."
 
-#: ../libpurple/protocols/irc/msgs.c:483
+#: ../libpurple/protocols/irc/msgs.c:487
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Het onderwerp voor %s is %s"
 
-#: ../libpurple/protocols/irc/msgs.c:501
+#: ../libpurple/protocols/irc/msgs.c:505
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Onbekend bericht '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:502
+#: ../libpurple/protocols/irc/msgs.c:506
 msgid "Unknown message"
 msgstr "Onbekend bericht"
 
-#: ../libpurple/protocols/irc/msgs.c:502
+#: ../libpurple/protocols/irc/msgs.c:506
 msgid "The IRC server received a message it did not understand."
 msgstr "De IRC-server ontving een bericht dat niet werd begrepen."
 
-#: ../libpurple/protocols/irc/msgs.c:523
+#: ../libpurple/protocols/irc/msgs.c:527
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Gebruikers op %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:630
+#: ../libpurple/protocols/irc/msgs.c:634
 msgid "Time Response"
 msgstr "Tijdreactie"
 
-#: ../libpurple/protocols/irc/msgs.c:631
+#: ../libpurple/protocols/irc/msgs.c:635
 msgid "The IRC server's local time is:"
 msgstr "De lokale tijd van de IRC server is:"
 
-#: ../libpurple/protocols/irc/msgs.c:642
+#: ../libpurple/protocols/irc/msgs.c:646
 msgid "No such channel"
 msgstr "Ruimte bestaat niet"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:653
+#: ../libpurple/protocols/irc/msgs.c:657
 msgid "no such channel"
 msgstr "ruimte bestaat niet"
 
-#: ../libpurple/protocols/irc/msgs.c:656
+#: ../libpurple/protocols/irc/msgs.c:660
 msgid "User is not logged in"
 msgstr "Gebruiker is niet aangemeld"
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:665
 msgid "No such nick or channel"
 msgstr "Bijnaam/ruimte bestaat niet"
 
-#: ../libpurple/protocols/irc/msgs.c:681
+#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Could not send"
 msgstr "Kan niet verzenden"
 
-#: ../libpurple/protocols/irc/msgs.c:737
+#: ../libpurple/protocols/irc/msgs.c:741
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Deelnemen aan %s vereist een uitnodiging."
 
-#: ../libpurple/protocols/irc/msgs.c:738
+#: ../libpurple/protocols/irc/msgs.c:742
 msgid "Invitation only"
 msgstr "Alleen op uitnodiging"
 
-#: ../libpurple/protocols/irc/msgs.c:854
+#: ../libpurple/protocols/irc/msgs.c:858
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "U bent uit weggeschopt door %s: (%s)"
+msgstr "Je bent weggeschopt door %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:859 ../libpurple/protocols/silc/ops.c:714
+#: ../libpurple/protocols/irc/msgs.c:863
+#: ../libpurple/protocols/silc/ops.c:714
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Weggeschopt door %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:882
+#: ../libpurple/protocols/irc/msgs.c:886
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) door %s"
 
-#: ../libpurple/protocols/irc/msgs.c:970 ../libpurple/protocols/irc/msgs.c:971
+#: ../libpurple/protocols/irc/msgs.c:976
+#: ../libpurple/protocols/irc/msgs.c:977
 msgid "Invalid nickname"
 msgstr "Ongeldige bijnaam"
 
-#: ../libpurple/protocols/irc/msgs.c:972
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Uw gekozen bijnaam is geweigerd door de server. Het bevat waarschijnlijk "
-"onacceptabele tekens."
+#: ../libpurple/protocols/irc/msgs.c:978
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "Uw gekozen bijnaam is geweigerd door de server. Het bevat waarschijnlijk onacceptabele tekens."
 
-#: ../libpurple/protocols/irc/msgs.c:977
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Uw gekozen accountnaam is geweigerd door de server. Het bevat waarschijnlijk "
-"onacceptabele tekens."
+#: ../libpurple/protocols/irc/msgs.c:983
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "Uw gekozen accountnaam is geweigerd door de server. Het bevat waarschijnlijk onacceptabele tekens."
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1031
 msgid "Cannot change nick"
 msgstr "Kan bijnaam niet veranderen"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1031
 msgid "Could not change nick"
 msgstr "Kan bijnaam niet veranderen"
 
-#: ../libpurple/protocols/irc/msgs.c:1041
+#: ../libpurple/protocols/irc/msgs.c:1056
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "U heeft het kanaal%s%s verlaten"
+msgstr "Je hebt het kanaal%s%s verlaten"
 
-#: ../libpurple/protocols/irc/msgs.c:1085
+#: ../libpurple/protocols/irc/msgs.c:1100
 msgid "Error: invalid PONG from server"
 msgstr "Fout: ongeldige PONG van server"
 
-#: ../libpurple/protocols/irc/msgs.c:1087
+#: ../libpurple/protocols/irc/msgs.c:1102
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-antwoord -- Vertraging %lu seconden"
 
-#: ../libpurple/protocols/irc/msgs.c:1178
+#: ../libpurple/protocols/irc/msgs.c:1193
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kan niet deelnemen aan %s: Registratie vereist."
 
-#: ../libpurple/protocols/irc/msgs.c:1179
+#: ../libpurple/protocols/irc/msgs.c:1194
 #: ../libpurple/protocols/silc/ops.c:1106
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan niet deelnemen aan ruimte"
 
-#: ../libpurple/protocols/irc/msgs.c:1213
+#: ../libpurple/protocols/irc/msgs.c:1228
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Bijnaam of chatgesprek is momenteel niet bereikbaar."
 
-#: ../libpurple/protocols/irc/msgs.c:1225
+#: ../libpurple/protocols/irc/msgs.c:1240
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops van %s"
@@ -4811,246 +5124,172 @@ msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [bericht]:  Een afwezigheidsbericht instellen, of afwezigheid "
-"uitschakelen door geen bericht te gebruiken."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [bericht]:  Een afwezigheidsbericht instellen, of afwezigheid uitschakelen door geen bericht te gebruiken."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Een opdracht naar chanserv sturen"
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;bijnaam1&gt; [bijnaam2] ...:  Operator-status uitschakelen van "
-"iemand. U moet wel zelf operator zijn hiervoor."
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: Een opdracht naar chanserv sturen"
 
 #: ../libpurple/protocols/irc/parse.c:128
-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;bijnaam1&gt; [bijnaam2] ...:  Spreekstatus van iemand "
-"verwijderen, zodat deze niet meer kan praten in een gemodereerd kanaal (+m). "
-"U moet wel zelf operator zijn hiervoor."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;bijnaam1&gt; [bijnaam2] ...:  Operator-status uitschakelen van iemand. U moet wel zelf operator zijn hiervoor."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;bijnaam&gt; [ruimte]:  Iemand uitnodigen in een bepaalde kanaal, "
-"of het huidige kanaal."
+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;bijnaam1&gt; [bijnaam2] ...:  Spreekstatus van iemand verwijderen, zodat deze niet meer kan praten in een gemodereerd kanaal (+m). U moet wel zelf operator zijn hiervoor."
 
 #: ../libpurple/protocols/irc/parse.c:130
-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;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
-"ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;bijnaam&gt; [ruimte]:  Iemand uitnodigen in een bepaalde kanaal, of het huidige kanaal."
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
-"ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
+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;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
 
 #: ../libpurple/protocols/irc/parse.c:132
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte schoppen. U moet wel "
-"zelf operator zijn hiervoor."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
 
 #: ../libpurple/protocols/irc/parse.c:133
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:  Een lijst van alle beschikbare ruimtes weergeven. <i>Waarschuwing: "
-"sommige servers verbreken de verbinding als je dit doet.</i>"
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte schoppen. U moet wel zelf operator zijn hiervoor."
 
 #: ../libpurple/protocols/irc/parse.c:134
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:  Een lijst van alle beschikbare ruimtes weergeven. <i>Waarschuwing: sommige servers verbreken de verbinding als je dit doet.</i>"
+
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:  Een opdracht naar de memoserver sturen"
 
-#: ../libpurple/protocols/irc/parse.c:136
-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;bijnaam|kanaal&gt;:  Kanaal- / "
-"gebruikersmodus aan of uitschakelen."
-
 #: ../libpurple/protocols/irc/parse.c:137
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
-"gebruiker (in plaats van naar een ruimte)."
+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;bijnaam|kanaal&gt;:  Kanaal- / gebruikersmodus aan of uitschakelen."
 
 #: ../libpurple/protocols/irc/parse.c:138
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een gebruiker (in plaats van naar een ruimte)."
+
+#: ../libpurple/protocols/irc/parse.c:139
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [ruimte]:  De gebruikers in het kanaal opsommen."
 
-#: ../libpurple/protocols/irc/parse.c:139
-#: ../libpurple/protocols/jabber/jabber.c:2359
+#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/jabber/jabber.c:2391
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nieuwe bijnaam&gt;:  Uw eigen bijnaam veranderen."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  Een opdracht naar de nickserver sturen"
 
-#: ../libpurple/protocols/irc/parse.c:141
-msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr ""
-"notice &lt;target&lt;:  Verzend een notitie naar een gebruiker of kanaal."
-
 #: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand benoemen tot operator voor het "
-"huidige kanaal. U moet wel zelf operator zijn hiervoor."
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;target&lt;:  Verzend een notitie naar een gebruiker of kanaal."
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;bericht&gt;:  Als je niet weet wat dit is, kun je het "
-"waarschijnlijk niet gebruiken."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand benoemen tot operator voor het huidige kanaal. U moet wel zelf operator zijn hiervoor."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid "operserv: Send a command to operserv"
-msgstr "operserv:  Een opdracht naar de operserver sturen"
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;bericht&gt;:  Als je niet weet wat dit is, kun je het waarschijnlijk niet gebruiken."
 
 #: ../libpurple/protocols/irc/parse.c:145
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [ruimte] [bericht]:  Huidige (of gegeven) kanaal verlaten met een "
-"optioneel afscheidsbericht."
+msgid "operserv: Send a command to operserv"
+msgstr "operserv:  Een opdracht naar de operserver sturen"
 
 #: ../libpurple/protocols/irc/parse.c:146
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [bijnaam]:  Vraagt de vertragingstijd op van een gebruiker (of de "
-"server als geen naam wordt gegeven)."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [ruimte] [bericht]:  Huidige (of gegeven) kanaal verlaten met een optioneel afscheidsbericht."
 
 #: ../libpurple/protocols/irc/parse.c:147
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;bijnaam&gt; &lt;bericht&gt;:  Informatie opvragen van een "
-"gebruiker."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [bijnaam]:  Vraagt de vertragingstijd op van een gebruiker (of de server als geen naam wordt gegeven)."
 
 #: ../libpurple/protocols/irc/parse.c:148
-msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [bericht]:  Verbinding met de server verbreken met een optioneel "
-"afscheidsbericht."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;bijnaam&gt; &lt;bericht&gt;:  Informatie opvragen van een gebruiker."
 
 #: ../libpurple/protocols/irc/parse.c:149
-msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Een opdracht direct naar de server sturen."
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [bericht]:  Verbinding met de server verbreken met een optioneel afscheidsbericht."
 
 #: ../libpurple/protocols/irc/parse.c:150
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte verwijderen. U moet "
-"wel zelf operator zijn hiervoor."
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  Een opdracht direct naar de server sturen."
 
 #: ../libpurple/protocols/irc/parse.c:151
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte verwijderen. U moet wel zelf operator zijn hiervoor."
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Geeft de huidige lokale tijd van de IRC-server."
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr ""
-"topic [nieuw onderwerp]:  Onderwerp van het kanaal weergeven / veranderen."
+msgstr "topic [nieuw onderwerp]:  Onderwerp van het kanaal weergeven / veranderen."
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Een gebruikersmodus aan- of uitzetten."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Een gebruikersmodus aan- of uitzetten."
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [bijnaam]: CTCP VERSION sturen aan een gebruiker"
 
-#: ../libpurple/protocols/irc/parse.c:155
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand spreekstatus geven. U moet "
-"wel zelf operator zijn hiervoor."
-
 #: ../libpurple/protocols/irc/parse.c:156
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;bericht&gt;:  Als u niet weet wat dit is, kunt u het "
-"waarschijnlijk niet gebruiken."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand spreekstatus geven. U moet wel zelf operator zijn hiervoor."
 
 #: ../libpurple/protocols/irc/parse.c:157
-msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
-"whois [server] &lt;bijnaam&gt;:  Informatie over een gebruiker opvragen."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;bericht&gt;:  Als u niet weet wat dit is, kunt u het waarschijnlijk niet gebruiken."
 
 #: ../libpurple/protocols/irc/parse.c:158
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [server] &lt;bijnaam&gt;:  Informatie over een gebruiker opvragen."
+
+#: ../libpurple/protocols/irc/parse.c:159
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;nick&gt;:  Informatie over een gebruiker opvragen."
 
-#: ../libpurple/protocols/irc/parse.c:523
+#: ../libpurple/protocols/irc/parse.c:531
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwoord van %s na %lu seconden"
 
-#: ../libpurple/protocols/irc/parse.c:524
+#: ../libpurple/protocols/irc/parse.c:532
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:524
+#: ../libpurple/protocols/irc/parse.c:532
 msgid "CTCP PING reply"
 msgstr "CTCP PING antwoord"
 
-#: ../libpurple/protocols/irc/parse.c:636
-#: ../libpurple/protocols/irc/parse.c:643 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:644
+#: ../libpurple/protocols/irc/parse.c:651
+#: ../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 "Verbinding verbroken"
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:735
 #: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
@@ -5061,72 +5300,62 @@ msgstr "Ad-Hoc opdracht mislukt"
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
-msgstr "Uitvoeren"
+msgstr "uitvoeren"
 
 #: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
-"gevonden."
+msgstr "Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL gevonden."
 
 #: ../libpurple/protocols/jabber/auth.c:60
 msgid "You require encryption, but no TLS/SSL support found."
-msgstr ""
-"Server vereist versleuteling, maar er is geen ondersteuning voor TLS/SSL "
-"gevonden."
+msgstr "Server vereist versleuteling, maar er is geen ondersteuning voor TLS/SSL gevonden."
 
 #: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"Server vereist een identificatie via tekstaanmelding via een ongecodeerde "
-"datastroom"
+msgstr "Server vereist een identificatie via tekstaanmelding via een ongecodeerde datastroom"
 
 #: ../libpurple/protocols/jabber/auth.c:328
-#: ../libpurple/protocols/jabber/auth.c:538
-#: ../libpurple/protocols/jabber/auth.c:732
+#: ../libpurple/protocols/jabber/auth.c:544
+#: ../libpurple/protocols/jabber/auth.c:670
 #, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
-msgstr ""
-"%s vereist een identificatie via tekstaanmelding via een ongecodeerde "
-"datastroom. Wilt u hiermee doorgaan?"
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "%s vereist een identificatie via tekstaanmelding via een ongecodeerde datastroom. Wilt u hiermee doorgaan?"
 
 #: ../libpurple/protocols/jabber/auth.c:330
 #: ../libpurple/protocols/jabber/auth.c:331
-#: ../libpurple/protocols/jabber/auth.c:540
-#: ../libpurple/protocols/jabber/auth.c:541
-#: ../libpurple/protocols/jabber/auth.c:734
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:546
+#: ../libpurple/protocols/jabber/auth.c:547
+#: ../libpurple/protocols/jabber/auth.c:672
+#: ../libpurple/protocols/jabber/auth.c:673
 msgid "Plaintext Authentication"
 msgstr "Tekstaanmelding"
 
 #: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:665
-#: ../libpurple/protocols/jabber/auth.c:916
-#: ../libpurple/protocols/jabber/auth.c:1067
-#: ../libpurple/protocols/jabber/auth.c:1094
-#: ../libpurple/protocols/jabber/auth.c:1140
-#: ../libpurple/protocols/jabber/jabber.c:127
+#: ../libpurple/protocols/jabber/auth.c:602
+#: ../libpurple/protocols/jabber/auth.c:854
+#: ../libpurple/protocols/jabber/auth.c:1006
+#: ../libpurple/protocols/jabber/auth.c:1033
+#: ../libpurple/protocols/jabber/auth.c:1079
+#: ../libpurple/protocols/jabber/jabber.c:128
 msgid "Invalid response from server."
 msgstr "Ongeldig antwoord van server"
 
-#: ../libpurple/protocols/jabber/auth.c:554
-#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:560
+#: ../libpurple/protocols/jabber/auth.c:686
 msgid "Server does not use any supported authentication method"
 msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
 
-#: ../libpurple/protocols/jabber/auth.c:939
-#: ../libpurple/protocols/jabber/auth.c:964
+#: ../libpurple/protocols/jabber/auth.c:877
+#: ../libpurple/protocols/jabber/auth.c:903
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
-#: ../libpurple/protocols/jabber/auth.c:1040
+#: ../libpurple/protocols/jabber/auth.c:979
 msgid "SASL error"
 msgstr "SASL-fout"
 
 #: ../libpurple/protocols/jabber/buddy.c:306
-#: ../libpurple/protocols/jabber/buddy.c:1257
+#: ../libpurple/protocols/jabber/buddy.c:1256
 #: ../libpurple/protocols/sametime/sametime.c:4184
 #: ../libpurple/protocols/silc/ops.c:1000
 #: ../libpurple/protocols/silc10/ops.c:1020
@@ -5134,327 +5363,326 @@ msgid "Full Name"
 msgstr "Volledige naam"
 
 #: ../libpurple/protocols/jabber/buddy.c:307
-#: ../libpurple/protocols/jabber/buddy.c:1269
+#: ../libpurple/protocols/jabber/buddy.c:1267
 #: ../libpurple/protocols/silc/ops.c:1012
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Achternaam"
 
 #: ../libpurple/protocols/jabber/buddy.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:1269
 msgid "Given Name"
 msgstr "Gegeven naam"
 
 #: ../libpurple/protocols/jabber/buddy.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1320
+#: ../libpurple/protocols/jabber/buddy.c:1310
 msgid "Street Address"
 msgstr "Adres"
 
 #: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1317
+#: ../libpurple/protocols/jabber/buddy.c:1308
 msgid "Extended Address"
 msgstr "Adresbijvoeging"
 
 #: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1323
+#: ../libpurple/protocols/jabber/buddy.c:1312
 msgid "Locality"
 msgstr "Localiteit"
 
 #: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1326
+#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "Region"
 msgstr "Regio"
 
 #: ../libpurple/protocols/jabber/buddy.c:315
-#: ../libpurple/protocols/jabber/buddy.c:1329
+#: ../libpurple/protocols/jabber/buddy.c:1316
 msgid "Postal Code"
 msgstr "Postcode"
 
 #: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1333
-#: ../libpurple/protocols/silc/silc.c:1231
-#: ../libpurple/protocols/silc10/silc.c:932
+#: ../libpurple/protocols/jabber/buddy.c:1319
+#: ../libpurple/protocols/silc/silc.c:1250
+#: ../libpurple/protocols/silc10/silc.c:951
 msgid "Country"
 msgstr "Land"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 #: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1344
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1333
+#: ../libpurple/protocols/jabber/buddy.c:1339
 msgid "Telephone"
 msgstr "Telefoon"
 
 #: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1388
+#: ../libpurple/protocols/jabber/buddy.c:1380
 msgid "Organization Name"
 msgstr "Organisatie"
 
 #: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1391
+#: ../libpurple/protocols/jabber/buddy.c:1382
 msgid "Organization Unit"
 msgstr "Afdeling"
 
 #: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1400
+#: ../libpurple/protocols/jabber/buddy.c:1389
 msgid "Role"
 msgstr "Rol"
 
 #: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1288
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1669
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/msn/msn.c:2042
+#: ../libpurple/protocols/msnp9/msn.c:1798
+#: ../libpurple/protocols/oscar/oscar.c:3939
 msgid "Birthday"
 msgstr "Geboortedatum"
 
 #: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1403
-#: ../libpurple/protocols/jabber/chat.c:780
-#: ../libpurple/protocols/jabber/usermood.c:190 ../pidgin/gtkblist.c:3428
-#: ../pidgin/gtkplugin.c:582 ../pidgin/gtkprefs.c:688
+#: ../libpurple/protocols/jabber/buddy.c:1391
+#: ../libpurple/protocols/jabber/chat.c:800
+#: ../libpurple/protocols/jabber/usermood.c:190
+#: ../pidgin/gtkblist.c:3517
+#: ../pidgin/gtkplugin.c:584
+#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Beschrijving"
 
 #: ../libpurple/protocols/jabber/buddy.c:753
 #: ../libpurple/protocols/jabber/buddy.c:754
 msgid "Edit XMPP vCard"
-msgstr "XMPP vCard Bewerken"
+msgstr "XMPP vCard bewerken"
 
 #: ../libpurple/protocols/jabber/buddy.c:755
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"Alle items hieronder zijn optioneel. Geef alleen die informatie die u ook "
-"openbaar wilt maken."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "Alle items hieronder zijn optioneel. Geef alleen die informatie die u ook openbaar wilt maken."
 
-#: ../libpurple/protocols/jabber/buddy.c:826
-#: ../libpurple/protocols/jabber/buddy.c:991
+#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:980
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:830
-#: ../libpurple/protocols/jabber/buddy.c:995
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:984
 msgid "Operating System"
-msgstr "Operating System"
+msgstr "Besturingssysteem"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/jabber/buddy.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Last Activity"
-msgstr "Laatste Activiteit"
+msgstr "Laatste activiteit"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
-#: ../libpurple/protocols/jabber/buddy.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "Service Discovery Info"
-msgstr "Directory Info Instellen"
+msgstr "Directory info instellen"
 
-#: ../libpurple/protocols/jabber/buddy.c:850
-#: ../libpurple/protocols/jabber/buddy.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "Service Discovery Items"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:852
-#: ../libpurple/protocols/jabber/buddy.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Extended Stanza Addressing"
-msgstr "Stanza Adresbijvoeging"
+msgstr "Stanza adresbijvoeging"
 
-#: ../libpurple/protocols/jabber/buddy.c:854
-#: ../libpurple/protocols/jabber/buddy.c:1014
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "Multi-User Chat"
-msgstr "Meerdere Gebruikers Gesprek"
+msgstr "Groepsgesprek"
 
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1016
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1035
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Deze gebruiker heeft geen profiel."
 
-#: ../libpurple/protocols/jabber/buddy.c:858
-#: ../libpurple/protocols/jabber/buddy.c:1018
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "In-Band Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:860
-#: ../libpurple/protocols/jabber/buddy.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Opdrachten"
+msgstr "Ad-Hoc opdrachten"
 
-#: ../libpurple/protocols/jabber/buddy.c:862
-#: ../libpurple/protocols/jabber/buddy.c:1022
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "PubSub Service"
-msgstr "PubSub Dienst"
+msgstr "PubSub dienst"
 
-#: ../libpurple/protocols/jabber/buddy.c:864
-#: ../libpurple/protocols/jabber/buddy.c:1024
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "SOCKS5 Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:866
-#: ../libpurple/protocols/jabber/buddy.c:1026
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Out of Band Data"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:868
-#: ../libpurple/protocols/jabber/buddy.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:870
-#: ../libpurple/protocols/jabber/buddy.c:1030
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1049
 #, fuzzy
 msgid "In-Band Registration"
 msgstr "Registratiefout"
 
-#: ../libpurple/protocols/jabber/buddy.c:872
-#: ../libpurple/protocols/jabber/buddy.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Location"
-msgstr "Lokatie"
+msgstr "Gebruikerslocatie"
 
-#: ../libpurple/protocols/jabber/buddy.c:874
-#: ../libpurple/protocols/jabber/buddy.c:1034
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Avatar"
 msgstr "Avatar"
 
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/jabber/buddy.c:1036
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "Chat State Notifications"
 msgstr "Contactstatusmelding"
 
-#: ../libpurple/protocols/jabber/buddy.c:878
-#: ../libpurple/protocols/jabber/buddy.c:1038
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "Software Version"
 msgstr "Software versie"
 
-#: ../libpurple/protocols/jabber/buddy.c:880
-#: ../libpurple/protocols/jabber/buddy.c:1040
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1059
 #, fuzzy
 msgid "Stream Initiation"
 msgstr "Oriëntatie"
 
-#: ../libpurple/protocols/jabber/buddy.c:882
-#: ../libpurple/protocols/jabber/buddy.c:1042
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1061
 #: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "Bestandsoverdracht"
 
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:1044
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "User Mood"
 msgstr "Humeur gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
-#: ../libpurple/protocols/jabber/buddy.c:1046
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "User Activity"
 msgstr "Activiteit gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:888
-#: ../libpurple/protocols/jabber/buddy.c:1048
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Entity Capabilities"
-msgstr "Mogelijkheden"
+msgstr "Entiteit mogelijkheden"
 
-#: ../libpurple/protocols/jabber/buddy.c:890
-#: ../libpurple/protocols/jabber/buddy.c:1050
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "Encrypted Session Negotiations"
 msgstr "Gecodeerde sessie onderhandelingen"
 
-#: ../libpurple/protocols/jabber/buddy.c:892
-#: ../libpurple/protocols/jabber/buddy.c:1052
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "User Tune"
 msgstr "Gebruikers tune"
 
-#: ../libpurple/protocols/jabber/buddy.c:894
-#: ../libpurple/protocols/jabber/buddy.c:1054
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1073
 #, fuzzy
 msgid "Roster Item Exchange"
 msgstr "IM met sleuteluitwisseling"
 
-#: ../libpurple/protocols/jabber/buddy.c:896
-#: ../libpurple/protocols/jabber/buddy.c:1056
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Reachability Address"
 msgstr "Beschikbaarheid adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:898
-#: ../libpurple/protocols/jabber/buddy.c:1058
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1077
 msgid "User Profile"
 msgstr "Profiel"
 
-#: ../libpurple/protocols/jabber/buddy.c:900
-#: ../libpurple/protocols/jabber/buddy.c:1060
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1079
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:1062
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1081
 msgid "Jingle Audio"
-msgstr "Geluid Jingle"
+msgstr "Geluid jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:904
-#: ../libpurple/protocols/jabber/buddy.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1083
 msgid "User Nickname"
 msgstr "Gebruikersnaam"
 
-#: ../libpurple/protocols/jabber/buddy.c:906
-#: ../libpurple/protocols/jabber/buddy.c:1066
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1085
 msgid "Jingle ICE UDP"
 msgstr "ICE UDP Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:908
-#: ../libpurple/protocols/jabber/buddy.c:1068
+#: ../libpurple/protocols/jabber/buddy.c:917
+#: ../libpurple/protocols/jabber/buddy.c:1087
 msgid "Jingle ICE TCP"
 msgstr "ICE TCP Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1070
+#: ../libpurple/protocols/jabber/buddy.c:919
+#: ../libpurple/protocols/jabber/buddy.c:1089
 msgid "Jingle Raw UDP"
 msgstr "Raw UDP Raw UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:912
-#: ../libpurple/protocols/jabber/buddy.c:1072
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Jingle Video"
 msgstr "Jingle Video"
 
-#: ../libpurple/protocols/jabber/buddy.c:914
-#: ../libpurple/protocols/jabber/buddy.c:1074
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Jingle DTMF"
 msgstr "DTMF DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:916
-#: ../libpurple/protocols/jabber/buddy.c:1076
+#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Message Receipts"
-msgstr "Bericht Ontvangen"
+msgstr "Bericht ontvangen"
 
-#: ../libpurple/protocols/jabber/buddy.c:918
-#: ../libpurple/protocols/jabber/buddy.c:1078
+#: ../libpurple/protocols/jabber/buddy.c:927
+#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "Public Key Publishing"
 msgstr "Openbare sleutel openbaren"
 
-#: ../libpurple/protocols/jabber/buddy.c:920
-#: ../libpurple/protocols/jabber/buddy.c:1080
+#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "User Chatting"
 msgstr "Chattende gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:1082
+#: ../libpurple/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "User Browsing"
 msgstr "Browsende gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:924
-#: ../libpurple/protocols/jabber/buddy.c:1084
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "User Gaming"
 msgstr "Gamende gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:926
-#: ../libpurple/protocols/jabber/buddy.c:1086
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:1105
 msgid "User Viewing"
 msgstr "Gebruiker aan het kijken"
 
-#: ../libpurple/protocols/jabber/buddy.c:928
-#: ../libpurple/protocols/jabber/buddy.c:1088
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/buddy.c:1107
 #: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc/ops.c:1618
 #: ../libpurple/protocols/silc10/ops.c:1612
@@ -5462,230 +5690,225 @@ msgstr "Gebruiker aan het kijken"
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:930
-#: ../libpurple/protocols/jabber/buddy.c:1090
+#: ../libpurple/protocols/jabber/buddy.c:939
+#: ../libpurple/protocols/jabber/buddy.c:1109
 msgid "Stanza Encryption"
 msgstr "Stanza codering"
 
-#: ../libpurple/protocols/jabber/buddy.c:932
-#: ../libpurple/protocols/jabber/buddy.c:1092
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:1111
 msgid "Entity Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:934
-#: ../libpurple/protocols/jabber/buddy.c:1094
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/buddy.c:1113
 msgid "Delayed Delivery"
 msgstr "Vertraagde afgifte"
 
-#: ../libpurple/protocols/jabber/buddy.c:936
-#: ../libpurple/protocols/jabber/buddy.c:1096
+#: ../libpurple/protocols/jabber/buddy.c:945
+#: ../libpurple/protocols/jabber/buddy.c:1115
 msgid "Collaborative Data Objects"
 msgstr "Samenwerkende data-objecten"
 
-#: ../libpurple/protocols/jabber/buddy.c:938
-#: ../libpurple/protocols/jabber/buddy.c:1098
+#: ../libpurple/protocols/jabber/buddy.c:947
+#: ../libpurple/protocols/jabber/buddy.c:1117
 msgid "File Repository and Sharing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:1100
+#: ../libpurple/protocols/jabber/buddy.c:949
+#: ../libpurple/protocols/jabber/buddy.c:1119
 msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:942
-#: ../libpurple/protocols/jabber/buddy.c:1102
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/jabber/buddy.c:1121
 msgid "Simplified Encrypted Session Negotiation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/buddy.c:1104
+#: ../libpurple/protocols/jabber/buddy.c:953
+#: ../libpurple/protocols/jabber/buddy.c:1123
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:952
-#: ../libpurple/protocols/jabber/buddy.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2962
+#: ../libpurple/protocols/jabber/buddy.c:961
+#: ../libpurple/protocols/jabber/buddy.c:1131
+#: ../libpurple/protocols/oscar/oscar.c:3161
 msgid "Capabilities"
 msgstr "Mogelijkheden"
 
-#: ../libpurple/protocols/jabber/buddy.c:964
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1098
-msgid "Resource"
-msgstr "Hulpmiddel"
-
-#: ../libpurple/protocols/jabber/buddy.c:966
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/jabber/jabber.c:1667
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1685
+#: ../libpurple/protocols/jabber/jabber.c:1699
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../libpurple/protocols/jabber/buddy.c:1275
+#: ../libpurple/protocols/jabber/buddy.c:1016
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/si.c:1094
+msgid "Resource"
+msgstr "Hulpmiddel"
+
+#: ../libpurple/protocols/jabber/buddy.c:1271
 #: ../libpurple/protocols/silc/ops.c:1008
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
-msgstr "Tweede Naam"
+msgstr "Tweede naam"
 
-#: ../libpurple/protocols/jabber/buddy.c:1308
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/oscar/oscar.c:3827
-#: ../libpurple/protocols/oscar/oscar.c:3840
-#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/jabber/buddy.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/qq/buddy_info.c:57
 #: ../libpurple/protocols/silc/ops.c:1044
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:1314
+#: ../libpurple/protocols/jabber/buddy.c:1306
 msgid "P.O. Box"
 msgstr "Postbus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1414
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1414
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1993
+#: ../libpurple/protocols/jabber/buddy.c:1966
 msgid "Un-hide From"
 msgstr "Afzender weergeven"
 
-#: ../libpurple/protocols/jabber/buddy.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Temporarily Hide From"
 msgstr "Afzender tijdelijk verbergen"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:2005
+#: ../libpurple/protocols/jabber/buddy.c:1978
 msgid "Cancel Presence Notification"
 msgstr "Aanwezigheidsmelding annuleren"
 
-#: ../libpurple/protocols/jabber/buddy.c:2012
+#: ../libpurple/protocols/jabber/buddy.c:1985
 msgid "(Re-)Request authorization"
 msgstr "(Opnieuw) toestemming vragen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:2021
+#: ../libpurple/protocols/jabber/buddy.c:1994
 msgid "Unsubscribe"
 msgstr "Opzeggen"
 
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2009
 msgid "Log In"
 msgstr "Inloggen"
 
-#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/jabber/buddy.c:2013
 msgid "Log Out"
 msgstr "Afmelden"
 
-#: ../libpurple/protocols/jabber/buddy.c:2086
-#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/buddy.c:2059
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Chatty"
 msgstr "Chatgraag"
 
-#: ../libpurple/protocols/jabber/buddy.c:2090
+#: ../libpurple/protocols/jabber/buddy.c:2063
 msgid "Extended Away"
 msgstr "Lang weg"
 
-#: ../libpurple/protocols/jabber/buddy.c:2092
-#: ../libpurple/protocols/jabber/jabber.c:1666
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/jabber/buddy.c:2065
+#: ../libpurple/protocols/jabber/jabber.c:1698
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:6013
 #: ../libpurple/protocols/sametime/sametime.c:3349
 msgid "Do Not Disturb"
 msgstr "Niet storen"
 
-#: ../libpurple/protocols/jabber/buddy.c:2259
+#: ../libpurple/protocols/jabber/buddy.c:2232
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2263
-#: ../libpurple/protocols/jabber/buddy.c:2452
-#: ../libpurple/protocols/oscar/oscar.c:3750
+#: ../libpurple/protocols/jabber/buddy.c:2236
+#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:3901
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: ../libpurple/protocols/jabber/buddy.c:2295
+#: ../libpurple/protocols/jabber/buddy.c:2268
 msgid "The following are the results of your search"
 msgstr "Resultaten van uw zoekopdracht"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2380
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"Zoek een persoon door de zoekcriteria in de gegeven velden in te vullen. "
-"Opmerking: Ieder veld heeft ondersteuning voor zgn. jokertekens (%)."
+#: ../libpurple/protocols/jabber/buddy.c:2353
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "Zoek een persoon door de zoekcriteria in de gegeven velden in te vullen. Opmerking: Ieder veld heeft ondersteuning voor zgn. jokertekens (%)."
 
-#: ../libpurple/protocols/jabber/buddy.c:2400
+#: ../libpurple/protocols/jabber/buddy.c:2373
 msgid "Directory Query Failed"
 msgstr "Aanvraag mislukt"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
+#: ../libpurple/protocols/jabber/buddy.c:2374
 msgid "Could not query the directory server."
 msgstr "Kan de adressenserver niet benaderen."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2435
+#: ../libpurple/protocols/jabber/buddy.c:2408
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Server-instructies: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2442
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:2415
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Vul een of meer velden in om naar te zoeken bij Jabber-gebruikers."
+msgstr "Vul een of meer velden in om te zoeken naar XMMP-gebruikers"
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../libpurple/protocols/jabber/buddy.c:2435
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3753
-#: ../libpurple/protocols/oscar/oscar.c:3762
+#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3913
 msgid "Email Address"
-msgstr "Emailadres"
+msgstr "E-mailadres"
 
-#: ../libpurple/protocols/jabber/buddy.c:2471
-#: ../libpurple/protocols/jabber/buddy.c:2472
+#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Search for XMPP users"
 msgstr " XMPP-gebruikers zoeken"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2473
+#: ../libpurple/protocols/jabber/buddy.c:2446
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:177
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/sys_msg.c:256
+#: ../libpurple/protocols/qq/sys_msg.c:274
 #: ../libpurple/protocols/sametime/sametime.c:5667
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:485
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:367
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../libpurple/protocols/jabber/buddy.c:2488
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Invalid Directory"
 msgstr "Ongeldig adresboek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2505
+#: ../libpurple/protocols/jabber/buddy.c:2478
 msgid "Enter a User Directory"
 msgstr "Geef een adressenserver"
 
-#: ../libpurple/protocols/jabber/buddy.c:2506
+#: ../libpurple/protocols/jabber/buddy.c:2479
 msgid "Select a user directory to search"
 msgstr "Kies een te raadplegen adressenserver"
 
-#: ../libpurple/protocols/jabber/buddy.c:2509
+#: ../libpurple/protocols/jabber/buddy.c:2482
 msgid "Search Directory"
 msgstr "Adressenserver doorzoeken"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5403
+#: ../libpurple/protocols/oscar/oscar.c:5524
 #: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Ruimte:"
@@ -5698,753 +5921,736 @@ msgstr "_Server:"
 msgid "_Handle:"
 msgstr "Bij_naam:"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is geen geldige naam voor een ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:227
+#: ../libpurple/protocols/jabber/chat.c:232
 msgid "Invalid Room Name"
 msgstr "Ongeldige naam voor ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:232
+#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is geen geldige servernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:233
-#: ../libpurple/protocols/jabber/chat.c:234
+#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Server Name"
 msgstr "Ongeldige servernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:238
+#: ../libpurple/protocols/jabber/chat.c:245
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is geen geldige aanduiding voor een ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:239
-#: ../libpurple/protocols/jabber/chat.c:240
+#: ../libpurple/protocols/jabber/chat.c:246
+#: ../libpurple/protocols/jabber/chat.c:247
 msgid "Invalid Room Handle"
 msgstr "Ongeldige aanduiding voor ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:401
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "Configuration error"
 msgstr "Configuratiefout"
 
-#: ../libpurple/protocols/jabber/chat.c:410
-#: ../libpurple/protocols/jabber/chat.c:553
+#: ../libpurple/protocols/jabber/chat.c:430
+#: ../libpurple/protocols/jabber/chat.c:573
 msgid "Unable to configure"
 msgstr "Kan niet configureren"
 
-#: ../libpurple/protocols/jabber/chat.c:425
+#: ../libpurple/protocols/jabber/chat.c:445
 msgid "Room Configuration Error"
 msgstr "Configuratiefout van ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:426
+#: ../libpurple/protocols/jabber/chat.c:446
 msgid "This room is not capable of being configured"
 msgstr "Deze ruimte kan niet ingesteld worden"
 
-#: ../libpurple/protocols/jabber/chat.c:475
-#: ../libpurple/protocols/jabber/chat.c:544
+#: ../libpurple/protocols/jabber/chat.c:495
+#: ../libpurple/protocols/jabber/chat.c:564
 msgid "Registration error"
 msgstr "Registratiefout"
 
-#: ../libpurple/protocols/jabber/chat.c:632
+#: ../libpurple/protocols/jabber/chat.c:652
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Verandering van bijnaam niet toegestaan in non-chatruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:683
-#: ../libpurple/protocols/jabber/chat.c:694
+#: ../libpurple/protocols/jabber/chat.c:703
+#: ../libpurple/protocols/jabber/chat.c:714
 #: ../libpurple/protocols/silc/ops.c:1473
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fout bij het inlezen van de lijst van ruimtes"
 
-#: ../libpurple/protocols/jabber/chat.c:742
+#: ../libpurple/protocols/jabber/chat.c:762
 msgid "Invalid Server"
 msgstr "Ongeldige server"
 
-#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/chat.c:806
 msgid "Enter a Conference Server"
 msgstr "Verbinden met server voor groepsgesprekken"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:807
 msgid "Select a conference server to query"
 msgstr "Kies een te raadplegen conferentieserver"
 
-#: ../libpurple/protocols/jabber/chat.c:790
+#: ../libpurple/protocols/jabber/chat.c:810
 msgid "Find Rooms"
 msgstr "Ruimtes zoeken"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
+#: ../libpurple/protocols/jabber/jabber.c:152
 msgid "You require encryption, but it is not available on this server."
 msgstr "Je hebt encryptie nodig, maar het is niet mogelijk op deze server."
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
+#: ../libpurple/protocols/jabber/jabber.c:270
+#: ../libpurple/protocols/jabber/jabber.c:295
 msgid "Write error"
 msgstr "Schrijffout"
 
-#: ../libpurple/protocols/jabber/jabber.c:401
+#: ../libpurple/protocols/jabber/jabber.c:389
 msgid "Ping timeout"
 msgstr "Ping Verlopen"
 
-#: ../libpurple/protocols/jabber/jabber.c:451
-#: ../libpurple/protocols/jabber/jabber.c:491
+#: ../libpurple/protocols/jabber/jabber.c:443
+#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:528
-#: ../libpurple/protocols/oscar/flap_connection.c:403
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
-#: ../libpurple/protocols/yahoo/yahoo.c:2626
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/oscar/flap_connection.c:444
+#: ../libpurple/protocols/yahoo/yahoo.c:2601
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
+#, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
-msgstr "Kan geen verbinding maken met de server."
+msgstr ""
+"Kan geen verbinding maken met de server:\n"
+"%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:585
+#: ../libpurple/protocols/jabber/jabber.c:593
 msgid "Unable to create socket"
 msgstr "Kan geen socket aanmaken"
 
-#: ../libpurple/protocols/jabber/jabber.c:635
-#: ../libpurple/protocols/jabber/jabber.c:1120
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:1150
 msgid "Invalid XMPP ID"
 msgstr "Ongeldig XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:672
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ongeldige XMPP ID. Domein moet ingesteld worden"
 
-#: ../libpurple/protocols/jabber/jabber.c:720
+#: ../libpurple/protocols/jabber/jabber.c:750
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registratie van %s@%s voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:726
+#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registratie van %s voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:729
+#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Registration Successful"
 msgstr "Registratie voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:737
-#: ../libpurple/protocols/jabber/jabber.c:738
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Registration Failed"
 msgstr "Registratie mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:756
+#: ../libpurple/protocols/jabber/jabber.c:786
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registratie van %s succesvol verwijderd"
 
-#: ../libpurple/protocols/jabber/jabber.c:758
-#: ../libpurple/protocols/jabber/jabber.c:759
+#: ../libpurple/protocols/jabber/jabber.c:788
+#: ../libpurple/protocols/jabber/jabber.c:789
 msgid "Unregistration Successful"
 msgstr "Registratie Ongedaan Maken Voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:797
+#: ../libpurple/protocols/jabber/jabber.c:798
 msgid "Unregistration Failed"
 msgstr "Registratie Ongedaan Maken Mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:934
-#: ../libpurple/protocols/jabber/jabber.c:935
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:965
 msgid "Already Registered"
 msgstr "Al geregistreerd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1022
-#: ../libpurple/protocols/oscar/oscar.c:3829
-#: ../libpurple/protocols/oscar/oscar.c:3842
+#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:3964
+#: ../libpurple/protocols/oscar/oscar.c:3972
 msgid "State"
 msgstr "Staat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1026
+#: ../libpurple/protocols/jabber/jabber.c:1056
 msgid "Postal code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1030
+#: ../libpurple/protocols/jabber/jabber.c:1060
 #: ../libpurple/protocols/silc/ops.c:1049
-#: ../libpurple/protocols/silc/silc.c:988
+#: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/silc.c:708
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1072
 msgid "Unregister"
-msgstr "Registratie Ongedaan Maken"
+msgstr "Registratie ongedaan maken"
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr "Vul alstublieft onderstaand formulier in om je account te veranderen."
+#: ../libpurple/protocols/jabber/jabber.c:1079
+msgid "Please fill out the information below to change your account registration."
+msgstr "Vul onderstaand formulier in om je account te veranderen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1082
 msgid "Please fill out the information below to register your new account."
-msgstr ""
-"Vul alstublieft onderstaand formulier in om uw nieuwe account te registreren."
+msgstr "Vul onderstaand formulier in om uw nieuwe account te registreren."
 
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1061
+#: ../libpurple/protocols/jabber/jabber.c:1090
+#: ../libpurple/protocols/jabber/jabber.c:1091
 msgid "Register New XMPP Account"
 msgstr "Registreer Nieuw XMPP-account"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1071
+#: ../libpurple/protocols/jabber/jabber.c:1092
+#: ../libpurple/protocols/jabber/jabber.c:1101
 msgid "Register"
 msgstr "Registreren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1067
+#: ../libpurple/protocols/jabber/jabber.c:1097
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Gebruikersinformatie Aanpassen voor %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
+#: ../libpurple/protocols/jabber/jabber.c:1098
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Nieuw Account op %s registreren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1071
+#: ../libpurple/protocols/jabber/jabber.c:1101
 msgid "Change Registration"
 msgstr "Verander Registratie: "
 
-#: ../libpurple/protocols/jabber/jabber.c:1180
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1210
+#: ../libpurple/protocols/jabber/jabber.c:1211
 msgid "Error unregistering account"
 msgstr "Fout bij het ongedaan maken van de registratie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1186
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/jabber/jabber.c:1217
 msgid "Account successfully unregistered"
 msgstr "Het registreren van het account is succesvol ongedaan gemaakt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1351
+#: ../libpurple/protocols/jabber/jabber.c:1384
 msgid "Initializing Stream"
 msgstr "Starten van datastroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1356
+#: ../libpurple/protocols/jabber/jabber.c:1389
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS Initialiseren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1360
-#: ../libpurple/protocols/msn/session.c:422
+#: ../libpurple/protocols/jabber/jabber.c:1393
+#: ../libpurple/protocols/msn/session.c:415
 #: ../libpurple/protocols/msnp9/session.c:374
 msgid "Authenticating"
 msgstr "Naam en wachtwoord worden gecontroleerd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1402
 msgid "Re-initializing Stream"
 msgstr "Herstarten van datastroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1463
-#: ../libpurple/protocols/jabber/jabber.c:1921
-#: ../libpurple/protocols/jabber/jabber.c:1964
-#: ../libpurple/protocols/jabber/jabber.c:2002
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1996
+#: ../libpurple/protocols/jabber/jabber.c:2034
+#: ../libpurple/protocols/oscar/oscar.c:897
+#: ../libpurple/protocols/oscar/oscar.c:5807
 msgid "Not Authorized"
 msgstr "Geen toestemming"
 
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1513
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "From (To pending)"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "From"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "To"
 msgstr "Aan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "None (To pending)"
 msgstr "Geen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1554
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Niet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1557
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/jabber.c:1641
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/jabber/jabber.c:1669
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1659
+#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/protocols/jabber/jabber.c:1701
 #: ../libpurple/protocols/jabber/usermood.c:181
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1225
-#: ../libpurple/protocols/silc10/buddy.c:1560
+#: ../libpurple/protocols/silc10/buddy.c:1572
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Stemming"
 
-#: ../libpurple/protocols/jabber/jabber.c:1547
-#: ../libpurple/protocols/msn/msn.c:656
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/msn/msn.c:748
 msgid "Now Listening"
 msgstr "Aan het Luisteren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/jabber.c:1656
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1646
+#: ../libpurple/protocols/jabber/jabber.c:1660
+#: ../libpurple/protocols/jabber/jabber.c:1674
+#: ../libpurple/protocols/jabber/jabber.c:1688
+#: ../libpurple/protocols/jabber/jabber.c:1702
 msgid "Mood Text"
 msgstr "Humeur Tekst"
 
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
-#: ../libpurple/protocols/jabber/jabber.c:1644
-#: ../libpurple/protocols/jabber/jabber.c:1658
-#: ../libpurple/protocols/jabber/jabber.c:1672
+#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/jabber/jabber.c:1662
+#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1704
 msgid "Allow Buzz"
 msgstr "Trillen Toestaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Tune Artist"
 msgstr "Artiest"
 
-#: ../libpurple/protocols/jabber/jabber.c:1691
+#: ../libpurple/protocols/jabber/jabber.c:1723
 msgid "Tune Title"
 msgstr "Titel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1692
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Tune Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/jabber/jabber.c:1693
+#: ../libpurple/protocols/jabber/jabber.c:1725
 msgid "Tune Genre"
 msgstr "Genre"
 
-#: ../libpurple/protocols/jabber/jabber.c:1694
+#: ../libpurple/protocols/jabber/jabber.c:1726
 msgid "Tune Comment"
 msgstr "Opmerking"
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1727
 msgid "Tune Track"
 msgstr "Track"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Tune Time"
 msgstr "Tijd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1697
+#: ../libpurple/protocols/jabber/jabber.c:1729
 msgid "Tune Year"
 msgstr "Jaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1698
+#: ../libpurple/protocols/jabber/jabber.c:1730
 msgid "Tune URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1746
 msgid "Password Changed"
 msgstr "Wachtwoord veranderd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1715
+#: ../libpurple/protocols/jabber/jabber.c:1747
 msgid "Your password has been changed."
 msgstr "Wachtwoord is veranderd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/jabber/jabber.c:1753
+#: ../libpurple/protocols/jabber/jabber.c:1754
 msgid "Error changing password"
 msgstr "Fout bij veranderen van wachtwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1779
+#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "Password (again)"
 msgstr "Nieuw wachtwoord (herhalen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1785
-#: ../libpurple/protocols/jabber/jabber.c:1786
+#: ../libpurple/protocols/jabber/jabber.c:1817
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "Change XMPP Password"
 msgstr "Veranderen XMPP-wachtwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1786
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "Please enter your new password"
 msgstr "Vul uw nieuwe wachtwoord in"
 
-#: ../libpurple/protocols/jabber/jabber.c:1800
-#: ../libpurple/protocols/oscar/oscar.c:6504
-#: ../libpurple/protocols/silc/silc.c:1309
-#: ../libpurple/protocols/silc10/silc.c:1010
+#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/oscar/oscar.c:6591
+#: ../libpurple/protocols/silc/silc.c:1328
+#: ../libpurple/protocols/silc10/silc.c:1029
 msgid "Set User Info..."
 msgstr "Gebruikersinfo instellen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1805
-#: ../libpurple/protocols/oscar/oscar.c:6515
-#: ../libpurple/protocols/silc/silc.c:1305
-#: ../libpurple/protocols/silc10/silc.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1837
+#: ../libpurple/protocols/oscar/oscar.c:6602
+#: ../libpurple/protocols/silc/silc.c:1324
+#: ../libpurple/protocols/silc10/silc.c:1025
 msgid "Change Password..."
 msgstr "Wachtwoord veranderen..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1842
 msgid "Search for Users..."
 msgstr "Zoeken naar gebruikers..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1901
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Bad Request"
 msgstr "Slechte aanvraag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1905
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Feature Not Implemented"
 msgstr "Feature niet geïmplementeerd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Forbidden"
 msgstr "Verboden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Gone"
 msgstr "Weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
-#: ../libpurple/protocols/jabber/jabber.c:1992
+#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:2024
 msgid "Internal Server Error"
 msgstr "Interne serverfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
+#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "Item Not Found"
 msgstr "Item niet gevonden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1915
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Malformed XMPP ID"
 msgstr "Ongeldig XMMP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1917
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Not Acceptable"
 msgstr "Onacceptabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1919
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Not Allowed"
 msgstr "Niet toegestaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1923
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Payment Required"
 msgstr "Betaling vereist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Recipient Unavailable"
 msgstr "Ontvanger niet beschikbaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Registration Required"
 msgstr "Registratie vereist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Remote Server Not Found"
 msgstr "Server niet gevonden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Remote Server Timeout"
 msgstr "Timeout op server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "Server Overloaded"
 msgstr "Server te zwaar belast"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Service Unavailable"
 msgstr "Service niet beschikbaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Subscription Required"
 msgstr "Abonnement vereist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Unexpected Request"
 msgstr "Onverwachte aanvraag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Authorization Aborted"
 msgstr "Aanmelding afgebroken"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Incorrect encoding in authorization"
 msgstr "Onjuiste codering bij aanmelding"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Invalid Authorization Mechanism"
 msgstr "Ongeldig mechanisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
+#: ../libpurple/protocols/jabber/jabber.c:1990
 msgid "Authorization mechanism too weak"
 msgstr "Mechanisme te onveilig"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
+#: ../libpurple/protocols/jabber/jabber.c:1998
 msgid "Temporary Authentication Failure"
 msgstr "Tijdelijk identificatieprobleem"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:2001
 msgid "Authentication Failure"
 msgstr "Identificatie mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1977
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Bad Format"
 msgstr "Slecht formaat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1979
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "Bad Namespace Prefix"
 msgstr "Slechte namespace"
 
-#: ../libpurple/protocols/jabber/jabber.c:1982
+#: ../libpurple/protocols/jabber/jabber.c:2014
 msgid "Resource Conflict"
 msgstr "Bronconflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
-#: ../libpurple/protocols/silc/silc.c:350
+#: ../libpurple/protocols/jabber/jabber.c:2016
+#: ../libpurple/protocols/silc/silc.c:351
 #: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Verbinding verlopen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1986
+#: ../libpurple/protocols/jabber/jabber.c:2018
 msgid "Host Gone"
 msgstr "Host verdwenen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1988
+#: ../libpurple/protocols/jabber/jabber.c:2020
 msgid "Host Unknown"
 msgstr "Host onbekend"
 
-#: ../libpurple/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/jabber.c:2022
 msgid "Improper Addressing"
 msgstr "Ongeldige adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1994
+#: ../libpurple/protocols/jabber/jabber.c:2026
 msgid "Invalid ID"
 msgstr "Ongeldig ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1996
+#: ../libpurple/protocols/jabber/jabber.c:2028
 msgid "Invalid Namespace"
 msgstr "Ongeldige omgeving"
 
-#: ../libpurple/protocols/jabber/jabber.c:1998
+#: ../libpurple/protocols/jabber/jabber.c:2030
 msgid "Invalid XML"
 msgstr "Ongeldige XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/jabber.c:2032
 msgid "Non-matching Hosts"
 msgstr "Niet overeenkomende computers"
 
-#: ../libpurple/protocols/jabber/jabber.c:2004
+#: ../libpurple/protocols/jabber/jabber.c:2036
 msgid "Policy Violation"
 msgstr "Schending van beleid"
 
-#: ../libpurple/protocols/jabber/jabber.c:2006
+#: ../libpurple/protocols/jabber/jabber.c:2038
 msgid "Remote Connection Failed"
 msgstr "Verbinding mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:2008
+#: ../libpurple/protocols/jabber/jabber.c:2040
 msgid "Resource Constraint"
 msgstr "Beperkte bronnen beschikbaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
+#: ../libpurple/protocols/jabber/jabber.c:2042
 msgid "Restricted XML"
 msgstr "Strikte XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2012
+#: ../libpurple/protocols/jabber/jabber.c:2044
 msgid "See Other Host"
 msgstr "Zie Andere Host"
 
-#: ../libpurple/protocols/jabber/jabber.c:2014
+#: ../libpurple/protocols/jabber/jabber.c:2046
 msgid "System Shutdown"
 msgstr "Systeem wordt uitgeschakeld"
 
-#: ../libpurple/protocols/jabber/jabber.c:2016
+#: ../libpurple/protocols/jabber/jabber.c:2048
 msgid "Undefined Condition"
 msgstr "Ongedefnieerde voorwaarde"
 
-#: ../libpurple/protocols/jabber/jabber.c:2018
+#: ../libpurple/protocols/jabber/jabber.c:2050
 msgid "Unsupported Encoding"
 msgstr "Codering niet ondersteund"
 
-#: ../libpurple/protocols/jabber/jabber.c:2020
+#: ../libpurple/protocols/jabber/jabber.c:2052
 msgid "Unsupported Stanza Type"
 msgstr "Stanzatype niet ondersteund"
 
-#: ../libpurple/protocols/jabber/jabber.c:2022
+#: ../libpurple/protocols/jabber/jabber.c:2054
 msgid "Unsupported Version"
 msgstr "Versie niet ondersteund"
 
-#: ../libpurple/protocols/jabber/jabber.c:2024
+#: ../libpurple/protocols/jabber/jabber.c:2056
 msgid "XML Not Well Formed"
 msgstr "XML niet goed van structuur"
 
-#: ../libpurple/protocols/jabber/jabber.c:2026
+#: ../libpurple/protocols/jabber/jabber.c:2058
 msgid "Stream Error"
 msgstr "Stream-fout"
 
-#: ../libpurple/protocols/jabber/jabber.c:2111
+#: ../libpurple/protocols/jabber/jabber.c:2143
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan gebruiker %s niet verbannen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2131
+#: ../libpurple/protocols/jabber/jabber.c:2163
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Onbekende relatie: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2136
+#: ../libpurple/protocols/jabber/jabber.c:2168
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan relatie van %s niet instellen als \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2155
+#: ../libpurple/protocols/jabber/jabber.c:2187
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Onbekende rol: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2160
+#: ../libpurple/protocols/jabber/jabber.c:2192
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kan de rol \"%s\" niet aangeven voor gebruiker: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2245
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kan gebruiker %s niet schoppen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2244
+#: ../libpurple/protocols/jabber/jabber.c:2276
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kan gebruiker %s niet pingen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2262
-#: ../libpurple/protocols/jabber/jabber.c:2273
+#: ../libpurple/protocols/jabber/jabber.c:2294
+#: ../libpurple/protocols/jabber/jabber.c:2305
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Trillen niet mogelijk, omdat er niets bekend is over gebruiker %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2268
+#: ../libpurple/protocols/jabber/jabber.c:2300
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Trillen niet mogelijk, omdar gebruiker %s offline zou kunnen zijn."
 
-#: ../libpurple/protocols/jabber/jabber.c:2299
+#: ../libpurple/protocols/jabber/jabber.c:2331
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Trillen niet mogelijk, omdat de gebruiker %s het niet ondersteund."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/yahoo/yahoo.c:4167
+#: ../libpurple/protocols/jabber/jabber.c:2351
+#: ../libpurple/protocols/yahoo/yahoo.c:4174
 msgid "Buzz"
 msgstr "Trill"
 
-#: ../libpurple/protocols/jabber/jabber.c:2320
+#: ../libpurple/protocols/jabber/jabber.c:2352
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
+#: ../libpurple/protocols/yahoo/yahoo.c:4175
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s heeft je laten trillen!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2320
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
+#: ../libpurple/protocols/jabber/jabber.c:2352
+#: ../libpurple/protocols/yahoo/yahoo.c:4175
 #, c-format
 msgid "Buzzing %s..."
 msgstr "%s aan het laten trillen..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2351
+#: ../libpurple/protocols/jabber/jabber.c:2383
 msgid "config:  Configure a chat room."
 msgstr "config:  Chatruimte instellen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2387
 msgid "configure:  Configure a chat room."
 msgstr "configure: Chatruimte instellen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2364
+#: ../libpurple/protocols/jabber/jabber.c:2396
 msgid "part [room]:  Leave the room."
 msgstr "part [ruimte]:  Ruimte verlaten."
 
-#: ../libpurple/protocols/jabber/jabber.c:2369
+#: ../libpurple/protocols/jabber/jabber.c:2401
 msgid "register:  Register with a chat room."
 msgstr "register:  Registreren bij een chatruimte."
 
-#: ../libpurple/protocols/jabber/jabber.c:2375
+#: ../libpurple/protocols/jabber/jabber.c:2407
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nieuw onderwerp]:  Het onderwerp weergeven of veranderen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2381
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:2413
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;bijnaam&gt; [ruimte]:  Een gebruiker uit een ruimte verbannen."
+msgstr "ban &lt;gebruiker&gt; [reden]:  Een gebruiker uit een ruimte verbannen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2387
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;naam&gt; &lt;owner|admin|member|outcast|none&gt;:Relatie tot "
-"een ruimte/kanaal instellen."
+#: ../libpurple/protocols/jabber/jabber.c:2419
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;naam&gt; &lt;owner|admin|member|outcast|none&gt;:Relatie tot een ruimte/kanaal instellen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2393
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;naam&gt; &lt;moderator|participant|visitor|none&gt;:Rol van "
-"gebruiker in de ruimte instellen"
+#: ../libpurple/protocols/jabber/jabber.c:2425
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;naam&gt; &lt;moderator|participant|visitor|none&gt;:Rol van gebruiker in de ruimte instellen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2399
+#: ../libpurple/protocols/jabber/jabber.c:2431
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-"invite &lt;gebruiker&gt; [bericht]:  Een gebruiker uitnodigen in een ruimte."
+msgstr "invite &lt;gebruiker&gt; [bericht]:  Een gebruiker uitnodigen in een ruimte."
 
-#: ../libpurple/protocols/jabber/jabber.c:2405
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:2437
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr ""
-"join: &lt;ruimte&gt; [server]:  Meedoen aan een chatruimte op deze server."
+msgstr "deelnemen: &lt;ruimte&gt; [wachtwoord]:  Deelnemen aan een chatruimte op deze server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2411
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:2443
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;bijnaam&gt; [ruimte]:  Een gebruiker uit een ruimte schoppen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2416
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
-"gebruiker."
+#: ../libpurple/protocols/jabber/jabber.c:2448
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een gebruiker."
 
-#: ../libpurple/protocols/jabber/jabber.c:2422
+#: ../libpurple/protocols/jabber/jabber.c:2454
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPing een gebruiker/component/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2427
-#: ../libpurple/protocols/yahoo/yahoo.c:4191
+#: ../libpurple/protocols/jabber/jabber.c:2459
+#: ../libpurple/protocols/yahoo/yahoo.c:4198
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Een contact buzzen om de aandacht te krijgen"
 
@@ -6464,24 +6670,25 @@ msgid "XMPP Protocol Plugin"
 msgstr "XMPP-protocol plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../pidgin/gtkaccount.c:532
 msgid "Domain"
 msgstr "Domein"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Require SSL/TLS"
 msgstr "SSL/TLS Vereist"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Force old (port 5223) SSL"
 msgstr "Oude SSL (poort 5223) forceren"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
+#: ../libpurple/protocols/jabber/libxmpp.c:223
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tekstaanmelding over ongecodeerde datastroom toestaan"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3475
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3492
 #: ../libpurple/protocols/simple/simple.c:2121
 msgid "Connect port"
 msgstr "Poort"
@@ -6489,14 +6696,15 @@ msgstr "Poort"
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3472
-#: ../libpurple/protocols/silc/silc.c:2139
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:811
+#: ../libpurple/protocols/jabber/libxmpp.c:232
+#: ../libpurple/protocols/myspace/myspace.c:3489
+#: ../libpurple/protocols/silc/silc.c:2177
+#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../pidgin/gtkaccount.c:865
 msgid "Connect server"
 msgstr "Verbinden met server"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
+#: ../libpurple/protocols/jabber/libxmpp.c:237
 msgid "File transfer proxies"
 msgstr "Bestandsoverdracht poortnummer"
 
@@ -6531,10 +6739,10 @@ msgstr "XMPP Bericht-fout"
 
 #: ../libpurple/protocols/jabber/message.c:414
 #, c-format
-msgid " (Code %s)"
-msgstr " (code %s)"
+msgid "(Code %s)"
+msgstr "(Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
+#: ../libpurple/protocols/jabber/parser.c:219
 msgid "XML Parse error"
 msgstr "XML analysefout"
 
@@ -6548,12 +6756,8 @@ msgid "Create New Room"
 msgstr "Nieuwe ruimte maken"
 
 #: ../libpurple/protocols/jabber/presence.c:536
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"U bent een nieuwe ruimte aan het maken. Wilt u deze instellen, of de "
-"standaardinstellingen gebruiken?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "U bent een nieuwe ruimte aan het maken. Wilt u deze instellen, of de standaardinstellingen gebruiken?"
 
 #: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
@@ -6565,59 +6769,53 @@ msgstr "_Standaardinstellingen gebruiken"
 
 #: ../libpurple/protocols/jabber/presence.c:585
 #, c-format
-msgid "Error in chat %s"
-msgstr "Fout in chat: %s"
-
-#: ../libpurple/protocols/jabber/presence.c:589
-#, c-format
 msgid "Error joining chat %s"
 msgstr "Fout bij meedoen aan chat: %s"
 
-#: ../libpurple/protocols/jabber/si.c:1013
+#: ../libpurple/protocols/jabber/presence.c:588
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fout in chat: %s"
+
+#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"Kan bestand niet verzenden naar %s. De gebruiker ondersteunt geen "
-"bestandsoverdracht"
+msgstr "Kan bestand niet verzenden naar %s. De gebruiker ondersteunt geen bestandsoverdracht"
 
-#: ../libpurple/protocols/jabber/si.c:1014
-#: ../libpurple/protocols/jabber/si.c:1015
-#: ../libpurple/protocols/jabber/si.c:1084
+#: ../libpurple/protocols/jabber/si.c:1010
+#: ../libpurple/protocols/jabber/si.c:1011
+#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Bestanden verzenden mislukt"
 
-#: ../libpurple/protocols/jabber/si.c:1077
+#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kan bestand niet verzenden naar %s, ongeldige JID"
 
-#: ../libpurple/protocols/jabber/si.c:1079
+#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kan bestand niet verzenden naar %s, gebruiker is niet online"
 
-#: ../libpurple/protocols/jabber/si.c:1081
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"Kan bestand niet verzenden naar %s, niet aangemeld bij gebruikers-"
-"aanwezigheid."
+msgstr "Kan bestand niet verzenden naar %s, niet aangemeld bij gebruikers-aanwezigheid."
 
-#: ../libpurple/protocols/jabber/si.c:1096
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/si.c:1092
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr ""
-"Geef alstublieft de gebruikersnaam van de persoon waarvan u de informatie "
-"wilt opvragen."
+msgstr "Geef de bron van %s naar degene wie je een bestand wil sturen"
 
-#: ../libpurple/protocols/jabber/si.c:1112
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
-msgstr "Kies een Bron"
+msgstr "Kies een bron"
 
 #: ../libpurple/protocols/jabber/usermood.c:194
 #: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
-msgstr "Humeur Instellen"
+msgstr "Humeur instellen"
 
 #: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
@@ -6630,37 +6828,33 @@ msgstr "Instellen"
 
 #: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
-msgstr "Humeur Instellen..."
+msgstr "Humeur instellen..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
-msgstr "Bijnaam Instellen"
+msgstr "Bijnaam instellen"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Voer een nieuwe bijnaam in."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-"Deze informatie is zichtbaar voor alle contacten in je contactenlijst, dus "
-"kies iets passends."
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr "Deze informatie is zichtbaar voor alle contacten in je contactenlijst, dus kies iets passends."
 
 #: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "Bijnaam Instellen..."
+msgstr "Bijnaam instellen..."
 
-#: ../libpurple/protocols/jabber/xdata.c:381
+#: ../libpurple/protocols/jabber/xdata.c:379
 msgid "Actions"
 msgstr "Acties"
 
-#: ../libpurple/protocols/jabber/xdata.c:383
+#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Select an action"
 msgstr "Selecteer een actie"
 
-#: ../libpurple/protocols/msn/contact.c:782
+#: ../libpurple/protocols/msn/contact.c:790
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Ophalen MSN Adressenlijst niet mogelijk"
 
@@ -6673,21 +6867,14 @@ msgstr "Synchronisatieprobleem in contactenlijst van %s (%s)"
 #: ../libpurple/protocols/msn/dialog.c:124
 #: ../libpurple/protocols/msnp9/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 is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. "
-"Wilt u deze toevoegen?"
+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 is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. Wilt u deze toevoegen?"
 
 #: ../libpurple/protocols/msn/dialog.c:132
 #: ../libpurple/protocols/msnp9/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 is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
 
 #: ../libpurple/protocols/msn/error.c:36
 #: ../libpurple/protocols/msnp9/error.c:36
@@ -6702,7 +6889,7 @@ msgstr "Syntaxfout (waarschijnlijk een client-bug)"
 #: ../libpurple/protocols/msn/error.c:46
 #: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid email address"
-msgstr "Ongeldig email adres"
+msgstr "Ongeldig e-mailadres"
 
 #: ../libpurple/protocols/msn/error.c:49
 #: ../libpurple/protocols/msnp9/error.c:49
@@ -6746,7 +6933,7 @@ msgstr "Niet in de lijst"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:760
+#: ../libpurple/protocols/zephyr/zephyr.c:759
 msgid "User is offline"
 msgstr "Gebruiker is off-line"
 
@@ -6812,7 +6999,7 @@ msgstr "Te veel resultaten bij zoekopdracht"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "Niet aangemeld"
 
@@ -6932,10 +7119,11 @@ msgstr "Server te druk bezig"
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1422
-#: ../libpurple/protocols/silc/silc.c:338
+#: ../libpurple/protocols/oscar/oscar.c:1538
+#: ../libpurple/protocols/silc/silc.c:339
 #: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
+#: ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1451
 msgid "Authentication failed"
 msgstr "Identificatie mislukt"
 
@@ -6974,121 +7162,159 @@ msgstr "Onbekende foutcode %d"
 #: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN Fout: %s\n"
+msgstr "MSN-fout: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
+#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msnp9/msn.c:137
 msgid "Nudge"
 msgstr "Aanstoten"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:138
+#: ../libpurple/protocols/msnp9/msn.c:138
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s heeft je aangestoten"
+msgstr "%s heeft je aangestoten!"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:138
+#: ../libpurple/protocols/msnp9/msn.c:138
 #, c-format
 msgid "Nudging %s..."
 msgstr "%s Aanstoten..."
 
-#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
+#: ../libpurple/protocols/msn/msn.c:151
+#: ../libpurple/protocols/msnp9/msn.c:151
+#: ../libpurple/protocols/myspace/myspace.c:2462
+msgid "Email Address..."
+msgstr "E-mailadres ..."
+
+#: ../libpurple/protocols/msn/msn.c:190
+#: ../libpurple/protocols/msnp9/msn.c:190
 msgid "Your new MSN friendly name is too long."
-msgstr "Uw nieuwe MSN bijnaam is te lang."
+msgstr "Uw nieuwe MSN-bijnaam is te lang."
 
-#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
+#: ../libpurple/protocols/msn/msn.c:316
+#: ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your friendly name."
 msgstr "Bijnaam instellen."
 
-#: ../libpurple/protocols/msn/msn.c:297 ../libpurple/protocols/msnp9/msn.c:280
+#: ../libpurple/protocols/msn/msn.c:317
+#: ../libpurple/protocols/msnp9/msn.c:299
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dit is de naam die uw contacten zullen zien."
 
-#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:317
 msgid "Set your home phone number."
 msgstr "Telefoonnummer voor thuis instellen."
 
-#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
+#: ../libpurple/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msnp9/msn.c:334
 msgid "Set your work phone number."
 msgstr "Telefoonnummer voor werk instellen."
 
-#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
+#: ../libpurple/protocols/msn/msn.c:369
+#: ../libpurple/protocols/msnp9/msn.c:351
 msgid "Set your mobile phone number."
 msgstr "Mobiel telefoonnummer instellen."
 
-#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:384
+#: ../libpurple/protocols/msnp9/msn.c:366
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN-mobile oproepen toestaan?"
 
-#: ../libpurple/protocols/msn/msn.c:365 ../libpurple/protocols/msnp9/msn.c:348
-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 ""
-"Wilt u dat mensen op uw contactenlijst MSN-mobile oproepen kunnen sturen "
-"naar uw mobiele telefoon of ander mobiel apparaat?"
+#: ../libpurple/protocols/msn/msn.c:385
+#: ../libpurple/protocols/msnp9/msn.c:367
+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 "Wilt u dat mensen op uw contactenlijst MSN-mobile oproepen kunnen sturen naar uw mobiele telefoon of ander mobiel apparaat?"
 
-#: ../libpurple/protocols/msn/msn.c:371 ../libpurple/protocols/msnp9/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:391
+#: ../libpurple/protocols/msnp9/msn.c:373
 msgid "Allow"
 msgstr "Toestaan"
 
-#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:392
+#: ../libpurple/protocols/msnp9/msn.c:374
 msgid "Disallow"
 msgstr "Weigeren"
 
-#: ../libpurple/protocols/msn/msn.c:388 ../libpurple/protocols/msnp9/msn.c:371
-msgid "This Hotmail account may not be active."
-msgstr "Dit hotmailaccount is misschien niet in gebruik."
+#: ../libpurple/protocols/msn/msn.c:407
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Geblokkeerde tekst %s"
+
+#: ../libpurple/protocols/msn/msn.c:409
+msgid "No text is blocked for this account."
+msgstr "Bij dit account is er geen tekst geblokkeerd"
+
+#: ../libpurple/protocols/msn/msn.c:412
+#, c-format
+msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN-servers blokkeren momenteel de volgende reguliere expressies: <br/>%s"
+
+#: ../libpurple/protocols/msn/msn.c:433
+msgid "This account does not have email enabled."
+msgstr "Dit hotmailaccount heeft geen ingeschakelde e-mail."
 
-#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
+#: ../libpurple/protocols/msn/msn.c:473
+#: ../libpurple/protocols/msnp9/msn.c:416
 msgid "Send a mobile message."
 msgstr "Een mobiel bericht versturen."
 
-#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
+#: ../libpurple/protocols/msn/msn.c:475
+#: ../libpurple/protocols/msnp9/msn.c:418
 msgid "Page"
 msgstr "Versturen (mobiel)"
 
-#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
+#: ../libpurple/protocols/msn/msn.c:771
+#: ../libpurple/protocols/msnp9/msn.c:586
 msgid "Home Phone Number"
-msgstr "Telefoonnummer Thuis"
+msgstr "Telefoonnummer thuis"
 
-#: ../libpurple/protocols/msn/msn.c:683 ../libpurple/protocols/msnp9/msn.c:571
+#: ../libpurple/protocols/msn/msn.c:775
+#: ../libpurple/protocols/msnp9/msn.c:590
 msgid "Work Phone Number"
-msgstr "Telefoonnummer Werk"
+msgstr "Telefoonnummer werk"
 
-#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msnp9/msn.c:575
+#: ../libpurple/protocols/msn/msn.c:779
+#: ../libpurple/protocols/msnp9/msn.c:594
 msgid "Mobile Phone Number"
-msgstr "Telefoonnummer Mobiel"
+msgstr "Telefoonnummer mobiel"
 
-#: ../libpurple/protocols/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:594
+#: ../libpurple/protocols/msn/msn.c:802
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:613
 #: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3141
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "Be Right Back"
 msgstr "Ben zo terug"
 
-#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:598
+#: ../libpurple/protocols/msn/msn.c:808
+#: ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:617
 #: ../libpurple/protocols/msnp9/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:48
+#: ../libpurple/protocols/yahoo/yahoo.c:3143
+#: ../libpurple/protocols/yahoo/yahoo.c:3837
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../libpurple/protocols/yahoo/yahoo.c:3842
+#: ../libpurple/protocols/msn/msn.c:813
+#: ../libpurple/protocols/msnp9/msn.c:621
+#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3849
 msgid "On the Phone"
 msgstr "Aan de telefoon"
 
-#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3148
-#: ../libpurple/protocols/yahoo/yahoo.c:3848
+#: ../libpurple/protocols/msn/msn.c:818
+#: ../libpurple/protocols/msnp9/msn.c:625
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3855
 msgid "Out to Lunch"
 msgstr "Aan het lunchen"
 
@@ -7098,360 +7324,375 @@ msgstr "Aan het lunchen"
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:745
+#: ../libpurple/protocols/msn/msn.c:837
 #: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Artiest"
 
-#: ../libpurple/protocols/msn/msn.c:746
+#: ../libpurple/protocols/msn/msn.c:838
 msgid "Album"
-msgstr "lAbum"
+msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
+#: ../libpurple/protocols/msn/msn.c:852
+#: ../libpurple/protocols/msnp9/msn.c:653
 msgid "Set Friendly Name..."
 msgstr "Bijnaam instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
+#: ../libpurple/protocols/msn/msn.c:857
+#: ../libpurple/protocols/msnp9/msn.c:658
 msgid "Set Home Phone Number..."
 msgstr "Telefoon thuis instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:861
+#: ../libpurple/protocols/msnp9/msn.c:662
 msgid "Set Work Phone Number..."
 msgstr "Telefoon werk instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:865
+#: ../libpurple/protocols/msnp9/msn.c:666
 msgid "Set Mobile Phone Number..."
 msgstr "Mobiel nummer instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:871
+#: ../libpurple/protocols/msnp9/msn.c:672
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobiele apparaten inschakelen/uitschakelen..."
 
-#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:876
+#: ../libpurple/protocols/msnp9/msn.c:677
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobiele oproepen toestaan/weigeren..."
 
-#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
+#: ../libpurple/protocols/msn/msn.c:883
+msgid "View Blocked Text..."
+msgstr "Geblokkeerde tekst bekijken"
+
+#: ../libpurple/protocols/msn/msn.c:889
+#: ../libpurple/protocols/msnp9/msn.c:688
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail-inbox openen"
 
-#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
+#: ../libpurple/protocols/msn/msn.c:912
+#: ../libpurple/protocols/msnp9/msn.c:712
 msgid "Send to Mobile"
 msgstr "Verzenden naar mobiel"
 
-#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:922
+#: ../libpurple/protocols/msnp9/msn.c:722
 #: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "_Chat starten"
 
-#: ../libpurple/protocols/msn/msn.c:871 ../libpurple/protocols/msnp9/msn.c:742
+#: ../libpurple/protocols/msn/msn.c:960
+#: ../libpurple/protocols/msnp9/msn.c:761
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek."
 
-#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
+#: ../libpurple/protocols/msn/msn.c:991
+#: ../libpurple/protocols/msnp9/msn.c:792
 msgid "Failed to connect to server."
 msgstr "Kan geen verbinding maken met de server."
 
-#: ../libpurple/protocols/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
-#: ../libpurple/protocols/msnp9/msn.c:1526
-#: ../libpurple/protocols/msnp9/msn.c:1869
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
+#: ../libpurple/protocols/msn/msn.c:1899
+#: ../libpurple/protocols/msn/msn.c:2242
+#: ../libpurple/protocols/msnp9/msn.c:1655
+#: ../libpurple/protocols/msnp9/msn.c:1998
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:809
 msgid "Error retrieving profile"
 msgstr "Fout bij ophalen van profiel"
 
-#: ../libpurple/protocols/msn/msn.c:1751
-#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
+#: ../libpurple/protocols/msn/msn.c:1965
+#: ../libpurple/protocols/msnp9/msn.c:1721
+#: ../pidgin/plugins/convcolors.c:371
 #: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Algemeen"
 
-#: ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msnp9/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1728
 #: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
+#: ../libpurple/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:262
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1084
 msgid "Age"
 msgstr "Leeftijd"
 
-#: ../libpurple/protocols/msn/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1601
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/msn/msn.c:1974
+#: ../libpurple/protocols/msnp9/msn.c:1730
+#: ../libpurple/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1099
 msgid "Occupation"
 msgstr "Beroep"
 
-#: ../libpurple/protocols/msn/msn.c:1761
-#: ../libpurple/protocols/msnp9/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1975
+#: ../libpurple/protocols/msnp9/msn.c:1731
 #: ../libpurple/protocols/myspace/user.c:133
 #: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
-#: ../libpurple/protocols/zephyr/zephyr.c:802
-#: ../libpurple/protocols/zephyr/zephyr.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1079
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1179
 msgid "Location"
-msgstr "Lokatie"
-
-#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
-#: ../libpurple/protocols/msnp9/msn.c:1607
-#: ../libpurple/protocols/msnp9/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1812
+msgstr "Locatie"
+
+#: ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msn/msn.c:2172
+#: ../libpurple/protocols/msn/msn.c:2178
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1928
+#: ../libpurple/protocols/msnp9/msn.c:1934
+#: ../libpurple/protocols/msnp9/msn.c:1941
 msgid "Hobbies and Interests"
 msgstr "Hobbies en interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
-#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
-#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msnp9/msn.c:1613
-#: ../libpurple/protocols/msnp9/msn.c:1733
-#: ../libpurple/protocols/msnp9/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1754
-#: ../libpurple/protocols/msnp9/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1986
+#: ../libpurple/protocols/msn/msn.c:2106
+#: ../libpurple/protocols/msn/msn.c:2112
+#: ../libpurple/protocols/msn/msn.c:2119
+#: ../libpurple/protocols/msn/msn.c:2127
+#: ../libpurple/protocols/msn/msn.c:2134
+#: ../libpurple/protocols/msnp9/msn.c:1742
+#: ../libpurple/protocols/msnp9/msn.c:1862
+#: ../libpurple/protocols/msnp9/msn.c:1868
+#: ../libpurple/protocols/msnp9/msn.c:1875
+#: ../libpurple/protocols/msnp9/msn.c:1883
+#: ../libpurple/protocols/msnp9/msn.c:1890
 msgid "A Little About Me"
 msgstr "Enige info over mij"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:2003
+#: ../libpurple/protocols/msnp9/msn.c:1759
 msgid "Social"
 msgstr "Sociaal"
 
-#: ../libpurple/protocols/msn/msn.c:1791
-#: ../libpurple/protocols/msnp9/msn.c:1632
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/msn/msn.c:2005
+#: ../libpurple/protocols/msnp9/msn.c:1761
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
 msgid "Marital Status"
 msgstr "Burgerlijke status"
 
-#: ../libpurple/protocols/msn/msn.c:1792
-#: ../libpurple/protocols/msnp9/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/msnp9/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1763
 msgid "Pets"
 msgstr "Huisdieren"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1764
 msgid "Hometown"
 msgstr "Woonplaats"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:2009
+#: ../libpurple/protocols/msnp9/msn.c:1765
 msgid "Places Lived"
 msgstr "Vroegere woonplaatsen"
 
-#: ../libpurple/protocols/msn/msn.c:1796
-#: ../libpurple/protocols/msnp9/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:2010
+#: ../libpurple/protocols/msnp9/msn.c:1766
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msnp9/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:2011
+#: ../libpurple/protocols/msnp9/msn.c:1767
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1768
 msgid "Music"
 msgstr "Muziek"
 
-#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msn/msn.c:1986
-#: ../libpurple/protocols/msnp9/msn.c:1640
-#: ../libpurple/protocols/msnp9/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
+#: ../libpurple/protocols/msn/msn.c:2013
+#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2200
+#: ../libpurple/protocols/msnp9/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1950
+#: ../libpurple/protocols/msnp9/msn.c:1956
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1141
 msgid "Favorite Quote"
 msgstr "Favoriete citaat"
 
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msnp9/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:2030
+#: ../libpurple/protocols/msnp9/msn.c:1786
 msgid "Contact Info"
 msgstr "Accountinformatie"
 
-#: ../libpurple/protocols/msn/msn.c:1817
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:2031
+#: ../libpurple/protocols/msnp9/msn.c:1787
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../libpurple/protocols/msn/msn.c:1820
-#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msn/msn.c:2034
+#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Significant Other"
 msgstr "Partner"
 
-#: ../libpurple/protocols/msn/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:2035
+#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Home Phone"
 msgstr "Thuis telefoon"
 
-#: ../libpurple/protocols/msn/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1663
+#: ../libpurple/protocols/msn/msn.c:2036
+#: ../libpurple/protocols/msnp9/msn.c:1792
 msgid "Home Phone 2"
 msgstr "Thuis telefoon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1664
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msnp9/msn.c:1793
+#: ../libpurple/protocols/oscar/oscar.c:3960
 msgid "Home Address"
 msgstr "Thuisadres"
 
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1665
+#: ../libpurple/protocols/msn/msn.c:2038
+#: ../libpurple/protocols/msnp9/msn.c:1794
 msgid "Personal Mobile"
 msgstr "Persoonlijke gsm"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:2039
+#: ../libpurple/protocols/msnp9/msn.c:1795
 msgid "Home Fax"
 msgstr "Fax thuis"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1667
+#: ../libpurple/protocols/msn/msn.c:2040
+#: ../libpurple/protocols/msnp9/msn.c:1796
 msgid "Personal Email"
-msgstr "Persoonlijke email"
+msgstr "Persoonlijke e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1668
+#: ../libpurple/protocols/msn/msn.c:2041
+#: ../libpurple/protocols/msnp9/msn.c:1797
 msgid "Personal IM"
-msgstr "Persoonlijke IM"
+msgstr "Persoonlijke chat"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:2043
+#: ../libpurple/protocols/msnp9/msn.c:1799
 msgid "Anniversary"
 msgstr "Verjaardag"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:2059
+#: ../libpurple/protocols/msnp9/msn.c:1815
 msgid "Work"
 msgstr "Werk"
 
-#: ../libpurple/protocols/msn/msn.c:1847
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:2061
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/silc/ops.c:1024
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Functieomschrijving"
 
-#: ../libpurple/protocols/msn/msn.c:1848
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/oscar/oscar.c:3853
+#: ../libpurple/protocols/msn/msn.c:2062
+#: ../libpurple/protocols/msnp9/msn.c:1818
+#: ../libpurple/protocols/oscar/oscar.c:3978
 msgid "Company"
 msgstr "Bedrijf"
 
-#: ../libpurple/protocols/msn/msn.c:1849
-#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:2063
+#: ../libpurple/protocols/msnp9/msn.c:1819
 #: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/msn/msn.c:1850
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:2064
+#: ../libpurple/protocols/msnp9/msn.c:1820
 msgid "Profession"
 msgstr "Baan"
 
-#: ../libpurple/protocols/msn/msn.c:1851
-#: ../libpurple/protocols/msnp9/msn.c:1692
+#: ../libpurple/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msnp9/msn.c:1821
 msgid "Work Phone"
 msgstr "Telefoon werk"
 
-#: ../libpurple/protocols/msn/msn.c:1852
-#: ../libpurple/protocols/msnp9/msn.c:1693
+#: ../libpurple/protocols/msn/msn.c:2066
+#: ../libpurple/protocols/msnp9/msn.c:1822
 msgid "Work Phone 2"
 msgstr "Telefoon werk 2"
 
-#: ../libpurple/protocols/msn/msn.c:1853
-#: ../libpurple/protocols/msnp9/msn.c:1694
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/msn/msn.c:2067
+#: ../libpurple/protocols/msnp9/msn.c:1823
+#: ../libpurple/protocols/oscar/oscar.c:3968
 msgid "Work Address"
 msgstr "Werkadres"
 
-#: ../libpurple/protocols/msn/msn.c:1854
-#: ../libpurple/protocols/msnp9/msn.c:1695
+#: ../libpurple/protocols/msn/msn.c:2068
+#: ../libpurple/protocols/msnp9/msn.c:1824
 msgid "Work Mobile"
 msgstr "Gsm werk"
 
-#: ../libpurple/protocols/msn/msn.c:1855
-#: ../libpurple/protocols/msnp9/msn.c:1696
+#: ../libpurple/protocols/msn/msn.c:2069
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Work Pager"
 msgstr "Semafoon werk"
 
-#: ../libpurple/protocols/msn/msn.c:1856
-#: ../libpurple/protocols/msnp9/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msnp9/msn.c:1826
 msgid "Work Fax"
 msgstr "Fax werk"
 
-#: ../libpurple/protocols/msn/msn.c:1857
-#: ../libpurple/protocols/msnp9/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:2071
+#: ../libpurple/protocols/msnp9/msn.c:1827
 msgid "Work Email"
-msgstr "Email werk"
+msgstr "E-mail werk"
 
-#: ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/msnp9/msn.c:1699
+#: ../libpurple/protocols/msn/msn.c:2072
+#: ../libpurple/protocols/msnp9/msn.c:1828
 msgid "Work IM"
-msgstr "IM werk"
+msgstr "Chat werk"
 
-#: ../libpurple/protocols/msn/msn.c:1859
-#: ../libpurple/protocols/msnp9/msn.c:1700
+#: ../libpurple/protocols/msn/msn.c:2073
+#: ../libpurple/protocols/msnp9/msn.c:1829
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:2143
+#: ../libpurple/protocols/msn/msn.c:2149
+#: ../libpurple/protocols/msn/msn.c:2156
+#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msnp9/msn.c:1899
+#: ../libpurple/protocols/msnp9/msn.c:1905
+#: ../libpurple/protocols/msnp9/msn.c:1912
+#: ../libpurple/protocols/msnp9/msn.c:1919
 msgid "Favorite Things"
 msgstr "Mijn favoriete dingen"
 
-#: ../libpurple/protocols/msn/msn.c:1994
-#: ../libpurple/protocols/msnp9/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:2208
+#: ../libpurple/protocols/msnp9/msn.c:1964
 msgid "Last Updated"
 msgstr "Laatst bijgewerkt"
 
-#: ../libpurple/protocols/msn/msn.c:2005
-#: ../libpurple/protocols/msnp9/msn.c:1846
-#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/msn/msn.c:2219
+#: ../libpurple/protocols/msnp9/msn.c:1975
+#: ../libpurple/protocols/qq/buddy_info.c:61
 #: ../libpurple/protocols/silc/ops.c:1040
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
-msgstr "Homepage"
+msgstr "Startpagina"
 
-#: ../libpurple/protocols/msn/msn.c:2029
-#: ../libpurple/protocols/msnp9/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:2243
+#: ../libpurple/protocols/msnp9/msn.c:1999
 msgid "The user has not created a public profile."
 msgstr "De gebruiker heeft geen openbaar profiel gemaakt."
 
-#: ../libpurple/protocols/msn/msn.c:2030
-#: ../libpurple/protocols/msnp9/msn.c:1871
-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 ""
-"MSN meldt dat het de profielgegevens van de gebruiker niet kan vinden. Dit "
-"betekent dat de gebruiker niet bestaat of dat deze geen openbaar profiel "
-"heeft aangemaakt."
+#: ../libpurple/protocols/msn/msn.c:2244
+#: ../libpurple/protocols/msnp9/msn.c:2000
+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 "MSN meldt dat het de profielgegevens van de gebruiker niet kan vinden. Dit betekent dat de gebruiker niet bestaat of dat deze geen openbaar profiel heeft aangemaakt."
 
-#: ../libpurple/protocols/msn/msn.c:2034
-#: ../libpurple/protocols/msnp9/msn.c:1875
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr ""
-"Kan geen informatie vinden in het gebruikersprofiel. De gebruiker bestaat "
-"waarschijnlijk niet."
+#: ../libpurple/protocols/msn/msn.c:2248
+#: ../libpurple/protocols/msnp9/msn.c:2004
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Kan geen informatie vinden in het gebruikersprofiel. De gebruiker bestaat waarschijnlijk niet."
 
-#: ../libpurple/protocols/msn/msn.c:2042
-#: ../libpurple/protocols/msnp9/msn.c:1883
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
+#: ../libpurple/protocols/msn/msn.c:2256
+#: ../libpurple/protocols/msnp9/msn.c:2012
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1243
 msgid "Profile URL"
-msgstr "Profiel URL"
+msgstr "Profiel-URL"
 
 #. *< type
 #. *< ui_requirement
@@ -7463,173 +7704,164 @@ msgstr "Profiel URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
+#: ../libpurple/protocols/msn/msn.c:2543
+#: ../libpurple/protocols/msn/msn.c:2545
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger protocol-plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2366
-#: ../libpurple/protocols/msnp9/msn.c:2206
+#: ../libpurple/protocols/msn/msn.c:2580
+#: ../libpurple/protocols/msnp9/msn.c:2335
 msgid "Use HTTP Method"
 msgstr "HTTP-methode gebruiken"
 
-#: ../libpurple/protocols/msn/msn.c:2371
-#: ../libpurple/protocols/msnp9/msn.c:2211
+#: ../libpurple/protocols/msn/msn.c:2585
+#: ../libpurple/protocols/msnp9/msn.c:2340
 msgid "HTTP Method Server"
-msgstr "HTTP Methode Server"
+msgstr "HTTP-methode server"
 
-#: ../libpurple/protocols/msn/msn.c:2376
-#: ../libpurple/protocols/msnp9/msn.c:2216
+#: ../libpurple/protocols/msn/msn.c:2590
+#: ../libpurple/protocols/msnp9/msn.c:2345
 msgid "Show custom smileys"
 msgstr "Eigen smiley's weergeven"
 
-#: ../libpurple/protocols/msn/msn.c:2384
-#: ../libpurple/protocols/msnp9/msn.c:2224
+#: ../libpurple/protocols/msn/msn.c:2598
+#: ../libpurple/protocols/msnp9/msn.c:2353
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Een contact een duwtje geven om de aandacht te krijgen"
 
-#: ../libpurple/protocols/msn/nexus.c:71
+#: ../libpurple/protocols/msn/nexus.c:359
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID authentication: Aanmelden niet mogelijk"
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:124
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Windows Live ID identificatie: kan de identiteit niet vinden die in het "
-"server-antwoord werd gegeven"
-
-#: ../libpurple/protocols/msn/nexus.c:171
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID identificatie Mislukt"
+#: ../libpurple/protocols/msn/nexus.c:366
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID autenticatie: ongeldig antwoord."
 
-#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msn/notification.c:176
 #: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s is geen geldige groep."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:935
-#: ../libpurple/protocols/msn/session.c:401
+#: ../libpurple/protocols/msn/notification.c:182
+#: ../libpurple/protocols/msn/notification.c:861
+#: ../libpurple/protocols/msn/session.c:394
 #: ../libpurple/protocols/msnp9/notification.c:184
 #: ../libpurple/protocols/msnp9/notification.c:534
 #: ../libpurple/protocols/msnp9/session.c:353
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
-#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msn/notification.c:185
 #: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:513
+#: ../libpurple/protocols/msn/notification.c:475
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s heeft u zojuist een duwtje gegeven!"
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:768
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Onbekende fout (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:841
+#: ../libpurple/protocols/msn/notification.c:769
 #: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "Kan gebruiker niet toevoegen"
 
-#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msn/notification.c:827
 #: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kan gebruiker niet toevoegen op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msn/notification.c:831
 #: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kan gebruiker niet blokkeren op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:909
+#: ../libpurple/protocols/msn/notification.c:835
 #: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:917
+#: ../libpurple/protocols/msn/notification.c:843
 #: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
 
-#: ../libpurple/protocols/msn/notification.c:926
+#: ../libpurple/protocols/msn/notification.c:852
 #: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s is geen geldig passport-account."
 
-#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/notification.c:857
 #: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Service momenteel niet beschikbaar."
 
-#: ../libpurple/protocols/msn/notification.c:1337
+#: ../libpurple/protocols/msn/notification.c:1067
+msgid "Mobile message was not sent because it was too long."
+msgstr "Mobiel bericht is niet verstuurd omdat het te lang is."
+
+#: ../libpurple/protocols/msn/notification.c:1246
 #: ../libpurple/protocols/msnp9/notification.c:899
 msgid "Unable to rename group"
 msgstr "Kan groep niet hernoemen"
 
-#: ../libpurple/protocols/msn/notification.c:1392
+#: ../libpurple/protocols/msn/notification.c:1273
 #: ../libpurple/protocols/msnp9/notification.c:954
 msgid "Unable to delete group"
 msgstr "Kan groep niet verwijderen"
 
-#: ../libpurple/protocols/msn/notification.c:2009
+#: ../libpurple/protocols/msn/notification.c:1799
 #: ../libpurple/protocols/msnp9/notification.c:1373
 #, 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] ""
-"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuut. U zult "
-"automatisch afgemeld worden op dat moment. Rond a.u.b. al uw gesprekken af.\n"
+"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuut. U zult automatisch afgemeld worden op dat moment. Rond a.u.b. al uw gesprekken af.\n"
 "\n"
 "U zult zich weer kunnen aanmelden als het onderhoud gepleegd is."
 msgstr[1] ""
-"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuten. U "
-"zult automatisch afgemeld worden op dat moment. Rond a.u.b. al uw gesprekken "
-"af.\n"
+"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuten. U zult automatisch afgemeld worden op dat moment. Rond a.u.b. al uw gesprekken af.\n"
 "\n"
 "U zult zich weer kunnen aanmelden als het onderhoud gepleegd is."
 
+#: ../libpurple/protocols/msn/oim.c:375
+msgid "Message was not sent because the system is unavailable. This normally happens when the user is blocked or does not exist."
+msgstr "Bericht is niet verzonden omdat het systeem niet beschikbaar is. Dit gebeurt normaal als de gebruiker geblokkeerd is of niet bestaat."
+
+#: ../libpurple/protocols/msn/oim.c:380
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Kan bericht niet versturen omdat berichten te snel worden verzonden."
+
+#: ../libpurple/protocols/msn/oim.c:384
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Bericht is niet verstuurd wegens een onbekende coderingsfout:"
+
+#: ../libpurple/protocols/msn/oim.c:388
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Bericht is niet verstuurd wegens een onbekende fout:"
+
 #: ../libpurple/protocols/msn/servconn.c:135
 #: ../libpurple/protocols/msnp9/nexus.c:146
 #: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/qq/qq_network.c:680
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 #: ../libpurple/protocols/yahoo/yahoochat.c:1425
 #: ../libpurple/protocols/yahoo/yahoochat.c:1451
@@ -7656,77 +7888,72 @@ msgstr ""
 "Verbindingsfout van %s-server: \n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:363
+#: ../libpurple/protocols/msn/session.c:356
 #: ../libpurple/protocols/msnp9/session.c:315
 msgid "Our protocol is not supported by the server."
 msgstr "Ons protocol wordt niet ondersteund door de server."
 
-#: ../libpurple/protocols/msn/session.c:368
+#: ../libpurple/protocols/msn/session.c:361
 #: ../libpurple/protocols/msnp9/session.c:320
 msgid "Error parsing HTTP."
 msgstr "Fout bij analyseren HTTP."
 
-#: ../libpurple/protocols/msn/session.c:372
+#: ../libpurple/protocols/msn/session.c:365
 #: ../libpurple/protocols/msnp9/session.c:324
-#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../libpurple/protocols/oscar/flap_connection.c:433
 #: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
-msgstr "U heeft uzelf aangemeld vanaf een andere locatie."
+msgstr "Je hebt jezelf aangemeld vanaf een andere locatie."
 
-#: ../libpurple/protocols/msn/session.c:378
+#: ../libpurple/protocols/msn/session.c:371
 #: ../libpurple/protocols/msnp9/session.c:330
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog "
-"eens."
+msgstr "De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog eens."
 
-#: ../libpurple/protocols/msn/session.c:384
+#: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/session.c:336
 msgid "The MSN servers are going down temporarily."
 msgstr "De MSN-servers worden tijdelijk uitgeschakeld."
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:382
 #: ../libpurple/protocols/msnp9/session.c:341
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kan niet authentificeren: %s"
 
-#: ../libpurple/protocols/msn/session.c:395
+#: ../libpurple/protocols/msn/session.c:388
 #: ../libpurple/protocols/msnp9/session.c:347
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"Uw MSN contactenlijst is op dit moment niet beschikbaar. Probeer het later "
-"nog eens."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "Uw MSN contactenlijst is op dit moment niet beschikbaar. Probeer het later nog eens."
 
-#: ../libpurple/protocols/msn/session.c:417
-#: ../libpurple/protocols/msn/session.c:419
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msn/session.c:412
 #: ../libpurple/protocols/msnp9/session.c:369
 #: ../libpurple/protocols/msnp9/session.c:371
 msgid "Handshaking"
 msgstr "Verbinding opzetten"
 
-#: ../libpurple/protocols/msn/session.c:418
+#: ../libpurple/protocols/msn/session.c:411
 #: ../libpurple/protocols/msnp9/session.c:370
 msgid "Transferring"
 msgstr "Bezig met transport"
 
-#: ../libpurple/protocols/msn/session.c:420
+#: ../libpurple/protocols/msn/session.c:413
 #: ../libpurple/protocols/msnp9/session.c:372
 msgid "Starting authentication"
 msgstr "Starten van authentificatie"
 
-#: ../libpurple/protocols/msn/session.c:421
+#: ../libpurple/protocols/msn/session.c:414
 #: ../libpurple/protocols/msnp9/session.c:373
 msgid "Getting cookie"
 msgstr "Cookie opvragen"
 
-#: ../libpurple/protocols/msn/session.c:423
+#: ../libpurple/protocols/msn/session.c:416
 #: ../libpurple/protocols/msnp9/session.c:375
 msgid "Sending cookie"
 msgstr "Verzenden van cookie"
 
-#: ../libpurple/protocols/msn/session.c:424
+#: ../libpurple/protocols/msn/session.c:417
 #: ../libpurple/protocols/msnp9/session.c:376
 msgid "Retrieving buddy list"
 msgstr "Opvragen van contactenlijst"
@@ -7749,14 +7976,12 @@ msgstr "Aan het lunchen"
 #: ../libpurple/protocols/msn/switchboard.c:406
 #: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr ""
-"Bericht is misschien niet verstuurd omdat er een time out is opgetreden:"
+msgstr "Bericht is misschien niet verstuurd omdat er een time out is opgetreden:"
 
 #: ../libpurple/protocols/msn/switchboard.c:414
 #: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
-"Kan bericht niet versturen. Niet toegestaan wanneer u onzichtbaar bent:"
+msgstr "Kan bericht niet versturen. Niet toegestaan wanneer u onzichtbaar bent:"
 
 #: ../libpurple/protocols/msn/switchboard.c:418
 #: ../libpurple/protocols/msnp9/switchboard.c:423
@@ -7775,34 +8000,26 @@ msgstr "Kan bericht niet versturen omdat we dit te snel doen:"
 
 #: ../libpurple/protocols/msn/switchboard.c:430
 #: ../libpurple/protocols/msnp9/switchboard.c:435
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"Het bericht kon niet verzonden worden omdat we niet een sessie konden "
-"opzetten met de server. Dit ligtt waarschijnlijk aan de server, probeer het "
-"opnieuw over een paar minuten:"
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr "Het bericht kon niet verzonden worden omdat we niet een sessie konden opzetten met de server. Dit ligtt waarschijnlijk aan de server, probeer het opnieuw over een paar minuten:"
 
 #: ../libpurple/protocols/msn/switchboard.c:437
 #: ../libpurple/protocols/msnp9/switchboard.c:442
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-"Kan bericht niet versturen omdat er een fout op het switchboard is "
-"opgetreden:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
+msgstr "Kan bericht niet versturen omdat er een fout op het switchboard is opgetreden:"
 
 #: ../libpurple/protocols/msn/switchboard.c:445
 #: ../libpurple/protocols/msnp9/switchboard.c:450
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Bericht is misschien niet verstuurd wegens een onbekende fout:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msn/userlist.c:215
 #: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
 
-#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msn/userlist.c:284
 #: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
@@ -7811,21 +8028,24 @@ msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:713
+#: ../libpurple/protocols/msn/userlist.c:676
 #: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kan \"%s\" niet toevoegen."
 
-#: ../libpurple/protocols/msn/userlist.c:716
+#: ../libpurple/protocols/msn/userlist.c:679
 #: ../libpurple/protocols/msnp9/userlist.c:655
-#, fuzzy
 msgid "The username specified is invalid."
 msgstr "Ingevoerde gebruikersnaam is ongeldig."
 
-#: ../libpurple/protocols/msnp9/msn.c:546
+#: ../libpurple/protocols/msnp9/msn.c:390
+msgid "This Hotmail account may not be active."
+msgstr "Dit Hotmail-account is misschien niet in gebruik."
+
+#: ../libpurple/protocols/msnp9/msn.c:565
 msgid "Has you"
-msgstr "Heeft u"
+msgstr "Heeft je"
 
 #. *< type
 #. *< ui_requirement
@@ -7837,26 +8057,22 @@ msgstr "Heeft u"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2170
-#: ../libpurple/protocols/msnp9/msn.c:2172
+#: ../libpurple/protocols/msnp9/msn.c:2299
+#: ../libpurple/protocols/msnp9/msn.c:2301
 msgid "MSN Protocol Plugin"
-msgstr "MSN-protocol plugin"
+msgstr "MSN-protocol-plugin"
 
 #: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
-msgstr "Missende Coderingsinformatie"
+msgstr "Missende coderingsinformatie"
 
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "De RC4 codering niet gevonden"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Upgrade naar libpurple met RC4-ondersteuninh (>=2.0.1). MySpaceIM plugin zal "
-"niet geladen worden."
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "Upgrade naar libpurple met RC4-ondersteuninh (>=2.0.1). MySpaceIM plugin zal niet geladen worden."
 
 #: ../libpurple/protocols/myspace/myspace.c:345
 #, fuzzy
@@ -7874,210 +8090,198 @@ msgstr "Aanmelden"
 
 #: ../libpurple/protocols/myspace/myspace.c:1331
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
-"Verbinding met server verloren (geen data ontvangen binnen %d seconden)"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "Verbinding met server verloren (geen data ontvangen binnen %d seconde)"
+msgstr[1] "Verbinding met server verloren (geen data ontvangen binnen %d seconden)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1374
+#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New mail messages"
-msgstr "Nieuwe emailberichten"
+msgstr "Nieuwe e-mailberichten"
 
-#: ../libpurple/protocols/myspace/myspace.c:1375
+#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New blog comments"
 msgstr "Nieuw blog commentaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1376
+#: ../libpurple/protocols/myspace/myspace.c:1379
 msgid "New profile comments"
 msgstr "Nieuw profiel commentaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1377
+#: ../libpurple/protocols/myspace/myspace.c:1380
 msgid "New friend requests!"
 msgstr "Nieuwe aanvragen van vrienden!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1378
+#: ../libpurple/protocols/myspace/myspace.c:1381
 msgid "New picture comments"
 msgstr "Nieuw commentaar op afbeelding"
 
-#: ../libpurple/protocols/myspace/myspace.c:1408
+#: ../libpurple/protocols/myspace/myspace.c:1411
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1594
+#: ../libpurple/protocols/myspace/myspace.c:1597
 msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Geen Naam Ingesteld"
+msgstr "MySpaceIM - geen naam ingesteld"
 
-#: ../libpurple/protocols/myspace/myspace.c:1595
+#: ../libpurple/protocols/myspace/myspace.c:1598
 msgid "You appear to have no MySpace username."
 msgstr "Je lijkt geen MySpace gebruikersnaam te hebben."
 
-#: ../libpurple/protocols/myspace/myspace.c:1596
+#: ../libpurple/protocols/myspace/myspace.c:1599
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-"Wil je er nu een instellen? (Opmerking: DIT KAN NIET VERANDERD WORDEN!)"
+msgstr "Wil je er nu een instellen? (Opmerking: DIT KAN NIET VERANDERD WORDEN!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1620
+#: ../libpurple/protocols/myspace/myspace.c:1623
 #: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../libpurple/protocols/myspace/myspace.c:1855
+#: ../libpurple/protocols/myspace/myspace.c:1858
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol fout, code %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1877
+#: ../libpurple/protocols/myspace/myspace.c:1880
 #, c-format
-msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
-msgstr ""
-"%s Je wachtwoord bestaat uit %d characters, groter dan de verwachte maximum "
-"waarde van %d voor MySpaceIM. Verkort je wachtwoord op http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword en probeer "
-"het opnieuw."
+msgid "%s Your password is %d characters, greater than the expected maximum length of %d for MySpaceIM. Please shorten your password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr "%s Je wachtwoord bestaat uit %d characters, groter dan de verwachte maximum waarde van %d voor MySpaceIM. Verkort je wachtwoord op http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword en probeer het opnieuw."
 
-#: ../libpurple/protocols/myspace/myspace.c:1900
+#: ../libpurple/protocols/myspace/myspace.c:1903
 msgid "MySpaceIM Error"
-msgstr "MySpaceIM Fout"
+msgstr "MySpaceIM-fout"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
-#: ../libpurple/protocols/myspace/myspace.c:2112
+#: ../libpurple/protocols/myspace/myspace.c:2081
+#: ../libpurple/protocols/myspace/myspace.c:2115
 msgid "Failed to add buddy"
 msgstr "Contact toevoegen mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
+#: ../libpurple/protocols/myspace/myspace.c:2081
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy' opdracht mislukt."
 
-#: ../libpurple/protocols/myspace/myspace.c:2112
-#: ../libpurple/protocols/myspace/myspace.c:2357
+#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2360
 #, fuzzy
 msgid "persist command failed"
 msgstr "Schakelserver fout"
 
-#: ../libpurple/protocols/myspace/myspace.c:2217
+#: ../libpurple/protocols/myspace/myspace.c:2220
 #, c-format
 msgid "No such user: %s"
 msgstr "Onbekende gerbuiker: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2219
+#: ../libpurple/protocols/myspace/myspace.c:2222
 msgid "User lookup"
 msgstr "Gebruiker opzoeken"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2357
-#: ../libpurple/protocols/myspace/myspace.c:2379
+#: ../libpurple/protocols/myspace/myspace.c:2341
+#: ../libpurple/protocols/myspace/myspace.c:2360
+#: ../libpurple/protocols/myspace/myspace.c:2382
 msgid "Failed to remove buddy"
 msgstr "Verwijderen buddy mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2341
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy' opdracht mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2379
+#: ../libpurple/protocols/myspace/myspace.c:2382
 msgid "blocklist command failed"
 msgstr "blokkeerlijst-opdracht mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2493
+#: ../libpurple/protocols/myspace/myspace.c:2508
 msgid "Invalid input condition"
 msgstr "Ongeldige invoer voorwaarde"
 
-#: ../libpurple/protocols/myspace/myspace.c:2548
+#: ../libpurple/protocols/myspace/myspace.c:2563
 msgid "Read buffer full (2)"
 msgstr "Wachtrij vol (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2591
+#: ../libpurple/protocols/myspace/myspace.c:2606
 msgid "Unparseable message"
 msgstr "Kan het bericht niet analyseren"
 
-#: ../libpurple/protocols/myspace/myspace.c:2662
+#: ../libpurple/protocols/myspace/myspace.c:2677
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Kan geen verbinding maken met host: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2840
+#: ../libpurple/protocols/myspace/myspace.c:2844
 msgid "IM Friends"
-msgstr "IM Vrienden"
+msgstr "Chat-vrienden"
 
-#: ../libpurple/protocols/myspace/myspace.c:2940
+#: ../libpurple/protocols/myspace/myspace.c:2952
 #, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr ""
-"%d buddies zijn toegevoeged of geüpdate van de serverr (inclusief buddies "
-"die al op de server stinden)"
+msgid "%d buddy was added or updated from the server (including buddies already on the server-side list)"
+msgid_plural "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr[0] "%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies die al op de server stinden)"
+msgstr[1] "%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies die al op de server stinden)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2941
+#: ../libpurple/protocols/myspace/myspace.c:2956
 msgid "Add contacts from server"
 msgstr "Contacten toevoegen van de server"
 
-#: ../libpurple/protocols/myspace/myspace.c:2993
-#: ../libpurple/protocols/myspace/myspace.c:3057
+#: ../libpurple/protocols/myspace/myspace.c:3008
+#: ../libpurple/protocols/myspace/myspace.c:3072
 msgid "Add friends from MySpace.com"
 msgstr "Vrienden toevoegen van MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2994
+#: ../libpurple/protocols/myspace/myspace.c:3009
 msgid "Importing friends failed"
 msgstr "Importeren van vrienden mislukt"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3050
+#: ../libpurple/protocols/myspace/myspace.c:3065
 msgid "Find people..."
 msgstr "Mensen zoeken..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3053
+#: ../libpurple/protocols/myspace/myspace.c:3068
 msgid "Change IM name..."
-msgstr "IM naam veranderen..."
+msgstr "Chatnaam veranderen..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3354
+#: ../libpurple/protocols/myspace/myspace.c:3371
 msgid "myim URL handler"
 msgstr "myim URL afhandelaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:3355
+#: ../libpurple/protocols/myspace/myspace.c:3372
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
-"Geen bijpassend MySpaceIM-account kon gevonden worden om deze myim URL te "
-"openen."
+msgstr "Geen bijpassend MySpaceIM-account kon gevonden worden om deze myim URL te openen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3356
+#: ../libpurple/protocols/myspace/myspace.c:3373
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Schakel de goede MySpaceIM-account in en probeer het opnieuw."
 
-#: ../libpurple/protocols/myspace/myspace.c:3479
+#: ../libpurple/protocols/myspace/myspace.c:3496
 msgid "Show display name in status text"
 msgstr "Laat display-naam zien in status-tekst."
 
-#: ../libpurple/protocols/myspace/myspace.c:3482
+#: ../libpurple/protocols/myspace/myspace.c:3499
 msgid "Show headline in status text"
 msgstr "Kop in status-tekst weergeven"
 
-#: ../libpurple/protocols/myspace/myspace.c:3487
+#: ../libpurple/protocols/myspace/myspace.c:3504
 msgid "Send emoticons"
 msgstr "Verzend emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3492
+#: ../libpurple/protocols/myspace/myspace.c:3509
 msgid "Screen resolution (dots per inch)"
 msgstr "Schermresolutie (dots per inch)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3495
+#: ../libpurple/protocols/myspace/myspace.c:3512
 msgid "Base font size (points)"
 msgstr "Basis lettertype-grootte (in punten)"
 
 #: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:790
-#: ../libpurple/protocols/zephyr/zephyr.c:1164
+#: ../libpurple/protocols/zephyr/zephyr.c:789
+#: ../libpurple/protocols/zephyr/zephyr.c:1168
 msgid "User"
 msgstr "Gebruiker"
 
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/oscar/oscar.c:3174
 msgid "Profile"
 msgstr "Profiel"
 
@@ -8091,11 +8295,11 @@ msgstr "Liedje"
 
 #: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
-msgstr "Totaal Aantal Vrienden"
+msgstr "Totaal aantal vrienden"
 
 #: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
-msgstr "Client Versie"
+msgstr "Client-versie"
 
 #. Protocol won't log in now without a username set.. Disconnect
 #: ../libpurple/protocols/myspace/user.c:570
@@ -8140,66 +8344,65 @@ msgstr "Probeer een andere gebruikersnaam:"
 #: ../libpurple/protocols/myspace/zap.c:48
 #: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
-msgstr ""
+msgstr "Schrikken"
 
 #: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s heeft u toegevoegd [%s]"
+msgstr "%s heeft je laten schrikken!"
 
 #: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s laten schrikken..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 #: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy
 msgid "Whack"
-msgstr "Terug"
+msgstr "Afranselen"
 
 #: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s heeft u toegevoegd [%s]"
+msgstr "%s heeft je afgeranseld!"
 
 #: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "%s afranselen..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
 #: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
-msgstr "Fakkel"
+msgstr "Huis laten fikken"
 
 #: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
-msgstr ""
-#msgstr "De gebruiker heeft u befakkeld"
+msgstr "%s heeft je huis in de fik gezet!"
 
+# msgstr "De gebruiker heeft u befakkeld"
 #: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Het huis van %s in de fik zetten..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 #: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
+msgstr "Zoenen"
 
 #: ../libpurple/protocols/myspace/zap.c:63
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s heeft zich aangemeld."
+msgstr "%s heeft je gezoend!"
 
 #: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s zoenen..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 #: ../libpurple/protocols/myspace/zap.c:66
@@ -8219,7 +8422,7 @@ msgstr "%s Knuffelen..."
 #. Slap means "to hit someone with an open/flat hand"
 #: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
-msgstr "Mep"
+msgstr "Meppen"
 
 #: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
@@ -8229,7 +8432,7 @@ msgstr "%s heeft je gemept!"
 #: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s aan het meppen..."
 
 #. Goose means "to pinch someone on their butt"
 #: ../libpurple/protocols/myspace/zap.c:74
@@ -8251,17 +8454,17 @@ msgstr "%s aan het billenknijpen..."
 #. * something, often a victory, or to congratulate someone.
 #: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
-msgstr ""
+msgstr "High-fiven"
 
 #: ../libpurple/protocols/myspace/zap.c:81
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s heeft zich aangemeld."
+msgstr "%s heeft je gehigh-fived!"
 
 #: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "%s aan het high-fiven..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -8289,17 +8492,17 @@ msgstr "%s aan het punken..."
 #. * with friends.
 #: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
-msgstr ""
+msgstr "Bespetteren"
 
 #: ../libpurple/protocols/myspace/zap.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s heeft zich aangemeld."
+msgstr "%s heeft je bespetterd!"
 
 #: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "%s bespetteren..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -8382,12 +8585,8 @@ msgid "Could not recognize the host of the username you entered"
 msgstr "Kan de host van de gebruikersnaam die je hebt ingevoerd niet vinden"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
-msgstr ""
-"Uw account is uitgeschakeld omdat er te vaak ongeldige wachtwoorden werden "
-"ingevoerd"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgstr "Uw account is uitgeschakeld omdat er te vaak ongeldige wachtwoorden werden ingevoerd"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -8395,11 +8594,11 @@ msgstr "U kunt een persoon slechts eenmaal toevoegen aan een gesprek"
 
 #: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "U heeft uw maximale hoeveelheid contacten bereikt"
+msgstr "Je hebt je maximale hoeveelheid contacten bereikt"
 
 #: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect username"
-msgstr "U heeft een ongeldige gebruikersnaam ingevuld"
+msgstr "Je hebt een ongeldige gebruikersnaam ingevuld"
 
 #: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
@@ -8414,12 +8613,8 @@ msgid "The user has blocked you"
 msgstr "De gebruiker heeft u geblokkeerd"
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
-msgstr ""
-"Deze evaluatieversie geeft slechts de mogelijkheid voor tien gelijktijdige "
-"gebruikers"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgstr "Deze evaluatieversie geeft slechts de mogelijkheid voor tien gelijktijdige gebruikers"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
@@ -8438,9 +8633,7 @@ msgstr "Aanmelden mislukt (%s)."
 #: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Kan het bericht niet verzenden. Kan geen gegevens over gebruiker opvragen (%"
-"s)."
+msgstr "Kan het bericht niet verzenden. Kan geen gegevens over gebruiker opvragen (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:404
 #, c-format
@@ -8462,8 +8655,7 @@ msgstr "Kan gebruiker niet uitnodigen (%s)."
 #: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Kan bericht naar %s niet versturen. Kan geen bijeenkomst aanmaken (%s)."
+msgstr "Kan bericht naar %s niet versturen. Kan geen bijeenkomst aanmaken (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:545
 #, c-format
@@ -8472,21 +8664,13 @@ msgstr "Kan het bericht niet versturen. Kan geen bijeenkomst aanmaken (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:592
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"Kan de gebruiker %s niet naar de map %s verplaatsen op de server. Fout bij "
-"aanmaken van map (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "Kan de gebruiker %s niet naar de map %s verplaatsen op de server. Fout bij aanmaken van map (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:640
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"Kan %s niet toevoegen aan uw contactenlijst. Fout bij aanmaken van map op de "
-"server (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "Kan %s niet toevoegen aan uw contactenlijst. Fout bij aanmaken van map op de server (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:713
 #, c-format
@@ -8528,8 +8712,7 @@ msgstr "Kan geen bijeenkomst aanmaken (%s)."
 #: ../libpurple/protocols/novell/novell.c:1131
 #: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
-msgstr ""
-"Fout opgetreden bij communicatie met de server. Verbinding wordt verbroken."
+msgstr "Fout opgetreden bij communicatie met de server. Verbinding wordt verbroken."
 
 #: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
@@ -8601,23 +8784,16 @@ msgstr "Wilt u het gesprek bijwonen?"
 
 #: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
-"computer."
+msgstr "De verbinding is verbroken omdat u zich heeft aangemeld op een andere computer."
 
 #: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s lijkt niet aangemeld te zijn en heeft uw bericht niet ontvangen."
 
 #: ../libpurple/protocols/novell/novell.c:2185
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"Kan geen verbinding makenmet server. Geef alstublieft de naam op van de "
-"server waarmee u contact wilt maken."
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u contact wilt maken."
 
 #: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
@@ -8625,9 +8801,7 @@ msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
 
 #: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
-msgstr ""
-"Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden "
-"worden."
+msgstr "Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden worden."
 
 #. *< type
 #. *< ui_requirement
@@ -8639,16 +8813,16 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3536
-#: ../libpurple/protocols/novell/novell.c:3538
+#: ../libpurple/protocols/novell/novell.c:3537
+#: ../libpurple/protocols/novell/novell.c:3539
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger protocol-plugin"
 
-#: ../libpurple/protocols/novell/novell.c:3563
+#: ../libpurple/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "Server-adres"
 
-#: ../libpurple/protocols/novell/novell.c:3567
+#: ../libpurple/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "Server-poort"
 
@@ -8660,20 +8834,27 @@ msgstr "Kon gesprek-ruimte niet binnenkomen"
 msgid "Invalid chat room name"
 msgstr "Ongeldige naam voor ruimte"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2505
-#: ../libpurple/protocols/yahoo/yahoo.c:2673
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
-#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
-#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
+#: ../libpurple/protocols/oscar/flap_connection.c:437
+#: ../libpurple/protocols/qq/qq_network.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:2512
+#: ../libpurple/protocols/yahoo/yahoo.c:2680
+#: ../libpurple/protocols/yahoo/ycht.c:482
+#: ../libpurple/proxy.c:616
+#: ../libpurple/proxy.c:1159
+#: ../libpurple/proxy.c:1273
+#: ../libpurple/proxy.c:1379
+#: ../libpurple/proxy.c:1532
 msgid "Server closed the connection."
 msgstr "Server heeft de verbinding verbroken."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
-#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
-#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
+#: ../libpurple/protocols/oscar/flap_connection.c:439
+#: ../libpurple/protocols/yahoo/yahoo.c:2505
+#: ../libpurple/protocols/yahoo/yahoo.c:2673
+#: ../libpurple/proxy.c:628
+#: ../libpurple/proxy.c:1171
+#: ../libpurple/proxy.c:1285
+#: ../libpurple/proxy.c:1391
+#: ../libpurple/proxy.c:1544
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8682,10 +8863,13 @@ msgstr ""
 "Verbinding verloren met server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:401
-#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
-#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
-#: ../libpurple/proxy.c:1554
+#: ../libpurple/protocols/oscar/flap_connection.c:442
+#: ../libpurple/proxy.c:1188
+#: ../libpurple/proxy.c:1218
+#: ../libpurple/proxy.c:1298
+#: ../libpurple/proxy.c:1403
+#: ../libpurple/proxy.c:1493
+#: ../libpurple/proxy.c:1557
 msgid "Received invalid data on connection with server."
 msgstr "Ongeldige data ontvangen van server."
 
@@ -8702,7 +8886,7 @@ msgstr "Ongeldige data ontvangen van server."
 #: ../libpurple/protocols/oscar/libaim.c:118
 #: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
-msgstr "AIM-protocol Plugin"
+msgstr "AIM-protocol plugin"
 
 #. *< type
 #. *< ui_requirement
@@ -8717,11 +8901,11 @@ msgstr "AIM-protocol Plugin"
 #: ../libpurple/protocols/oscar/libicq.c:118
 #: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
-msgstr "ICQ-protocol Plugin"
+msgstr "ICQ-protocol plugin"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4456
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/yahoo/yahoo.c:4463
+#: ../libpurple/protocols/zephyr/zephyr.c:2986
 msgid "Encoding"
 msgstr "Codering"
 
@@ -8750,269 +8934,263 @@ msgstr "Kan geen verbinding maken met de andere gebruiker."
 msgid "Direct IM established"
 msgstr "Directe verbinding opgezet"
 
-#: ../libpurple/protocols/oscar/odc.c:602
+#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
-msgid ""
-"%s tried to send you a %s file, but we only allow files up to %s over Direct "
-"IM.  Try using file transfer instead.\n"
-msgstr ""
-"%s probeerde je een bestand te sturen %s file, maar we stemmen alleen tot %s "
-"toe op Direct IM.  Probeer bestandsoverdracht.\n"
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr "%s probeerde je een bestand te sturen %s file, maar we stemmen alleen tot %s toe op Direct IM.  Probeer bestandsoverdracht.\n"
 
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Bestand %s is %s, welke is groter dan de maximale grootte van %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Ongeldige fout"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "Ongeldige SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Frequentie naar host"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Frequentie naar cliënt"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Service niet beschikbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Service niet gedefinieerd"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "Verouderde SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "Niet ondersteund door host"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
-msgstr "Niet ondersteund door cliënt"
+msgstr "Niet ondersteund door cliënt"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Refused by client"
-msgstr "Gewegerd door cliënt"
+msgstr "Gewegerd door cliënt"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Antwoord te groot"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "Reacties verloren"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Aanvraag geweigerd"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "SNAC bagage kapot"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Niet genoeg rechten"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "In lokale toestaan/weigeren"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (sender)"
-msgstr "Te kwaadaardig (afzender)"
+#: ../libpurple/protocols/oscar/oscar.c:136
+msgid "Warning level too high (sender)"
+msgstr "Waarschuwingsniveau te hoog (verzender)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
-msgid "Too evil (receiver)"
-msgstr "Te kwaadaardig (ontvanger)"
+#: ../libpurple/protocols/oscar/oscar.c:137
+msgid "Warning level too high (receiver)"
+msgstr "Waarschuwingsniveau te hoog (ontvanger)"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "Gebruiker tijdelijk niet beschikbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "Geen overeenkomstige resultaten"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "Te grote lijst"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Dubieuze aanvraag"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libpurple/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "Wachtrij vol"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
+#: ../libpurple/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "Niet tijdens AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:349
-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 ""
-"(Er is een fout opgetreden bij ontvangen van het bericht. De ander gebruikt "
-"waarschijnlijk een andere tekencodering dan verwacht. Als u weet welke "
-"tekencodering er gebruikt wordt dan kunt u dit instellen bij de geavanceerde "
-"instellingen van uw AIM/ICQ-account.)"
+#: ../libpurple/protocols/oscar/oscar.c:351
+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 "(Er is een fout opgetreden bij ontvangen van het bericht. De ander gebruikt waarschijnlijk een andere tekencodering dan verwacht. Als u weet welke tekencodering er gebruikt wordt dan kunt u dit instellen bij de geavanceerde instellingen van uw AIM/ICQ-account.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:458
+#: ../libpurple/protocols/oscar/oscar.c:460
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
 msgstr ""
-#msgstr ""
-#"(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
-#"hebben verschillende coderingen geselecteerd of de andere persoon gebruikt "
-#"een chatprogramma met fouten.)"
 
+# msgstr ""
+# "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
+# "hebben verschillende coderingen geselecteerd of de andere persoon gebruikt "
+# "een chatprogramma met fouten.)"
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2449
-#: ../pidgin/gtkutils.c:2479
+#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../pidgin/gtkutils.c:2455
+#: ../pidgin/gtkutils.c:2485
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
-msgstr "Contactplaatje"
+msgstr "pictogram"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "Voice"
 msgstr "Stem"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:648
 msgid "AIM Direct IM"
 msgstr "AIM Direct bericht"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
-#: ../libpurple/protocols/oscar/oscar.c:6125
+#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Get File"
 msgstr "Bestanden Ophalen"
 
-#: ../libpurple/protocols/oscar/oscar.c:659
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Games"
 msgstr "Spelletjes"
 
-#: ../libpurple/protocols/oscar/oscar.c:662
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Add-Ins"
 msgstr "Extra's"
 
-#: ../libpurple/protocols/oscar/oscar.c:665
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Send Buddy List"
 msgstr "Contactenlijst verzenden"
 
-#: ../libpurple/protocols/oscar/oscar.c:668
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ Direct Connect"
 msgstr "ICQ Directe verbinding"
 
-#: ../libpurple/protocols/oscar/oscar.c:671
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "AP User"
 msgstr "AP-gebruiker"
 
-#: ../libpurple/protocols/oscar/oscar.c:674
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:677
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Old ICQ UTF8"
 msgstr "Oude ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "Trillian Encryption"
 msgstr "Trillian codering"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:692
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:695
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Security Enabled"
 msgstr "Beveiliging ingeschakeld"
 
-#: ../libpurple/protocols/oscar/oscar.c:698
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "Video Chat"
 msgstr "Video-chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:702
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:705
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:708
+#: ../libpurple/protocols/oscar/oscar.c:710
 msgid "Camera"
 msgstr "Camera"
 
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5895
+#: ../libpurple/protocols/oscar/oscar.c:713
+msgid "Screen Sharing"
+msgstr "Gedeelde schermen"
+
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5985
 msgid "Free For Chat"
 msgstr "Vrij om te chatten"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5916
+#: ../libpurple/protocols/oscar/oscar.c:737
+#: ../libpurple/protocols/oscar/oscar.c:6006
 msgid "Occupied"
 msgstr "Bezig"
 
-#: ../libpurple/protocols/oscar/oscar.c:736
+#: ../libpurple/protocols/oscar/oscar.c:741
 msgid "Web Aware"
 msgstr "Zichtbaar op web"
 
-#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/oscar/oscar.c:743
+#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:363
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/status.c:162
+#: ../pidgin/gtkdocklet.c:557
+#: ../pidgin/gtkstatusbox.c:1092
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3746
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1210
+#: ../libpurple/protocols/oscar/oscar.c:951
+#: ../libpurple/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
+#: ../pidgin/gtkprefs.c:1207
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: ../libpurple/protocols/oscar/oscar.c:846
-#: ../libpurple/protocols/oscar/oscar.c:2947
+#: ../libpurple/protocols/oscar/oscar.c:957
 msgid "Warning Level"
 msgstr "Waarschuwingsniveau"
 
-#: ../libpurple/protocols/oscar/oscar.c:856
+#: ../libpurple/protocols/oscar/oscar.c:967
 msgid "Buddy Comment"
 msgstr "Contactopmerking"
 
-#: ../libpurple/protocols/oscar/oscar.c:996
+#: ../libpurple/protocols/oscar/oscar.c:1107
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -9021,7 +9199,7 @@ msgstr ""
 "Kan niet verbinden met identificatieserver:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:1115
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -9030,186 +9208,163 @@ msgstr ""
 "Kan niet verbinden met BOS-server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1044
+#: ../libpurple/protocols/oscar/oscar.c:1155
 msgid "Username sent"
 msgstr "Gebruikersnaam verzonden"
 
-#: ../libpurple/protocols/oscar/oscar.c:1049
+#: ../libpurple/protocols/oscar/oscar.c:1160
 msgid "Connection established, cookie sent"
 msgstr "Verbinding hersteld, Cookie verzonden"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1078
+#: ../libpurple/protocols/oscar/oscar.c:1189
 msgid "Finalizing connection"
 msgstr "Afronden van verbinding"
 
-#: ../libpurple/protocols/oscar/oscar.c:1306
+#: ../libpurple/protocols/oscar/oscar.c:1417
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Kan niet aanmelden: Kan niet aanmelden als %s omdat de gebruikersnaam "
-"ongeldig is. Gebruikersnamen moeten een geldig emailadres zijn, of beginnen "
-"met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
-"nummers bevatten."
+msgid "Unable to login: Could not sign on as %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Kan niet aanmelden: Kan niet aanmelden als %s omdat de gebruikersnaam ongeldig is. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een letter en slechts cijfers, letters en spaties bevatten, of slechts nummers bevatten."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1392
-#: ../libpurple/protocols/yahoo/yahoo.c:2127
+#: ../libpurple/protocols/oscar/oscar.c:1503
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Invalid username."
 msgstr "Ongeldige gebruikersnaam."
 
-#: ../libpurple/protocols/oscar/oscar.c:1398
-#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/oscar/oscar.c:1509
 #: ../libpurple/protocols/simple/simple.c:1128
-#: ../libpurple/protocols/yahoo/yahoo.c:2149
+#: ../libpurple/protocols/yahoo/yahoo.c:2156
 msgid "Incorrect password."
 msgstr "Ongeldig wachtwoord."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1402
+#: ../libpurple/protocols/oscar/oscar.c:1513
 msgid "Your account is currently suspended."
 msgstr "Uw Account is momenteel afgesloten"
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1406
+#: ../libpurple/protocols/oscar/oscar.c:1518
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1410
-#: ../libpurple/protocols/oscar/oscar.c:1419
-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 ""
-"U heeft zich te snel aan en afgemeld. Wacht 10 minuten en probeer het nog "
-"een keer. Als u verdergaat moet u nog langer wachten "
+#: ../libpurple/protocols/oscar/oscar.c:1522
+#: ../libpurple/protocols/oscar/oscar.c:1535
+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 "Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een keer. Als je verdergaat moet je nog langer wachten "
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1528
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
+msgstr "Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:1568
 msgid "Could Not Connect"
 msgstr "Kan geen verbinding maken"
 
-#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:1572
 msgid "Received authorization"
 msgstr "Toestemming gekregen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1479
+#: ../libpurple/protocols/oscar/oscar.c:1595
 msgid "The SecurID key entered is invalid."
 msgstr "Ingevoerde SecurID sleutel is ongeldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1608
 msgid "Enter SecurID"
 msgstr "Geef SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1493
+#: ../libpurple/protocols/oscar/oscar.c:1609
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geef het 6-cijferige nummer van het digitale display."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2337
-#: ../libpurple/protocols/oscar/oscar.c:6000
-#: ../libpurple/protocols/oscar/oscar.c:6282 ../libpurple/request.h:1401
+#: ../libpurple/protocols/oscar/oscar.c:1611
+#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2530
+#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1651
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"U wordt waarschijnlijk binnenkort afgemeld. U kunt misschien beter TOC "
-"gebruiken tot dit probleem is opgelost. Kijk op %s voor nieuwe versies."
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "U wordt waarschijnlijk binnenkort afgemeld. U kunt misschien beter TOC gebruiken tot dit probleem is opgelost. Kijk op %s voor nieuwe versies."
 
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:1581
+#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1701
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1578
-#: ../libpurple/protocols/oscar/oscar.c:1677
+#: ../libpurple/protocols/oscar/oscar.c:1697
+#: ../libpurple/protocols/oscar/oscar.c:1799
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
+msgstr "U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
 
-#: ../libpurple/protocols/oscar/oscar.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:1803
 msgid "Unable to get a valid login hash."
 msgstr "Kon geen geldige aanmeld-hash krijgen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1710
+#. allow multple logins?
+#: ../libpurple/protocols/oscar/oscar.c:1834
 msgid "Password sent"
 msgstr "Wachtwoord verzonden"
 
-#: ../libpurple/protocols/oscar/oscar.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:1890
 msgid "Unable to initialize connection"
 msgstr "Kan verbinding niet initialiseren"
 
-#: ../libpurple/protocols/oscar/oscar.c:2258
+#: ../libpurple/protocols/oscar/oscar.c:2451
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Geef mij alstublieft toestemming zodat ik u kan toevoegen aan mijn "
-"contactenlijst."
+msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn contactenlijst."
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2480
 msgid "Authorization Request Message:"
 msgstr "Tekst van toestemmingsaanvraag"
 
-#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Please authorize me!"
-msgstr "Geef mij alstublieft toestemming"
+msgstr "Geef mij toestemming, alstublieft!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2328
-#: ../libpurple/protocols/oscar/oscar.c:2336
-#: ../libpurple/protocols/oscar/oscar.c:2463
-#: ../libpurple/protocols/oscar/oscar.c:5372
-#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/oscar/oscar.c:2521
+#: ../libpurple/protocols/oscar/oscar.c:2529
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:5493
+#: ../libpurple/protocols/yahoo/yahoo.c:992
 msgid "No reason given."
 msgstr "Geen reden gegeven."
 
-#: ../libpurple/protocols/oscar/oscar.c:2335
+#: ../libpurple/protocols/oscar/oscar.c:2528
 msgid "Authorization Denied Message:"
 msgstr "Tekst van weigeringsbericht:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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 ""
-"De gebruiker %u heeft uw aanvraag om hem/haar toe te voegen aan uw lijst "
-"geweigerd met de volgende reden:\n"
+"De gebruiker %u heeft je aanvraag om hem/haar toe te voegen aan je lijst geweigerd met de volgende reden:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2464
+#: ../libpurple/protocols/oscar/oscar.c:2657
 msgid "ICQ authorization denied."
 msgstr "ICQ identificatie geweigerd."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2471
+#: ../libpurple/protocols/oscar/oscar.c:2664
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"De gebruiker %u heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
-"contactenlijst."
+msgstr "De gebruiker %u heeft toestemming gegeven. Hij/zij wordt toegevoegd aan je contactenlijst."
 
-#: ../libpurple/protocols/oscar/oscar.c:2479
+#: ../libpurple/protocols/oscar/oscar.c:2672
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9217,12 +9372,12 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"U heeft een speciaal bericht ontvangen\n"
+"Je hebt een speciaal bericht ontvangen\n"
 "\n"
 "Afzender: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
+#: ../libpurple/protocols/oscar/oscar.c:2680
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9230,12 +9385,12 @@ msgid ""
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"U heeft een ICQ semafoonbericht ontvangen\n"
+"Je hebt een ICQ semafoonbericht ontvangen\n"
 "\n"
 "Afzender: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2495
+#: ../libpurple/protocols/oscar/oscar.c:2688
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9243,76 +9398,66 @@ msgid ""
 "Message is:\n"
 "%s"
 msgstr ""
-"U heeft een ICQ email ontvangen van %s [%s]\n"
+"Je hebt een ICQ e-mail ontvangen van %s [%s]\n"
 "\n"
 "Bericht:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2516
+#: ../libpurple/protocols/oscar/oscar.c:2709
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ-gebruiker %u heeft u een contact toegestuurd: %s (%s)"
+msgstr "ICQ-gebruiker %u heeft je een contact toegestuurd: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2522
+#: ../libpurple/protocols/oscar/oscar.c:2715
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Wilt u deze persoon toevoegen aan uw contactenlijst?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2527 ../pidgin/gtkroomlist.c:320
+#: ../libpurple/protocols/oscar/oscar.c:2720
+#: ../pidgin/gtkroomlist.c:315
 msgid "_Add"
 msgstr "Toe_voegen"
 
 # afzeggen/weigeren/afwijzen
-#: ../libpurple/protocols/oscar/oscar.c:2528
+#: ../libpurple/protocols/oscar/oscar.c:2721
 msgid "_Decline"
 msgstr "Af_wijzen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2652
+#: ../libpurple/protocols/oscar/oscar.c:2845
 #, 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 bericht van %s is niet overgekomen omdat het ongeldig was."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat deze ongeldig waren."
+msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze ongeldig waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2661
+#: ../libpurple/protocols/oscar/oscar.c:2854
 #, 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 bericht van %s is niet overgekomen omdat het te groot was."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat deze te groot waren."
+msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze te groot waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2670
+#: ../libpurple/protocols/oscar/oscar.c:2863
 #, 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] ""
-"%hu bericht van %s is niet overgekomen omdat het te snel verzonden werd."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat deze te snel verzonden "
-"werden."
+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] "%hu bericht van %s is niet overgekomen omdat het te snel verzonden werd."
+msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze te snel verzonden werden."
 
-#: ../libpurple/protocols/oscar/oscar.c:2679
+#: ../libpurple/protocols/oscar/oscar.c:2872
 #, 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 bericht van %s is niet overgekomen omdat hij/zij te kwaadaardig is."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat hij/zij te kwaadaardig is."
+msgid "You missed %hu message from %s because his/her warning level is too high."
+msgid_plural "You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] "Je hebt %hu bericht van %s gemist omdat zijn/haar waarschuwingsniveau te hoog is."
+msgstr[1] "Je hebt %hu berichten van %s gemist omdat zijn/haar waarschuwingsniveau te hoog is."
 
-#: ../libpurple/protocols/oscar/oscar.c:2688
+#: ../libpurple/protocols/oscar/oscar.c:2881
 #, 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 bericht van %s is niet overgekomen omdat jij te kwaadaardig bent."
-msgstr[1] ""
-"%hu berichten van %s zijn niet overgekomen omdat jij te kwaadaardig bent."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural "You missed %hu messages from %s because your warning level is too high."
+msgstr[0] "Je hebt %hu bericht van %s gemist omdat het waarschuwingsniveau te hoog is."
+msgstr[1] "Je hebt %hu berichten van %s gemist omdat het waarschuwingsniveau te hoog is."
 
-#: ../libpurple/protocols/oscar/oscar.c:2697
+#: ../libpurple/protocols/oscar/oscar.c:2890
 #, 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."
@@ -9320,538 +9465,443 @@ msgstr[0] "%hu bericht van %s is niet overgekomen om een onbekende reden."
 msgstr[1] "%hu berichten van %s zijn niet overgekomen om een onbekende reden."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:3045
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan het bericht niet verzenden: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2921
+#: ../libpurple/protocols/oscar/oscar.c:3045
+#: ../libpurple/protocols/oscar/oscar.c:3050
+#: ../libpurple/protocols/oscar/oscar.c:3114
 msgid "Unknown reason."
 msgstr "Onbekende reden."
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/oscar/oscar.c:3048
 #: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan het bericht niet verzenden aan %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2921
+#: ../libpurple/protocols/oscar/oscar.c:3114
 #, c-format
 msgid "User information not available: %s"
 msgstr "Gebruikersinformatie niet beschikbaar: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2952
+#: ../libpurple/protocols/oscar/oscar.c:3151
 msgid "Online Since"
-msgstr "On-line sinds"
+msgstr "Online sinds"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
+#: ../libpurple/protocols/oscar/oscar.c:3156
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1188
 msgid "Member Since"
 msgstr "Lid sinds"
 
-#: ../libpurple/protocols/oscar/oscar.c:2992
-msgid "Available Message"
-msgstr "Beschikbaarheidsbericht"
-
-#: ../libpurple/protocols/oscar/oscar.c:3096
+#: ../libpurple/protocols/oscar/oscar.c:3250
 msgid "Your AIM connection may be lost."
 msgstr "Uw AIM-verbinding is misschien verbroken."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3284
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
+#: ../libpurple/protocols/oscar/oscar.c:3438
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[kan bericht niet weergeven omdat deze ongeldige tekens bevat.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3448
-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 ""
-"Uw laatste actie is niet gebeurd omdat uw snelheid te hoog ligt. Wacht "
-"alstublieft 10 seconden en probeer het dan nogmaals."
+#: ../libpurple/protocols/oscar/oscar.c:3602
+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 "Uw laatste actie is niet gebeurd omdat uw snelheid te hoog ligt. Wacht 10 seconden en probeer het dan nogmaals."
 
-#: ../libpurple/protocols/oscar/oscar.c:3533
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chatruimte %s is verbroken"
 
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/oscar/oscar.c:3919
 #: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Mobiel nummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3948
 msgid "Personal Web Page"
 msgstr "Persoonlijke webpagina"
 
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
+#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Additional Information"
 msgstr "Extra informatie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
-#: ../libpurple/protocols/oscar/oscar.c:3843
+#: ../libpurple/protocols/oscar/oscar.c:3965
+#: ../libpurple/protocols/oscar/oscar.c:3973
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
+#: ../libpurple/protocols/oscar/oscar.c:3976
+msgid "Work Information"
+msgstr "Werkinformatie"
+
+#: ../libpurple/protocols/oscar/oscar.c:3979
 msgid "Division"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3855
+#: ../libpurple/protocols/oscar/oscar.c:3980
 msgid "Position"
 msgstr "Positie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3857
+#: ../libpurple/protocols/oscar/oscar.c:3984
 msgid "Web Page"
 msgstr "Webpagina"
 
-#: ../libpurple/protocols/oscar/oscar.c:3860
-msgid "Work Information"
-msgstr "Werkinformatie"
-
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:4042
 msgid "Pop-Up Message"
 msgstr "Pop-up bericht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:4082
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "De volgende naam wordt geassocieerd met %s"
 msgstr[1] "De volgende namen worden geassocieerd met %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3987
+#: ../libpurple/protocols/oscar/oscar.c:4113
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Niets gevonden voor emailadres %s"
+msgstr "Niets gevonden voor e-mailadres %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4134
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "U zou een email moeten ontvangen met de vraag om %s te bevestigen."
+msgstr "Je zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4136
 msgid "Account Confirmation Requested"
 msgstr "Accountbevestiging aangevraagd"
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
+#: ../libpurple/protocols/oscar/oscar.c:4169
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format username because the requested name differs "
-"from the original."
-msgstr ""
-"Fout 0x%04x: Kan weergave van naam niet veranderen omdat de aangevraagde "
-"gebruikersnaam niet gelijk is aan het origineel."
+msgid "Error 0x%04x: Unable to format username because the requested name differs from the original."
+msgstr "Fout 0x%04x: Kan weergave van naam niet veranderen omdat de aangevraagde gebruikersnaam niet gelijk is aan het origineel."
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
+#: ../libpurple/protocols/oscar/oscar.c:4171
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr ""
-"Fout 0x%04x: Kan weergave van naam niet veranderen omdat deze ongeldig is."
+msgstr "Fout 0x%04x: Kan weergave van naam niet veranderen omdat deze ongeldig is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4173
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format username because the requested name is too "
-"long."
-msgstr ""
-"Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
-"te lang is."
+msgid "Error 0x%04x: Unable to format username because the requested name is too long."
+msgstr "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam te lang is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: ../libpurple/protocols/oscar/oscar.c:4175
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this username."
-msgstr ""
-"Fout 0x%04x: Kan email adres niet veranderen omdat er al een aanvraag in "
-"behandeling is."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this username."
+msgstr "Fout 0x%04x: Kan e-mailadres niet veranderen omdat er al een aanvraag in behandeling is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4051
+#: ../libpurple/protocols/oscar/oscar.c:4177
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
-"too many usernames associated with it."
-msgstr ""
-"Fout 0x%04x: Kan email adres niet veranderen omdat het adres reeds te veel "
-"gebruikersnamen toegewezen heeft gekregen."
+msgid "Error 0x%04x: Unable to change email address because the given address has too many usernames associated with it."
+msgstr "Fout 0x%04x: Kan e-mailadres niet veranderen omdat het adres reeds te veel gebruikersnamen toegewezen heeft gekregen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4053
+#: ../libpurple/protocols/oscar/oscar.c:4179
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
-"invalid."
-msgstr ""
-"Fout 0x%04x: Kan email adres niet veranderen omdat het adres ongeldig is."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgstr "Fout 0x%04x: Kan e-mailadres niet veranderen omdat het adres ongeldig is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4055
+#: ../libpurple/protocols/oscar/oscar.c:4181
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fout 0x%04x: Onbekende fout."
 
-#: ../libpurple/protocols/oscar/oscar.c:4057
+#: ../libpurple/protocols/oscar/oscar.c:4183
 msgid "Error Changing Account Info"
 msgstr "Fout bij aanpassen van accountgegevens"
 
-#: ../libpurple/protocols/oscar/oscar.c:4063
+#: ../libpurple/protocols/oscar/oscar.c:4189
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "Het email adres voor %s is %s"
+msgstr "Het e-mailadres voor %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4065
+#: ../libpurple/protocols/oscar/oscar.c:4191
 msgid "Account Info"
 msgstr "Accountinformatie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Uw IM-afbeelding is niet verstuurd. u moet een directe verbinding hebben om "
-"IM-afbeeldingen te sturen."
+#: ../libpurple/protocols/oscar/oscar.c:4377
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "Uw chat-afbeelding is niet verstuurd. u moet een directe verbinding hebben om IM-afbeeldingen te sturen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4522
+#: ../libpurple/protocols/oscar/oscar.c:4648
 msgid "Unable to set AIM profile."
 msgstr "Kan AIM-profiel niet instellen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4523
-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 ""
-"U heeft waarschijnlijk uw profiel aangepast voordat u volledig aangemeld "
-"was. Uw profiel is niet ingesteld. Probeert u het nogmaals wanneer u "
-"volledig aangemeld bent."
+#: ../libpurple/protocols/oscar/oscar.c:4649
+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 "Je hebt waarschijnlijk je profiel aangepast voordat je volledig aangemeld was. Je profiel is niet ingesteld. Probeer het nogmaals wanneer je volledig aangemeld bent."
 
-#: ../libpurple/protocols/oscar/oscar.c:4537
+#: ../libpurple/protocols/oscar/oscar.c:4663
 #, 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] ""
-"De maximale profielgrootte van %d byte is overschreden. Het is voor je "
-"afgebroken."
-msgstr[1] ""
-"De maximale profielgrootte van %d bytes is overschreden. Het is voor je "
-"afgebroken."
+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] "De maximale profielgrootte van %d byte is overschreden. Het is voor je afgebroken."
+msgstr[1] "De maximale profielgrootte van %d bytes is overschreden. Het is voor je afgebroken."
 
-#: ../libpurple/protocols/oscar/oscar.c:4542
+#: ../libpurple/protocols/oscar/oscar.c:4668
 msgid "Profile too long."
 msgstr "Profiel is te lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4586
+#: ../libpurple/protocols/oscar/oscar.c:4712
 #, 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] ""
-"De maximale grootte voor afwezigheidsberichten van %d byte is overschreden. "
-"Het is voor je afgebroken."
-msgstr[1] ""
-"De maximale grootte van afwezigheidsberichten van %d bytes is overschreden. "
-"het is voor je afgebroken."
+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] "De maximale grootte voor afwezigheidsberichten van %d byte is overschreden. Het is voor je afgebroken."
+msgstr[1] "De maximale grootte van afwezigheidsberichten van %d bytes is overschreden. het is voor je afgebroken."
 
-#: ../libpurple/protocols/oscar/oscar.c:4591
+#: ../libpurple/protocols/oscar/oscar.c:4717
 msgid "Away message too long."
 msgstr "Afwezigheidsbericht te lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4664
+#: ../libpurple/protocols/oscar/oscar.c:4790
 #, c-format
-msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
-"be a valid email address, or start with a letter and contain only letters, "
-"numbers and spaces, or contain only numbers."
-msgstr ""
-"Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
-"Gebruikersnamen moeten een geldig emailadres zijn, of beginnen met een "
-"letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
+msgid "Could not add the buddy %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4666
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5156
+#: ../libpurple/protocols/oscar/oscar.c:4792
+#: ../libpurple/protocols/oscar/oscar.c:5262
+#: ../libpurple/protocols/oscar/oscar.c:5277
 msgid "Unable To Add"
 msgstr "Kan niet toevoegen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4785
+#: ../libpurple/protocols/oscar/oscar.c:4911
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kan contactenlijst niet ophalen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4786
-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 minutes."
-msgstr ""
-"De AIM-servers kunnen tijdelijk je contactenlijst versturen. De lijst is "
-"niet verdwenen, je kan deze waarschijnlijk over enkele uren weer benaderen."
-
-#: ../libpurple/protocols/oscar/oscar.c:4982
-#: ../libpurple/protocols/oscar/oscar.c:4984
-#: ../libpurple/protocols/oscar/oscar.c:5223
-#: ../libpurple/protocols/oscar/oscar.c:5224
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:4912
+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 minutes."
+msgstr "De AIM-servers kunnen tijdelijk je contactenlijst versturen. De lijst is niet verdwenen, je kan deze waarschijnlijk over enkele uren weer benaderen."
+
+#: ../libpurple/protocols/oscar/oscar.c:5103
+#: ../libpurple/protocols/oscar/oscar.c:5105
+#: ../libpurple/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5345
+#: ../libpurple/protocols/oscar/oscar.c:5350
 msgid "Orphans"
 msgstr "Wezen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5260
 #, 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 ""
-"Kon %s niet als contact toevoegen omdat u te veel contacten in uw lijst "
-"heeft. Verwijder eerst een ander en probeer opnieuw."
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "Kon %s niet als contact toevoegen omdat u te veel contacten in uw lijst heeft. Verwijder eerst een ander en probeer opnieuw."
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
-#: ../libpurple/protocols/oscar/oscar.c:5154
+#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5275
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5274
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Kan contact %s niet toevoegen voor een onbekende reden."
 
-#: ../libpurple/protocols/oscar/oscar.c:5287
+#: ../libpurple/protocols/oscar/oscar.c:5408
 #, c-format
-msgid ""
-"The user %s has given you permission to add him or her to your buddy list.  "
-"Do you want to add this user?"
-msgstr ""
-"De gebruiker %s heeft u toestemming gegeven om u toe te voegen aan zijn of "
-"haar contactenlijst. Wilt u deze gebruiker toevoegen?"
+msgid "The user %s has given you permission to add him or her to your buddy list.  Do you want to add this user?"
+msgstr "De gebruiker %s heeft u toestemming gegeven om u toe te voegen aan zijn of haar contactenlijst. Wilt u deze gebruiker toevoegen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5295
+#: ../libpurple/protocols/oscar/oscar.c:5416
 msgid "Authorization Given"
 msgstr "Toestemming gegeven"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5489
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-"De gebruiker %s heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
-"contactenlijst."
+msgstr "De gebruiker %s heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw contactenlijst."
 
-#: ../libpurple/protocols/oscar/oscar.c:5369
+#: ../libpurple/protocols/oscar/oscar.c:5490
 msgid "Authorization Granted"
 msgstr "Toestemming gegeven"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5372
+#: ../libpurple/protocols/oscar/oscar.c:5493
 #, 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 ""
-"De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
-"contactenlijst geweigerd met de volgende reden:\n"
+"De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw contactenlijst geweigerd met de volgende reden:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5373
+#: ../libpurple/protocols/oscar/oscar.c:5494
 msgid "Authorization Denied"
 msgstr "Toestemming geweigerd"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5530
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Uitwisselen:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5643
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Uw IM-afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen in "
-"een AIM-chat."
-
-#: ../libpurple/protocols/oscar/oscar.c:5684
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "Away Message"
-msgstr "Afwezigheidsbericht"
-
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(ophalen)</i>"
+msgstr "Uw chat-afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen in een AIM-chat."
 
-#: ../libpurple/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5979
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5997
+#: ../libpurple/protocols/oscar/oscar.c:6087
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Contactopmerking voor %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5998
+#: ../libpurple/protocols/oscar/oscar.c:6088
 msgid "Buddy Comment:"
 msgstr "Contactopmerking:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6045
+#: ../libpurple/protocols/oscar/oscar.c:6135
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "U heeft ervoor gekozen om een directe verbinding te openen met %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:6049
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Omdat dit uw IP-adres zichtbaar maakt voor de andere partij kan het worden "
-"gezien als veiligheidsrisico. Wilt u doorgaan?"
+#: ../libpurple/protocols/oscar/oscar.c:6139
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "Omdat dit uw IP-adres zichtbaar maakt voor de andere partij kan het worden gezien als veiligheidsrisico. Wilt u doorgaan?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6055
+#: ../libpurple/protocols/oscar/oscar.c:6145
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6180
 msgid "Get AIM Info"
 msgstr "AIM-info ophalen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6096
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Edit Buddy Comment"
 msgstr "Opmerking bewerken"
 
-#: ../libpurple/protocols/oscar/oscar.c:6104
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "Get Status Msg"
 msgstr "Statusbericht tonen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6117
+#: ../libpurple/protocols/oscar/oscar.c:6207
 msgid "Direct IM"
 msgstr "Direct bericht"
 
-#: ../libpurple/protocols/oscar/oscar.c:6139
+#: ../libpurple/protocols/oscar/oscar.c:6229
 msgid "Re-request Authorization"
 msgstr "Opnieuw toestemming vragen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6198
+#: ../libpurple/protocols/oscar/oscar.c:6288
 msgid "Require authorization"
 msgstr "Identificatie nodig"
 
-#: ../libpurple/protocols/oscar/oscar.c:6201
+#: ../libpurple/protocols/oscar/oscar.c:6291
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webaanwezig (u kunt SPAM ontvangen als gevolg hiervan)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6206
+#: ../libpurple/protocols/oscar/oscar.c:6296
 msgid "ICQ Privacy Options"
 msgstr "ICQ privacy-opties"
 
-#: ../libpurple/protocols/oscar/oscar.c:6226
+#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "The new formatting is invalid."
 msgstr "De nieuwe formattering is ongeldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6227
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6317
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr ""
-"Formattering van de bijnaam mag alleen spaties en kapitalisering aanpassen."
+msgstr "Kan alleen alleen hoofdletter en spaties veranderen aan de formattering van de gebruikersnaam."
 
-#: ../libpurple/protocols/oscar/oscar.c:6280
+#: ../libpurple/protocols/oscar/oscar.c:6370
 msgid "Change Address To:"
 msgstr "Adres veranderen in: "
 
-#: ../libpurple/protocols/oscar/oscar.c:6326
+#: ../libpurple/protocols/oscar/oscar.c:6416
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>u wacht niet op toestemming</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "You are awaiting authorization from the following buddies"
 msgstr "U wacht op toestemming van de volgende contacten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6330
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de "
-"contacten te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
+#: ../libpurple/protocols/oscar/oscar.c:6420
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de contacten te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6437
 msgid "Find Buddy by Email"
-msgstr "Contact zoeken op email adres"
+msgstr "Contact zoeken op e-mailadres"
 
-#: ../libpurple/protocols/oscar/oscar.c:6348
+#: ../libpurple/protocols/oscar/oscar.c:6438
 msgid "Search for a buddy by email address"
-msgstr "Contact zoeken op email adres"
+msgstr "Contact zoeken op e-mailadres"
 
-#: ../libpurple/protocols/oscar/oscar.c:6349
+#: ../libpurple/protocols/oscar/oscar.c:6439
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Geef het email adres van de persoon waarnaar u zoekt."
+msgstr "Geef het e-mail adres van de persoon waarnaar je zoekt."
 
-#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/oscar/oscar.c:6442
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: ../libpurple/protocols/oscar/oscar.c:6510
+#: ../libpurple/protocols/oscar/oscar.c:6597
 msgid "Set User Info (web)..."
 msgstr "Gebruikersinfo Instellen (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
+#: ../libpurple/protocols/oscar/oscar.c:6608
 msgid "Change Password (web)"
 msgstr "Wachtwoord veranderen (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6525
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6612
 msgid "Configure IM Forwarding (web)"
-msgstr "IM-doorsturen configureren (URL)"
+msgstr "IM-doorsturen configureren (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6535
+#: ../libpurple/protocols/oscar/oscar.c:6622
 msgid "Set Privacy Options..."
 msgstr "Privacy-opties instellen..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6542
+#: ../libpurple/protocols/oscar/oscar.c:6629
 msgid "Confirm Account"
 msgstr "Account bevestigen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6546
+#: ../libpurple/protocols/oscar/oscar.c:6633
 msgid "Display Currently Registered Email Address"
-msgstr "Huidige geregistreerde emailadres weergeven"
+msgstr "Huidige geregistreerde e-mailadres weergeven"
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
+#: ../libpurple/protocols/oscar/oscar.c:6637
 msgid "Change Currently Registered Email Address..."
-msgstr "Huidige geregistreerde emailadres veranderen..."
+msgstr "Huidige geregistreerde e-mailadres veranderen..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6557
+#: ../libpurple/protocols/oscar/oscar.c:6644
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Contacten weergeven die op toestemming wachten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6563
+#: ../libpurple/protocols/oscar/oscar.c:6650
 msgid "Search for Buddy by Email Address..."
-msgstr "Contact zoeken door middel van email..."
+msgstr "Contact zoeken door middel van e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6568
+#: ../libpurple/protocols/oscar/oscar.c:6655
 msgid "Search for Buddy by Information"
 msgstr "Contact zoeken via informatie"
 
-#: ../libpurple/protocols/oscar/oscar.c:6756
+#: ../libpurple/protocols/oscar/oscar.c:6843
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
 "Altijd AIM/ICQ proxy gebruiken voor\n"
-"bestandsoverdrachten en directe gesprekken(langzaam, maar verbergt uw IP-"
-"adres)"
+"bestandsoverdrachten en directe gesprekken(langzaam, maar verbergt uw IP-adres)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6847
+msgid "Allow multiple simultaneous logins"
+msgstr "Meerdere keren gelijk inloggen toestaan"
 
 #: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-"Aanvraag van directe verbinding van %s naar %s:%hu voor berichtuitwisseling."
+msgstr "Aanvraag van directe verbinding van %s naar %s:%hu voor berichtuitwisseling."
 
 #: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
@@ -9868,262 +9918,249 @@ msgid "%s has just asked to directly connect to %s"
 msgstr "%s heeft net een directe verbinding met %s aangevraagd"
 
 #: ../libpurple/protocols/oscar/peer.c:1039
-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 ""
-"Dit vereist een directe verbinding tussen de twee computers (nodig voor "
-"afbeeldingen via chatberichten). Dit zou als een inbreuk op de privacy "
-"beschouwd kunnen worden omdat de ander dan uw IP-adres te weten komt."
+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 "Dit vereist een directe verbinding tussen de twee computers (nodig voor afbeeldingen via chatberichten). Dit zou als een inbreuk op de privacy beschouwd kunnen worden omdat de ander dan uw IP-adres te weten komt."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Primary Information"
 msgstr "Belangrijke Informatie"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "Personal Introduction"
 msgstr "Persoonlijke introductie"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:43
 msgid "QQ Number"
 msgstr "QQ Nummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Country/Region"
 msgstr "Land/Regio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "Province/State"
 msgstr "Provincie/Staat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:51
 msgid "Horoscope Symbol"
-msgstr "Sterrenbeeld (horoscoop)"
+msgstr "Sterrenbeeld"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Zodiac Sign"
 msgstr "Sterrenbeeld"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "Blood Type"
 msgstr "Bloedgroep"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "College"
-msgstr "College"
+msgstr "School"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Zipcode"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Cellphone Number"
 msgstr "Mobiele nummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:60
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Aquarius"
-msgstr ""
+msgstr "Waterman"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
-#, fuzzy
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Pisces"
-msgstr "Afbeeldingen"
+msgstr "Vissen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
-#, fuzzy
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Aries"
-msgstr "Adres"
+msgstr "Ram"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Taurus"
-msgstr "Tweelingen"
+msgstr "Stier"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
-#, fuzzy
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Gemini"
-msgstr "Duits"
+msgstr "Tweelingen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Cancer"
-msgstr "Gezwel"
+msgstr "Kreeft"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Leo"
 msgstr "Leeuw"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Virgo"
 msgstr "Maagd"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Libra"
-msgstr ""
+msgstr "Weegschaal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:67
 msgid "Scorpio"
 msgstr "Schorpioen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:67
 msgid "Sagittarius"
-msgstr ""
+msgstr "Boogschutter"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:67
 msgid "Capricorn"
 msgstr "Steenbok"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Rat"
 msgstr "Rat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Ox"
 msgstr "Rund"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Tiger"
 msgstr "Tijger"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Rabbit"
 msgstr "Konijn"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dragon"
 msgstr "Draak"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Snake"
 msgstr "Slang"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Horse"
 msgstr "Paard"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Goat"
 msgstr "Geit"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Monkey"
 msgstr "Aap"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:74
 msgid "Rooster"
 msgstr "Haan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:74
 msgid "Dog"
 msgstr "Hond"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:74
 msgid "Pig"
 msgstr "Varken"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:79
 msgid "Other"
 msgstr "Anders"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
+#: ../libpurple/protocols/qq/buddy_info.c:681
+#: ../libpurple/protocols/qq/buddy_info.c:682
 msgid "Modify my information"
 msgstr "Informatie wijzigen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
+#: ../libpurple/protocols/qq/buddy_info.c:683
 msgid "Update my information"
 msgstr "Informatie bijwerken"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
+#: ../libpurple/protocols/qq/buddy_info.c:707
 msgid "Your information has been updated"
 msgstr "Uw informatie is bijgewerkt"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
+#: ../libpurple/protocols/qq/buddy_info.c:759
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
-msgstr ""
-"Eigen gezichten instellen wordt nog niet ondersteund. Kies een afbeelding "
-"van %s"
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
+msgstr "Eigen gezichten instellen wordt nog niet ondersteund. Kies een afbeelding van %s"
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
+#: ../libpurple/protocols/qq/buddy_info.c:776
+#: ../libpurple/protocols/qq/buddy_info.c:789
 msgid "Invalid QQ Face"
 msgstr "Ongeldige QQ-gezicht"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:112
+#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/group_opt.c:114
 #, c-format
 msgid "You rejected %d's request"
 msgstr "U heeft %d's verzoek geweigerd"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 msgid "Input your reason:"
 msgstr "Geef uw reden:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/buddy_opt.c:211
 msgid "Reject request"
 msgstr "Verzoek weigeren"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:117
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Sorry, you are not my type..."
 msgstr "Sorry, niet mijn type..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
+#: ../libpurple/protocols/qq/buddy_opt.c:281
 msgid "Add buddy with auth request failed"
 msgstr "Toevoegen van gebruiker met autenticifatieverzoeken mislukt"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
+#: ../libpurple/protocols/qq/buddy_opt.c:314
 msgid "You have successfully removed a buddy"
-msgstr "U heeft het contact verwijderd"
+msgstr "Je hebt het contact verwijderd"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
+#: ../libpurple/protocols/qq/buddy_opt.c:344
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Je hebt jezelf succesvol bij de ander verwijderd als contact"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Gebruiker %d vereist autentificatie"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/group_join.c:128
 msgid "Input request here"
 msgstr "Geef hier uw verzoek"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
+#: ../libpurple/protocols/qq/buddy_opt.c:410
+#: ../libpurple/protocols/qq/group_join.c:129
 msgid "Would you be my friend?"
 msgstr "Wilt u mijn vriend zijn?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:119
+#: ../libpurple/protocols/qq/buddy_opt.c:411
+#: ../libpurple/protocols/qq/group_join.c:130
+#: ../libpurple/protocols/qq/group_opt.c:121
 msgid "Send"
 msgstr "Verzenden"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
+#: ../libpurple/protocols/qq/buddy_opt.c:421
 #, c-format
 msgid "You have added %d to buddy list"
-msgstr "U heeft %d toegevoegd aan uw contactenlijst"
+msgstr "Je hebt %d toegevoegd aan uw contactenlijst"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
+#: ../libpurple/protocols/qq/buddy_opt.c:518
 msgid "QQid Error"
 msgstr "QQid fout"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
+#: ../libpurple/protocols/qq/buddy_opt.c:519
 msgid "Invalid QQid"
 msgstr "Ongeldige QQid"
 
@@ -10159,59 +10196,59 @@ msgstr "Voer extern groeps-ID in"
 msgid "You can only search for permanent QQ groups\n"
 msgstr "U kunt alleen naar permanente QQ-groepen zoeken\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
+#: ../libpurple/protocols/qq/group_im.c:123
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "Gebruiker %d wil deelnemen aan de groep %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:196
+#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "Reason: %s"
 msgstr "Reden: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:281
-#: ../libpurple/protocols/qq/group_opt.c:367
+#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:177
+#: ../libpurple/protocols/qq/group_im.c:214
+#: ../libpurple/protocols/qq/group_im.c:246
+#: ../libpurple/protocols/qq/group_im.c:277
+#: ../libpurple/protocols/qq/group_join.c:220
+#: ../libpurple/protocols/qq/group_join.c:341
+#: ../libpurple/protocols/qq/group_opt.c:215
+#: ../libpurple/protocols/qq/group_opt.c:289
+#: ../libpurple/protocols/qq/group_opt.c:379
 msgid "QQ Qun Operation"
 msgstr "QQ Qun operatie"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/group_im.c:138
+#: ../libpurple/protocols/qq/group_opt.c:106
+#: ../libpurple/protocols/qq/sys_msg.c:93
+#: ../libpurple/protocols/qq/sys_msg.c:254
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../libpurple/protocols/qq/group_im.c:180
+#: ../libpurple/protocols/qq/group_im.c:174
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Uw aanvraag om lid te worden van groep %d is geweigerd door admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:212
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Uw aanvraag om lid te worden van groep %d is goedgekeurd door admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
+#: ../libpurple/protocols/qq/group_im.c:245
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "U [%d] heeft groep \"%d\" verlaten"
 
-#: ../libpurple/protocols/qq/group_im.c:291
+#: ../libpurple/protocols/qq/group_im.c:276
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "U [%d] bent toegevoegd aan groep \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_im.c:277
 msgid "This group has been added to your buddy list"
 msgstr "Deze groep is toegevoegd aan uw contactenlijst"
 
@@ -10239,27 +10276,27 @@ msgstr "Onbekende status"
 msgid "This group does not allow others to join"
 msgstr "Deze groep laat geen nieuwe deelnemers toe"
 
-#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:220
 msgid "You have successfully left the group"
-msgstr "U heeft de groep met succes verlaten"
+msgstr "Je hebt de groep met succes verlaten"
 
-#: ../libpurple/protocols/qq/group_join.c:257
+#: ../libpurple/protocols/qq/group_join.c:242
 msgid "QQ Group Auth"
 msgstr "QQ groepsauth"
 
-#: ../libpurple/protocols/qq/group_join.c:258
+#: ../libpurple/protocols/qq/group_join.c:243
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Uw autorisatieopdracht is geaccepteerd door de QQ-server"
 
-#: ../libpurple/protocols/qq/group_join.c:329
+#: ../libpurple/protocols/qq/group_join.c:311
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Je bent een groep ID binnengekomen buiten de accepteerbare grootte."
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:342
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Wilt u deze Qun echt verlaten?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
+#: ../libpurple/protocols/qq/group_join.c:344
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -10267,162 +10304,171 @@ msgstr ""
 "Opmerking: Als u de maker bent, \n"
 "deze opdracht verwijdert deze Qun uiteindelijk."
 
-#: ../libpurple/protocols/qq/group_network.c:92
+#: ../libpurple/protocols/qq/group_network.c:116
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Code [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:93
+#: ../libpurple/protocols/qq/group_network.c:117
 msgid "Group Operation Error"
 msgstr "Groepsopdrachtfout"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:99
-#: ../libpurple/protocols/qq/sys_msg.c:87
+#: ../libpurple/protocols/qq/group_opt.c:101
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you want to approve the request?"
 msgstr "Wilt u de aanvraag goedkeuren?"
 
-#: ../libpurple/protocols/qq/group_opt.c:113
+#: ../libpurple/protocols/qq/group_opt.c:115
 msgid "Enter your reason:"
 msgstr "Geef uw reden:"
 
-#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:215
 msgid "You have successfully modified Qun member"
 msgstr "Je hebt succesvol een Qun-lid bewerkt"
 
-#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:289
 msgid "You have successfully modified Qun information"
 msgstr "Je hebt met succes Qun-informatie bewerkt"
 
-#: ../libpurple/protocols/qq/group_opt.c:368
+#: ../libpurple/protocols/qq/group_opt.c:380
 msgid "You have successfully created a Qun"
-msgstr "U heeft een Qun aangemaakt"
+msgstr "Je hebt een Qun aangemaakt"
 
-#: ../libpurple/protocols/qq/group_opt.c:370
+#: ../libpurple/protocols/qq/group_opt.c:382
 msgid "Would you like to set up the Qun details now?"
 msgstr "Wilt u de Qundetails nu instellen?"
 
-#: ../libpurple/protocols/qq/group_opt.c:374
+#: ../libpurple/protocols/qq/group_opt.c:386
 msgid "Setup"
 msgstr "Instellen"
 
-#: ../libpurple/protocols/qq/im.c:432
+#: ../libpurple/protocols/qq/im.c:418
 msgid "System Message"
 msgstr "Systeembericht"
 
-#: ../libpurple/protocols/qq/im.c:576
+#: ../libpurple/protocols/qq/im.c:561
 msgid "Failed to send IM."
 msgstr "Kan bericht niet verzenden"
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-#, fuzzy
-msgid "Keep alive error"
-msgstr "Leesfout"
+#: ../libpurple/protocols/qq/qq.c:229
+#, c-format
+msgid "Unknown-%d"
+msgstr "Onbekend-%d"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
-msgid "Error requesting login token"
-msgstr "Fout bij maken verbinding"
+#: ../libpurple/protocols/qq/qq.c:283
+msgid "Level"
+msgstr "Niveau"
 
-#: ../libpurple/protocols/qq/login_logout.c:490
-msgid "Unable to login. Check debug log."
-msgstr "Kan niet aanmelden. Controleer debuglogboek."
+#: ../libpurple/protocols/qq/qq.c:289
+msgid "Member"
+msgstr "Lid"
 
-#: ../libpurple/protocols/qq/login_logout.c:493
-msgid "Unable to login"
-msgstr "Aanmelden niet mogelijk"
+#: ../libpurple/protocols/qq/qq.c:292
+msgid " VIP"
+msgstr "VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "Kan geen verbinding maken."
+#: ../libpurple/protocols/qq/qq.c:295
+msgid " TCP"
+msgstr "TCP"
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
-msgstr "Onbekend-%d"
+#: ../libpurple/protocols/qq/qq.c:298
+msgid " FromMobile"
+msgstr " Vanaf mobiel"
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "TCP-adres"
+#: ../libpurple/protocols/qq/qq.c:301
+#, fuzzy
+msgid " BindMobile"
+msgstr "Mobile"
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "UDP-adres"
+#: ../libpurple/protocols/qq/qq.c:304
+msgid " Video"
+msgstr "Video"
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
-msgstr "Niveau"
+#: ../libpurple/protocols/qq/qq.c:308
+msgid " Space"
+msgstr " Ruimte"
+
+#: ../libpurple/protocols/qq/qq.c:310
+#: ../libpurple/protocols/qq/qq.c:323
+msgid "Flag"
+msgstr "Vlag"
 
-#: ../libpurple/protocols/qq/qq.c:374
+#: ../libpurple/protocols/qq/qq.c:318
+msgid "Ver"
+msgstr ""
+
+#: ../libpurple/protocols/qq/qq.c:449
 msgid "Invalid name"
 msgstr "Ongeldige bijnaam"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:515
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
-msgstr "<b>Nu on-line</b>: %d<br>\n"
+msgstr "<b>Nu online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
+#: ../libpurple/protocols/qq/qq.c:516
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Laatst bijgewerkt</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:520
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Server</b>: %s: %d<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:521
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Verbinding</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:522
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>Server IP</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Echte hostnaam</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
+#: ../libpurple/protocols/qq/qq.c:523
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Mijn openbare IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:528
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Aanmeldtijd</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:529
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>IP laatste aanmelding</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
+#: ../libpurple/protocols/qq/qq.c:530
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Laatst aangemald</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Login Information"
 msgstr "Aanmeldinformatie"
 
-#: ../libpurple/protocols/qq/qq.c:534
+#: ../libpurple/protocols/qq/qq.c:610
 msgid "Set My Information"
-msgstr "Mijn Informatie Instellen"
+msgstr "Mijn informatie instellen"
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:613
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Wachtwoord veranderen"
 
-#: ../libpurple/protocols/qq/qq.c:540
+#: ../libpurple/protocols/qq/qq.c:616
 msgid "Show Login Information"
-msgstr "Aanmeldinformatie Weergeven"
+msgstr "Aanmeldinformatie weergeven"
 
-#: ../libpurple/protocols/qq/qq.c:561
+#: ../libpurple/protocols/qq/qq.c:637
 msgid "Leave this QQ Qun"
 msgstr "Laat dit QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:585
+#: ../libpurple/protocols/qq/qq.c:661
 msgid "Block this buddy"
 msgstr "Contact blokkeren"
 
@@ -10436,91 +10482,159 @@ msgstr "Contact blokkeren"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
+#: ../libpurple/protocols/qq/qq.c:778
+#: ../libpurple/protocols/qq/qq.c:780
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protocol\tPlugin"
 
-#: ../libpurple/protocols/qq/qq.c:753
+#: ../libpurple/protocols/qq/qq.c:811
 msgid "Connect using TCP"
 msgstr "Verbinding met behulp van TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+#: ../libpurple/protocols/qq/qq.c:814
+msgid "resend interval(s)"
+msgstr "intervallen opnieuw verzenden"
+
+#: ../libpurple/protocols/qq/qq.c:817
+msgid "Keep alive interval(s)"
+msgstr "Interval(len) om verbinding te behouden"
+
+#: ../libpurple/protocols/qq/qq.c:820
+msgid "Update interval(s)"
+msgstr "Intervallen vernieuwen"
+
+#: ../libpurple/protocols/qq/qq_network.c:144
+#: ../libpurple/protocols/qq/qq_network.c:799
+msgid "Failed to connect server"
+msgstr "Kan geen verbinding maken met de server"
+
+#: ../libpurple/protocols/qq/qq_network.c:254
+#: ../libpurple/protocols/qq/qq_network.c:379
 msgid "Socket error"
 msgstr "Socketfout"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#: ../libpurple/protocols/qq/qq_network.c:275
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Verbinding verloren met server:\n"
+"%d, %s"
+
+#: ../libpurple/protocols/qq/qq_network.c:392
 msgid "Unable to read from socket"
 msgstr "Kan niet lezen van socket"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+#: ../libpurple/protocols/qq/qq_network.c:458
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
+msgid "Write Error"
+msgstr "Schrijffout"
+
+#: ../libpurple/protocols/qq/qq_network.c:521
+msgid "Connection lost"
+msgstr "Verbinding verbroken"
+
+#: ../libpurple/protocols/qq/qq_network.c:707
+#: ../libpurple/protocols/simple/simple.c:1790
+msgid "Couldn't resolve host"
+msgstr "Kan host niet vinden"
+
+#: ../libpurple/protocols/qq/qq_network.c:806
+msgid "hostname is NULL or port is 0"
+msgstr "gastnaam is NULL of de poort is 0"
+
+#: ../libpurple/protocols/qq/qq_network.c:810
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Verbonden server %s, probeert over %d opnieuw"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libpurple/protocols/qq/qq_network.c:839
+#: ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
+#: ../libpurple/protocols/yahoo/ycht.c:550
+msgid "Unable to connect."
+msgstr "Kan geen verbinding maken."
+
+#: ../libpurple/protocols/qq/qq_network.c:853
+#: ../libpurple/protocols/simple/simple.c:1891
+msgid "Could not resolve hostname"
+msgstr "Kan hostnaam niet vinden"
+
+#: ../libpurple/protocols/qq/send_file.c:704
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d heeft het onderwerp veranderd naar: %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
+#: ../libpurple/protocols/qq/send_file.c:707
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr "Bestanden sturen"
 
-#: ../libpurple/protocols/qq/send_file.c:736
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d heeft de overdracht van %s afgebroken"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Verbinding verbroken"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Aanmelden mislukt, geen reactie!"
-
-#: ../libpurple/protocols/qq/sys_msg.c:111
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you want to add this buddy?"
 msgstr "Wilt u deze contact toevoegen?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:171
 #, c-format
 msgid "You have been added by %s"
 msgstr "U bent toegevoegd door %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
 msgid "Would you like to add him?"
 msgstr "Wilt u hem/haar toevoegen?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:182
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s heeft u [%s] aan zijn/haar contactenlijst toegevoegd"
 
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:198
 #, c-format
 msgid "User %s rejected your request"
 msgstr "De gebruiker %s heeft uw verzoek geweigerd"
 
-#: ../libpurple/protocols/qq/sys_msg.c:215
+#: ../libpurple/protocols/qq/sys_msg.c:218
 #, c-format
 msgid "User %s approved your request"
 msgstr "De gebruiker %s heeft uw verzoek goedgekeurd"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s wil jou [%s] als vriend toevoegen"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:245
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s staat niet in uw contactenlijst"
 
+#: ../libpurple/protocols/qq/sys_msg.c:287
+#, c-format
+msgid "Notice from: %s"
+msgstr "Aankondiging van: %s"
+
+#: ../libpurple/protocols/qq/sys_msg.c:288
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 #: ../libpurple/protocols/sametime/sametime.c:420
 msgid "Connection closed (writing)"
 msgstr "Verbinding verbroken (schrijven)"
@@ -10586,10 +10700,8 @@ msgstr "Starten van service"
 
 #: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-"Een Sametime-beheerder heeft de volgende mededeling gedaan op de server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr "Een Sametime-beheerder heeft de volgende mededeling gedaan op de server %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1685
 msgid "Sametime Administrator Announcement"
@@ -10655,12 +10767,8 @@ msgstr "Conferentie starten met gebruiker"
 
 #: ../libpurple/protocols/sametime/sametime.c:3433
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr ""
-"Geef alstublieft een onderwerp voor deze bijeenkomst, en een uitnodiging om "
-"naar %s te sturen"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "Geef een onderwerp voor deze bijeenkomst, en een uitnodiging om naar %s te sturen"
 
 #: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
@@ -10684,14 +10792,8 @@ msgstr "Gebruiker uitnodigen voor een bijeenkomst"
 
 #: ../libpurple/protocols/sametime/sametime.c:3518
 #, 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 ""
-"Kies een bijeenkomst uit onderstaande lijst om een uitnodiging naar %s te "
-"sturen. Kies \"Nieuwe bijeenkomst\" als u een nieuwe bijeenkomst wilt "
-"aanmaken."
+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 "Kies een bijeenkomst uit onderstaande lijst om een uitnodiging naar %s te sturen. Kies \"Nieuwe bijeenkomst\" als u een nieuwe bijeenkomst wilt aanmaken."
 
 #: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
@@ -10705,7 +10807,8 @@ msgstr "Uitnodigen voor bijeenkomst..."
 msgid "Send TEST Announcement"
 msgstr "TESTaankondiging sturen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3638 ../pidgin/gtkconv.c:4545
+#: ../libpurple/protocols/sametime/sametime.c:3638
+#: ../pidgin/gtkconv.c:4555
 msgid "Topic:"
 msgstr "Onderwerp:"
 
@@ -10715,12 +10818,8 @@ msgstr "Geen Sametime communityserver gegeven"
 
 #: ../libpurple/protocols/sametime/sametime.c:3691
 #, 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 ""
-"Er is geen computernaam of IP-adres inegsteld in Meanwhile-account %s. Vul "
-"hieronder alstublieft een in om dor te gaan met de aanmelding."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Er is geen computernaam of IP-adres inegsteld in Meanwhile-account %s. Vul hieronder één in om door te gaan met de aanmelding."
 
 #: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "Meanwhile Connection Setup"
@@ -10728,7 +10827,7 @@ msgstr "Instellen van verbinding"
 
 #: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
-msgstr "Geen Sametime communityserver gegeven"
+msgstr "Geen Sametime gemeenschapsserver gegeven"
 
 #: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
@@ -10741,7 +10840,7 @@ msgstr "Onbekend (0x%04x)<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
-msgstr "Laatst Cekende Client"
+msgstr "Laatst bekende client"
 
 # ui/epiphany.glade.h:126
 # ui/prompts.glade.h:3
@@ -10761,12 +10860,8 @@ msgstr "Er is een onduidelijk ID ingevuld"
 
 #: ../libpurple/protocols/sametime/sametime.c:4385
 #, 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 ""
-"Er zijn meerdere gebruikers gevonden die overeenkomen met '%s'. Kies de "
-"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+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 "Er zijn meerdere gebruikers gevonden die overeenkomen met '%s'. Kies de juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
 
 #: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
@@ -10778,12 +10873,8 @@ msgstr "Kan gebruiker niet toevoegen: gebruiker niet gevonden"
 
 #: ../libpurple/protocols/sametime/sametime.c:4476
 #, 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 ""
-"Identificatie '%s' heeft geen overeenkomende gebruikers in uw Sametime-"
-"groep. Deze ingang is uit uw lijst verwijderd."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "Identificatie '%s' heeft geen overeenkomende gebruikers in uw Sametime-groep. Deze ingang is uit uw lijst verwijderd."
 
 #: ../libpurple/protocols/sametime/sametime.c:5067
 #, c-format
@@ -10852,13 +10943,8 @@ msgstr "Notes adresboek groepsresultaten"
 
 #: ../libpurple/protocols/sametime/sametime.c:5445
 #, 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 ""
-"De identificatie '%s' kan naar ieder van de volgende groepen verwijzen. Kies "
-"de juiste uit de lijst hieronder."
+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 "De identificatie '%s' kan naar ieder van de volgende groepen verwijzen. Kies de juiste uit de lijst hieronder."
 
 #: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Select Notes Address Book"
@@ -10870,9 +10956,7 @@ msgstr "Kan groep niet toevoegen: groep niet gevonden"
 
 #: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "De identificatie '%s' gaf geen overeenkomende resultaten."
 
 #: ../libpurple/protocols/sametime/sametime.c:5536
@@ -10880,12 +10964,8 @@ msgid "Notes Address Book Group"
 msgstr "Notes adresboekgroep"
 
 #: ../libpurple/protocols/sametime/sametime.c:5537
-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 ""
-"Geef de groepsnaam in het veld hieronder om de groep en de leden toe te "
-"voegen aan uw contactenlijst."
+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 "Geef de groepsnaam in het veld hieronder om de groep en de leden toe te voegen aan uw contactenlijst."
 
 #: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
@@ -10894,16 +10974,11 @@ msgstr "Zoekresultaten voor '%s'"
 
 #: ../libpurple/protocols/sametime/sametime.c:5587
 #, 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 ""
-"De identificatie '%s' kan naar ieder van de volgende gebruikers verwijzen. U "
-"kunt deze gebruikers toevoegen aan uw lijst of berichten sturen door middel "
-"van de knoppen hieronder."
+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 "De identificatie '%s' kan naar ieder van de volgende gebruikers verwijzen. U kunt deze gebruikers toevoegen aan uw lijst of berichten sturen door middel van de knoppen hieronder."
 
-#: ../libpurple/protocols/sametime/sametime.c:5594 ../pidgin/gtknotify.c:794
+#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../pidgin/gtknotify.c:794
 msgid "Search Results"
 msgstr "Zoekresultaten"
 
@@ -10925,12 +11000,8 @@ msgid "Search for a user"
 msgstr "Gebruiker zoeken"
 
 #: ../libpurple/protocols/sametime/sametime.c:5662
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"Geef een naam of gedeeltelijk ID in het veld hieronder om te zoeken naar "
-"overeenkomende gebruikers"
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "Geef een naam of gedeeltelijk ID in het veld hieronder om te zoeken naar overeenkomende gebruikers"
 
 #: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "User Search"
@@ -11043,12 +11114,8 @@ msgstr "De andere gebruiker is niet meer aanwezig in het netwerk"
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"Verzoek tot uitwisselen van sleutels ontvangen van %s. Wilt u sleutels met "
-"deze persoon uitwisselen?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "Verzoek tot uitwisselen van sleutels ontvangen van %s. Wilt u sleutels met deze persoon uitwisselen?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
 #: ../libpurple/protocols/silc10/buddy.c:299
@@ -11108,11 +11175,11 @@ msgid "Cannot fetch the public key"
 msgstr "Kan publieke sleutel niet ophalen"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
+#: ../libpurple/protocols/silc/buddy.c:1670
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
+#: ../libpurple/protocols/silc10/buddy.c:1669
 msgid "Show Public Key"
-msgstr "Publieke Sleutel Weergeven"
+msgstr "Publieke sleutel weergeven"
 
 #: ../libpurple/protocols/silc/buddy.c:623
 #: ../libpurple/protocols/silc/buddy.c:1030
@@ -11151,17 +11218,12 @@ msgstr "Kan gebruikersinformatie niet ophalen"
 #: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr "De persoon %s is niet vertrouwd"
+msgstr "De persoon %s is niet betrouwbaar"
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/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 ""
-"U kunt geen meldingen krijgen totdat u de openbare sleutel van deze "
-"gebruiker importeert.  U kunt de opdracht \"Openbare sleutel ophalen\" "
-"gebruiken om de openbare sleutel te importeren."
+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 "Je kan geen meldingen krijgen totdat u de openbare sleutel van deze gebruiker importeert.  Je kan de opdracht \"Openbare sleutel ophalen\" gebruiken om de openbare sleutel te importeren."
 
 #. Open file selector to select the public key.
 #: ../libpurple/protocols/silc/buddy.c:1062
@@ -11177,12 +11239,8 @@ msgstr "De %s contactpersoon is niet aanwezig op het netwerk"
 
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc10/buddy.c:1084
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"Om de gebruiker toe te voegen moet u de openbare sleutel importeren. Klik op "
-"\"Importeren\" om de openbare sleutel te importeren."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "Om de gebruiker toe te voegen moet u de openbare sleutel importeren. Klik op \"Importeren\" om de openbare sleutel te importeren."
 
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1088
@@ -11196,224 +11254,216 @@ msgstr "Kies juiste gebruiker"
 
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc10/buddy.c:1186
-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 ""
-"Er zijn meerdere gebruikers gevonden met dezelfde openbare sleutel. Kies de "
-"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+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 "Er zijn meerdere gebruikers gevonden met dezelfde openbare sleutel. Kies de juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
 
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc10/buddy.c:1188
-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 ""
-"Er zijn meerdere gebruikers gevonden met dezelfde naam. Kies de juiste "
-"gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+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 "Er zijn meerdere gebruikers gevonden met dezelfde naam. Kies de juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Detached"
 msgstr "Losgekoppeld"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:59
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:50
 msgid "Indisposed"
 msgstr "Gammel"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:61
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:52
 msgid "Wake Me Up"
 msgstr "Maak me wakker"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:53
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:44
 msgid "Hyper Active"
 msgstr "Hyperactief"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc10/buddy.c:1501
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/silc.c:978
 #: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/buddy.c:1508
+#: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Blij"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:961
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:980
 #: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/buddy.c:1510
+#: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Verdrietig"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:963
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:982
 #: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/buddy.c:1512
+#: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Boos"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:965
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:984
 #: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/buddy.c:1514
+#: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:967
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:986
 #: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/buddy.c:1516
+#: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Beschaamd"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:969
+#: ../libpurple/protocols/silc/buddy.c:1518
+#: ../libpurple/protocols/silc/silc.c:988
 #: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/buddy.c:1518
+#: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Onoverwinnelijk"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/buddy.c:1520
 #: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
+#: ../libpurple/protocols/silc10/buddy.c:1520
 #: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Verliefd"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:973
+#: ../libpurple/protocols/silc/buddy.c:1522
+#: ../libpurple/protocols/silc/silc.c:992
 #: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/buddy.c:1522
+#: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Slaperig"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:975
+#: ../libpurple/protocols/silc/buddy.c:1524
+#: ../libpurple/protocols/silc/silc.c:994
 #: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:676
+#: ../libpurple/protocols/silc10/buddy.c:1524
+#: ../libpurple/protocols/silc10/silc.c:695
 #: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Verveeld"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:977
+#: ../libpurple/protocols/silc/buddy.c:1526
+#: ../libpurple/protocols/silc/silc.c:996
 #: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:678
+#: ../libpurple/protocols/silc10/buddy.c:1526
+#: ../libpurple/protocols/silc10/silc.c:697
 #: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Opgewonden"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:979
+#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/silc.c:998
 #: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:680
+#: ../libpurple/protocols/silc10/buddy.c:1528
+#: ../libpurple/protocols/silc10/silc.c:699
 #: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Angstig"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1220
-#: ../libpurple/protocols/silc10/buddy.c:1548
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Gebruikersmodi"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1237
-#: ../libpurple/protocols/silc10/buddy.c:1565
+#: ../libpurple/protocols/silc10/buddy.c:1577
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Voorkeurscontact"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1242
-#: ../libpurple/protocols/silc10/buddy.c:1570
+#: ../libpurple/protocols/silc10/buddy.c:1582
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Voorkeurstaal"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1587
 #: ../libpurple/protocols/silc/ops.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:1575
+#: ../libpurple/protocols/silc10/buddy.c:1587
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Apparaat"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
+#: ../libpurple/protocols/silc/buddy.c:1592
 #: ../libpurple/protocols/silc/ops.c:1252
-#: ../libpurple/protocols/silc10/buddy.c:1580
+#: ../libpurple/protocols/silc10/buddy.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:728
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libpurple/protocols/silc10/silc.c:747
+#: ../libpurple/protocols/silc10/silc.c:749
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
+#: ../libpurple/protocols/silc/buddy.c:1597
 #: ../libpurple/protocols/silc/ops.c:1257
-#: ../libpurple/protocols/silc10/buddy.c:1585
+#: ../libpurple/protocols/silc10/buddy.c:1597
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geo-locatie"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
+#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc10/buddy.c:1651
 msgid "Reset IM Key"
 msgstr "IM-sleutel resetten"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
+#: ../libpurple/protocols/silc/buddy.c:1658
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "IM with Key Exchange"
 msgstr "IM met sleuteluitwisseling"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
+#: ../libpurple/protocols/silc/buddy.c:1663
+#: ../libpurple/protocols/silc10/buddy.c:1662
 msgid "IM with Password"
 msgstr "IM met wachtwoord"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
+#: ../libpurple/protocols/silc/buddy.c:1676
+#: ../libpurple/protocols/silc10/buddy.c:1675
 msgid "Get Public Key..."
 msgstr "Openbare sleutel ophalen..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/buddy.c:1683
 #: ../libpurple/protocols/silc/ops.c:1625
-#: ../libpurple/protocols/silc10/buddy.c:1670
+#: ../libpurple/protocols/silc10/buddy.c:1682
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Gebruiker vernietigen"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/buddy.c:1693
 #: ../libpurple/protocols/silc/chat.c:1000
-#: ../libpurple/protocols/silc10/buddy.c:1680
+#: ../libpurple/protocols/silc10/buddy.c:1692
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Tekenen op whiteboard"
@@ -11518,18 +11568,8 @@ msgstr "Lijst van openbare sleutels in kanaal"
 
 #: ../libpurple/protocols/silc/chat.c:436
 #: ../libpurple/protocols/silc10/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 ""
-"Kanaalidentificatie wordt gebruikt om het kanaal te beveiligen tegen "
-"ongewenste personen. De identificaite kan op basis van wachtwoorden of "
-"digitale handtekeningen (sleutels). Alleen gebruikers die het juiste "
-"wachtwoord weten of waarvan de openbare sleutel in de lijst voorkomt kunnen "
-"deelnemen aan het kanaal."
+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 "Kanaalidentificatie wordt gebruikt om het kanaal te beveiligen tegen ongewenste personen. De identificaite kan op basis van wachtwoorden of digitale handtekeningen (sleutels). Alleen gebruikers die het juiste wachtwoord weten of waarvan de openbare sleutel in de lijst voorkomt kunnen deelnemen aan het kanaal."
 
 #: ../libpurple/protocols/silc/chat.c:445
 #: ../libpurple/protocols/silc/chat.c:446
@@ -11558,10 +11598,10 @@ msgstr "Groepsnaam"
 
 #: ../libpurple/protocols/silc/chat.c:604
 #: ../libpurple/protocols/silc/ops.c:1830
-#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc/silc.c:1255
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:937
+#: ../libpurple/protocols/silc10/silc.c:956
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
@@ -11569,7 +11609,7 @@ msgstr "Wachtwoord"
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Geef alstublieft de %s privé groepsnaam en het wachtwoord."
+msgstr "Geef de %s privé groepsnaam en het wachtwoord."
 
 #: ../libpurple/protocols/silc/chat.c:617
 #: ../libpurple/protocols/silc10/chat.c:598
@@ -11639,7 +11679,7 @@ msgstr "Privé-kanaal instellen"
 #: ../libpurple/protocols/silc/chat.c:983
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
-msgstr "Geheim kanaal resetten"
+msgstr "Geheim kanaal herstellen"
 
 #: ../libpurple/protocols/silc/chat.c:988
 #: ../libpurple/protocols/silc10/chat.c:965
@@ -11649,10 +11689,8 @@ msgstr "Geheim kanaal instellen"
 #: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"U moet lid zijn van het %s-kanaal voordat u mag deelnemen aan de privé-groep"
+msgid "You have to join the %s channel before you are able to join the private group"
+msgstr "U moet lid zijn van het %s-kanaal voordat u mag deelnemen aan de privé-groep"
 
 #: ../libpurple/protocols/silc/chat.c:1051
 #: ../libpurple/protocols/silc10/chat.c:1104
@@ -11665,33 +11703,40 @@ msgid "Cannot join private group"
 msgstr "Kan niet deelnamen aan privégroep"
 
 #: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1433
+#: ../libpurple/protocols/silc/silc.c:1452
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
+#: ../libpurple/protocols/silc10/silc.c:1162
 msgid "Call Command"
 msgstr "Oproep-opdracht"
 
 #: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1434
+#: ../libpurple/protocols/silc/silc.c:1453
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
+#: ../libpurple/protocols/silc10/silc.c:1162
 msgid "Cannot call command"
 msgstr "Kan opdracht niet starten"
 
 #: ../libpurple/protocols/silc/chat.c:1249
-#: ../libpurple/protocols/silc/silc.c:1435
+#: ../libpurple/protocols/silc/silc.c:1454
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1144
+#: ../libpurple/protocols/silc10/silc.c:1163
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85
+#: ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112
+#: ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120
+#: ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277
+#: ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288
+#: ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89
+#: ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -11703,11 +11748,16 @@ msgstr "Onbekende opdracht"
 msgid "Secure File Transfer"
 msgstr "Beveiligde bestandsoverdrachten"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86
+#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113
+#: ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121
+#: ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93
+#: ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -11717,11 +11767,13 @@ msgstr "Fout bij bestandsoverdracht"
 msgid "Remote disconnected"
 msgstr "Computer verbroken"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106
+#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Geen toegang"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Uitwisseling van sleutels mislukt"
 
@@ -11733,29 +11785,33 @@ msgstr "Verbinding verlopen"
 msgid "Creating connection failed"
 msgstr "Verbinding maken mislukt"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122
+#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Sessie voor bestandsoverdracht is niet aanwezig"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Geen sessie voor bestandsoverdracht actief"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278
+#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Bestandsoverdracht reeds gestart"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr ""
-"Kan geen overeenkomst bereiken over benodigde sleutels voor "
-"bestandsoverdracht"
+msgstr "Kan geen overeenkomst bereiken over benodigde sleutels voor bestandsoverdracht"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289
+#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Kan bestandsoverdracht niet starten"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kan bestand niet verzenden"
 
@@ -11763,7 +11819,8 @@ msgstr "Kan bestand niet verzenden"
 msgid "Error occurred"
 msgstr "Fout is opgetreden"
 
-#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
+#: ../libpurple/protocols/silc/ops.c:548
+#: ../libpurple/protocols/silc/ops.c:557
 #: ../libpurple/protocols/silc/ops.c:566
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -11802,7 +11859,8 @@ msgstr "<I>%s</I> heeft <I>%s's</I> instellingen verwijderd"
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "U bent uit <I>%s</I> weggeschopt door <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
+#: ../libpurple/protocols/silc/ops.c:733
+#: ../libpurple/protocols/silc/ops.c:738
 #: ../libpurple/protocols/silc/ops.c:743
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -11811,7 +11869,8 @@ msgstr "U bent uit <I>%s</I> weggeschopt door <I>%s</I> (%s)"
 msgid "You have been killed by %s (%s)"
 msgstr "U bent vernietigd door %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
+#: ../libpurple/protocols/silc/ops.c:764
+#: ../libpurple/protocols/silc/ops.c:769
 #: ../libpurple/protocols/silc/ops.c:774
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -11841,9 +11900,9 @@ msgid "Job Role"
 msgstr "Rol"
 
 #: ../libpurple/protocols/silc/ops.c:1032
-#: ../libpurple/protocols/silc/silc.c:1229
+#: ../libpurple/protocols/silc/silc.c:1248
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:930
+#: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -11878,7 +11937,7 @@ msgstr "Kanaaloprichter voor <I>%s</I> is <I>%s</I>"
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1074
 msgid "Real Name"
 msgstr "Echte naam"
 
@@ -11907,9 +11966,9 @@ msgid "_More..."
 msgstr "_Meer..."
 
 #: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/silc/silc.c:1312
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:994
+#: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr "Loskoppelen van server"
 
@@ -12036,10 +12095,10 @@ msgstr "Kan gebruiker niet bekijken"
 
 #: ../libpurple/protocols/silc/ops.c:1741
 #: ../libpurple/protocols/silc/ops.c:1792
-#: ../libpurple/protocols/silc/silc.c:394
+#: ../libpurple/protocols/silc/silc.c:395
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc10/silc.c:194
 msgid "Resuming session"
 msgstr "Herstellen van sessie"
 
@@ -12058,22 +12117,20 @@ msgstr "Verificatie van serversleutel"
 msgid "Passphrase required"
 msgstr "Wachtwoord vereist"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98
+#: ../libpurple/protocols/silc10/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's openbare sleutel ontvangen. Deze komt niet overeen met de opgeslagen "
-"sleutel. Wil je de publieke sleutel nog steeds accepteren?"
+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's openbare sleutel ontvangen. Deze komt niet overeen met de opgeslagen sleutel. Wil je de publieke sleutel nog steeds accepteren?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr ""
-"%s's openbare sleutel ontvangen. Wil je de publieke sleutel accepteren?"
+msgstr "%s's openbare sleutel ontvangen. Wil je de publieke sleutel accepteren?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107
+#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12086,104 +12143,113 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110
+#: ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Openbare sleutel verifiëren"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115
+#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "B_eeld..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Type openbare sleutel niet ondersteund"
 
-#: ../libpurple/protocols/silc/silc.c:319
+#: ../libpurple/protocols/silc/silc.c:320
 #: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Verbinding verbroken door server"
 
-#: ../libpurple/protocols/silc/silc.c:327
+#: ../libpurple/protocols/silc/silc.c:328
 #: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Fout bij verbinden met SILC-server"
 
-#: ../libpurple/protocols/silc/silc.c:333
+#: ../libpurple/protocols/silc/silc.c:334
 #: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Sleuteluitwisseling mislukt"
 
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:344
 #: ../libpurple/protocols/silc10/ops.c:1718
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Hervatten van losgekoppelde sessie mislukt. Klik op \"Opnieuw verbinden\" om "
-"een nieuwe verbinding te maken."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "Hervatten van losgekoppelde sessie mislukt. Klik op \"Opnieuw verbinden\" om een nieuwe verbinding te maken."
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:163
+#: ../libpurple/protocols/silc/silc.c:374
+#: ../libpurple/protocols/silc/silc.c:421
+#: ../libpurple/protocols/silc10/silc.c:164
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: ../libpurple/protocols/silc/silc.c:397
-#: ../libpurple/protocols/silc10/silc.c:196
+#: ../libpurple/protocols/silc/silc.c:398
+#: ../libpurple/protocols/silc10/silc.c:197
 msgid "Performing key exchange"
 msgstr "Bezig met sleuteluitwisseling"
 
-#: ../libpurple/protocols/silc/silc.c:449
-#: ../libpurple/protocols/silc10/silc.c:361
+#: ../libpurple/protocols/silc/silc.c:450
+#: ../libpurple/protocols/silc10/silc.c:362
 msgid "Unable to create connection"
 msgstr "Kan geen nieuwe verbinding maken"
 
-#: ../libpurple/protocols/silc/silc.c:492
-#: ../libpurple/protocols/silc/silc.c:508
-#: ../libpurple/protocols/silc/silc.c:537
-#: ../libpurple/protocols/silc10/silc.c:340
+#: ../libpurple/protocols/silc/silc.c:493
+#: ../libpurple/protocols/silc/silc.c:509
+#: ../libpurple/protocols/silc/silc.c:538
+#: ../libpurple/protocols/silc10/silc.c:341
 msgid "Could not load SILC key pair"
 msgstr "Kan SILC sleutelpaar niet laden"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:522
-#: ../libpurple/protocols/silc10/silc.c:329
+#: ../libpurple/protocols/silc/silc.c:523
+#: ../libpurple/protocols/silc10/silc.c:330
 msgid "Connecting to SILC Server"
 msgstr "Verbinden met SILC-server"
 
-#: ../libpurple/protocols/silc/silc.c:568
-#: ../libpurple/protocols/silc10/silc.c:271
+#: ../libpurple/protocols/silc/silc.c:569
+#: ../libpurple/protocols/silc10/silc.c:272
 msgid "Out of memory"
 msgstr "Te weinig geheugen"
 
-#: ../libpurple/protocols/silc/silc.c:619
-#: ../libpurple/protocols/silc10/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:620
+#: ../libpurple/protocols/silc10/silc.c:318
 msgid "Cannot initialize SILC protocol"
 msgstr "Kan SILC-protocol niet starten"
 
-#: ../libpurple/protocols/silc/silc.c:632
-#: ../libpurple/protocols/silc10/silc.c:324
+#: ../libpurple/protocols/silc/silc.c:633
+#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Error loading SILC key pair"
 msgstr "Fout in het laden van SILC sleutelpaar"
 
-#: ../libpurple/protocols/silc/silc.c:955
-#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc/silc.c:690
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:405
+#: ../libpurple/protocols/silc10/silc.c:1582
+#, c-format
+msgid "Download %s: %s"
+msgstr "Download %s: %s"
+
+#: ../libpurple/protocols/silc/silc.c:974
+#: ../libpurple/protocols/silc10/silc.c:675
 msgid "Your Current Mood"
 msgstr "Uw huidige stemming"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1795
+#: ../libpurple/protocols/silc/silc.c:976
+#: ../libpurple/protocols/silc10/silc.c:677
+#: ../pidgin/gtkprefs.c:1792
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../libpurple/protocols/silc/silc.c:971
-#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc10/silc.c:691
 msgid "In love"
 msgstr "Verliefd"
 
-#: ../libpurple/protocols/silc/silc.c:982
-#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc10/silc.c:702
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12191,371 +12257,334 @@ msgstr ""
 "\n"
 "Uw voorkeurscontactmethoden"
 
-#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:691
+#: ../libpurple/protocols/silc10/silc.c:710
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:693
+#: ../libpurple/protocols/silc10/silc.c:712
 #: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:994
-#: ../libpurple/protocols/silc10/silc.c:695
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/silc.c:714
 msgid "Video conferencing"
 msgstr "Video-conferencing"
 
-#: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc10/silc.c:700
+#: ../libpurple/protocols/silc/silc.c:1018
+#: ../libpurple/protocols/silc10/silc.c:719
 msgid "Your Current Status"
 msgstr "Uw huidige status"
 
-#: ../libpurple/protocols/silc/silc.c:1006
-#: ../libpurple/protocols/silc10/silc.c:707
+#: ../libpurple/protocols/silc/silc.c:1025
+#: ../libpurple/protocols/silc10/silc.c:726
 msgid "Online Services"
-msgstr "On-line diensten"
+msgstr "Online diensten"
 
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc10/silc.c:729
 msgid "Let others see what services you are using"
 msgstr "Anderen uw gebruikte diensten laten zien"
 
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:716
+#: ../libpurple/protocols/silc/silc.c:1034
+#: ../libpurple/protocols/silc10/silc.c:735
 msgid "Let others see what computer you are using"
 msgstr "Anderen door u gebruiket computer laten zien"
 
-#: ../libpurple/protocols/silc/silc.c:1022
-#: ../libpurple/protocols/silc10/silc.c:723
+#: ../libpurple/protocols/silc/silc.c:1041
+#: ../libpurple/protocols/silc10/silc.c:742
 msgid "Your VCard File"
 msgstr "Uw VCard-bestand"
 
-#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1047
 msgid "Timezone (UTC)"
 msgstr "Tijdzone (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:1032
-#: ../libpurple/protocols/silc/silc.c:1033
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc/silc.c:1051
+#: ../libpurple/protocols/silc/silc.c:1052
+#: ../libpurple/protocols/silc10/silc.c:754
+#: ../libpurple/protocols/silc10/silc.c:755
 msgid "User Online Status Attributes"
-msgstr "On-line gebruikersgegevens"
-
-#: ../libpurple/protocols/silc/silc.c:1034
-#: ../libpurple/protocols/silc10/silc.c:737
-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 ""
-"U kunt andere gebruikers uw on-line gegevens lateninzien. Geef de informatie "
-"waarvan u vind dat anderen die mogen zien."
-
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc/silc.c:1702
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:784
-#: ../libpurple/protocols/silc10/silc.c:1421
+msgstr "Online gebruikersgegevens"
+
+#: ../libpurple/protocols/silc/silc.c:1053
+#: ../libpurple/protocols/silc10/silc.c:756
+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 "U kunt andere gebruikers uw online gegevens laten inzien. Geef de informatie waarvan u vind dat anderen die mogen zien."
+
+#: ../libpurple/protocols/silc/silc.c:1094
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1721
+#: ../libpurple/protocols/silc10/silc.c:797
+#: ../libpurple/protocols/silc10/silc.c:803
+#: ../libpurple/protocols/silc10/silc.c:1440
 msgid "Message of the Day"
 msgstr "Bericht-van-de-dag"
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:1094
+#: ../libpurple/protocols/silc10/silc.c:797
 msgid "No Message of the Day available"
 msgstr "Geen bericht-van-de-dag beschikbaar"
 
-#: ../libpurple/protocols/silc/silc.c:1076
-#: ../libpurple/protocols/silc/silc.c:1697
-#: ../libpurple/protocols/silc10/silc.c:779
-#: ../libpurple/protocols/silc10/silc.c:1416
+#: ../libpurple/protocols/silc/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:798
+#: ../libpurple/protocols/silc10/silc.c:1435
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Er is geen bericht-van-de-dag geassocieerd met deze verbinding."
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc/silc.c:1244
-#: ../libpurple/protocols/silc/silc.c:1245
-#: ../libpurple/protocols/silc10/silc.c:830
-#: ../libpurple/protocols/silc10/silc.c:874
-#: ../libpurple/protocols/silc10/silc.c:945
-#: ../libpurple/protocols/silc10/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/silc.c:1192
+#: ../libpurple/protocols/silc/silc.c:1263
+#: ../libpurple/protocols/silc/silc.c:1264
+#: ../libpurple/protocols/silc10/silc.c:849
+#: ../libpurple/protocols/silc10/silc.c:893
+#: ../libpurple/protocols/silc10/silc.c:964
+#: ../libpurple/protocols/silc10/silc.c:965
 msgid "Create New SILC Key Pair"
 msgstr "Nieuw SILC sleutelpaar maken"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc10/silc.c:849
 msgid "Passphrases do not match"
 msgstr "Wachtwoorden zijn niet gelijk"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc/silc.c:1192
+#: ../libpurple/protocols/silc10/silc.c:893
 msgid "Key Pair Generation failed"
 msgstr "Aanmaken van sleutelpaar mislukt"
 
-#: ../libpurple/protocols/silc/silc.c:1212
-#: ../libpurple/protocols/silc10/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1231
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Key length"
 msgstr "Sleutellengte"
 
-#: ../libpurple/protocols/silc/silc.c:1214
-#: ../libpurple/protocols/silc10/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:1233
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Public key file"
 msgstr "Bestand voor openbare sleutel"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:1235
+#: ../libpurple/protocols/silc10/silc.c:936
 msgid "Private key file"
 msgstr "Bestand voor privésleutel"
 
-#: ../libpurple/protocols/silc/silc.c:1239
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc/silc.c:1258
+#: ../libpurple/protocols/silc10/silc.c:959
 msgid "Passphrase (retype)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: ../libpurple/protocols/silc/silc.c:1246
-#: ../libpurple/protocols/silc10/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:1265
+#: ../libpurple/protocols/silc10/silc.c:966
 msgid "Generate Key Pair"
 msgstr "Sleutelpaar aanmaken"
 
-#: ../libpurple/protocols/silc/silc.c:1289
-#: ../libpurple/protocols/silc10/silc.c:990
+#: ../libpurple/protocols/silc/silc.c:1308
+#: ../libpurple/protocols/silc10/silc.c:1009
 msgid "Online Status"
-msgstr "On-line status"
+msgstr "Online status"
 
-#: ../libpurple/protocols/silc/silc.c:1297
-#: ../libpurple/protocols/silc10/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1316
+#: ../libpurple/protocols/silc10/silc.c:1017
 msgid "View Message of the Day"
 msgstr "Bericht-van-de-dag weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1301
-#: ../libpurple/protocols/silc10/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1021
 msgid "Create SILC Key Pair..."
 msgstr "Aanmaken van SILC sleutelpaar..."
 
-#: ../libpurple/protocols/silc/silc.c:1393
-#: ../libpurple/protocols/silc10/silc.c:1101
+#: ../libpurple/protocols/silc/silc.c:1412
+#: ../libpurple/protocols/silc10/silc.c:1120
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "De gebruiker <I>%s</I> is niet aanwezig op het netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1573
-#: ../libpurple/protocols/silc10/silc.c:1292
+#: ../libpurple/protocols/silc/silc.c:1592
+#: ../libpurple/protocols/silc10/silc.c:1311
 msgid "Topic too long"
 msgstr "Onderwerp te lang"
 
-#: ../libpurple/protocols/silc/silc.c:1654
-#: ../libpurple/protocols/silc10/silc.c:1373
+#: ../libpurple/protocols/silc/silc.c:1673
+#: ../libpurple/protocols/silc10/silc.c:1392
 msgid "You must specify a nick"
 msgstr "U moet een bijnaam aangeven"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1475
+#: ../libpurple/protocols/silc/silc.c:1775
+#: ../libpurple/protocols/silc10/silc.c:1494
 #, c-format
 msgid "channel %s not found"
 msgstr "kanaal %s niet gevonden"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1499
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanaalinstellingen voor %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1763
-#: ../libpurple/protocols/silc10/silc.c:1482
+#: ../libpurple/protocols/silc/silc.c:1782
+#: ../libpurple/protocols/silc10/silc.c:1501
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "geen kanaalinstellingen voor %s"
 
-#: ../libpurple/protocols/silc/silc.c:1776
-#: ../libpurple/protocols/silc10/silc.c:1495
+#: ../libpurple/protocols/silc/silc.c:1795
+#: ../libpurple/protocols/silc10/silc.c:1514
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Kan kanaalinstellingen (cmodes) niet instellen voor %s"
 
-#: ../libpurple/protocols/silc/silc.c:1806
-#: ../libpurple/protocols/silc10/silc.c:1525
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1544
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Onbekende opdracht: %s, (zou een client-bug kunnen zijn)"
 
-#: ../libpurple/protocols/silc/silc.c:1869
-#: ../libpurple/protocols/silc10/silc.c:1588
+#: ../libpurple/protocols/silc/silc.c:1906
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanaal]:  Kanaal verlaten"
 
-#: ../libpurple/protocols/silc/silc.c:1873
-#: ../libpurple/protocols/silc10/silc.c:1592
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanaal]:  Kanaal verlaten"
 
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1596
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nieuw onderwerp&gt;]:  Onderwerp weergeven / veranderen"
 
-#: ../libpurple/protocols/silc/silc.c:1882
-#: ../libpurple/protocols/silc10/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1919
+#: ../libpurple/protocols/silc10/silc.c:1638
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;kanaal&gt; [&lt;wachtwoord&gt;]:  Deelnemen aan een kanaal op dit "
-"netwerk"
+msgstr "join &lt;kanaal&gt; [&lt;wachtwoord&gt;]:  Deelnemen aan een kanaal op dit netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1886
-#: ../libpurple/protocols/silc10/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1923
+#: ../libpurple/protocols/silc10/silc.c:1642
 msgid "list:  List channels on this network"
 msgstr "list:  Lijst van kanalen op dit netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1890
-#: ../libpurple/protocols/silc10/silc.c:1609
+#: ../libpurple/protocols/silc/silc.c:1927
+#: ../libpurple/protocols/silc10/silc.c:1646
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;bijnaam&gt;:  Informatie over bijnaam weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1894
-#: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/silc/silc.c:1931
+#: ../libpurple/protocols/silc10/silc.c:1650
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
-"gebruiker"
+msgstr "msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een gebruiker"
 
-#: ../libpurple/protocols/silc/silc.c:1898
-#: ../libpurple/protocols/silc10/silc.c:1617
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1654
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;bijnaam&gt; [&lt;bericht&gt;]:  Een privébercith sturen aan een "
-"gebruiker"
+msgstr "query &lt;bijnaam&gt; [&lt;bericht&gt;]:  Een privébercith sturen aan een gebruiker"
 
-#: ../libpurple/protocols/silc/silc.c:1902
-#: ../libpurple/protocols/silc10/silc.c:1621
+#: ../libpurple/protocols/silc/silc.c:1939
+#: ../libpurple/protocols/silc10/silc.c:1658
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Bericht-van-de-dag weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1906
-#: ../libpurple/protocols/silc10/silc.c:1625
+#: ../libpurple/protocols/silc/silc.c:1943
+#: ../libpurple/protocols/silc10/silc.c:1662
 msgid "detach:  Detach this session"
 msgstr "detach:  Deze sessie loskoppelen"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1629
+#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc10/silc.c:1666
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
-"quit [bericht]:  Verbinding met server verbreken, eventueel met "
-"afscheidsbericht"
+msgstr "quit [bericht]:  Verbinding met server verbreken, eventueel met afscheidsbericht"
 
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1670
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;opdracht&gt;:  Een willekeurige SILC-client-opdracht starten"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1639
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"kill &lt;bijnaam&gt; [-openbsleutel|&lt;reden&gt;]:  bijnaam vernietigen"
+msgstr "kill &lt;bijnaam&gt; [-openbsleutel|&lt;reden&gt;]:  bijnaam vernietigen"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1643
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nieuwebijnaam&gt;:  Uw bijnaam veranderen"
 
-#: ../libpurple/protocols/silc/silc.c:1928
-#: ../libpurple/protocols/silc10/silc.c:1647
+#: ../libpurple/protocols/silc/silc.c:1965
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;bijnaam&gt;:  Bijnaam's informatie weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1932
-#: ../libpurple/protocols/silc10/silc.c:1651
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;kanaal&gt; [+|-&lt;instellingen&gt;] [argumenten]:  "
-"Kanaalinstellingen weergeven of wijzigen"
+#: ../libpurple/protocols/silc/silc.c:1969
+#: ../libpurple/protocols/silc10/silc.c:1688
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;kanaal&gt; [+|-&lt;instellingen&gt;] [argumenten]:  Kanaalinstellingen weergeven of wijzigen"
 
-#: ../libpurple/protocols/silc/silc.c:1936
-#: ../libpurple/protocols/silc10/silc.c:1655
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;kanaal&gt; +|-&lt;instellingen&gt; &lt;bijnaam&gt;:  Instellingen "
-"voor gebruiker wijzigen op het kanaal"
+#: ../libpurple/protocols/silc/silc.c:1973
+#: ../libpurple/protocols/silc10/silc.c:1692
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;kanaal&gt; +|-&lt;instellingen&gt; &lt;bijnaam&gt;:  Instellingen voor gebruiker wijzigen op het kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:1940
-#: ../libpurple/protocols/silc10/silc.c:1659
+#: ../libpurple/protocols/silc/silc.c:1977
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-"umode &lt;gebruikersinstellingen&gt;:  Uw gebruikersinstellingen binnen het "
-"netwerk instellen"
+msgstr "umode &lt;gebruikersinstellingen&gt;:  Uw gebruikersinstellingen binnen het netwerk instellen"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1663
+#: ../libpurple/protocols/silc/silc.c:1981
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;bijnaam&gt; [-pubkey]:  Operator-status instellen"
 
-#: ../libpurple/protocols/silc/silc.c:1948
-#: ../libpurple/protocols/silc10/silc.c:1667
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;kanaal&gt; [-|+]&lt;bijnaam&gt;:  Iemand uitnodigen of toevoegen/"
-"verwijderen van de lijst met genodigden"
+#: ../libpurple/protocols/silc/silc.c:1985
+#: ../libpurple/protocols/silc10/silc.c:1704
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;kanaal&gt; [-|+]&lt;bijnaam&gt;:  Iemand uitnodigen of toevoegen/verwijderen van de lijst met genodigden"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1671
+#: ../libpurple/protocols/silc/silc.c:1989
+#: ../libpurple/protocols/silc10/silc.c:1708
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;kanaal&gt; &lt;bijnaam&gt; [commentaar]:  Iemand uit het kanaal "
-"schoppen"
+msgstr "kick &lt;kanaal&gt; &lt;bijnaam&gt; [commentaar]:  Iemand uit het kanaal schoppen"
 
-#: ../libpurple/protocols/silc/silc.c:1956
-#: ../libpurple/protocols/silc10/silc.c:1675
+#: ../libpurple/protocols/silc/silc.c:1993
+#: ../libpurple/protocols/silc10/silc.c:1712
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Serverdetails weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1679
+#: ../libpurple/protocols/silc/silc.c:1997
+#: ../libpurple/protocols/silc10/silc.c:1716
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr ""
-"ban [&lt;kanaal&gt; +|-&lt;bijnaam&gt;]:  Bepaalde gebruikers uit kanaal "
-"verbannen"
+msgstr "ban [&lt;kanaal&gt; +|-&lt;bijnaam&gt;]:  Bepaalde gebruikers uit kanaal verbannen"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1683
+#: ../libpurple/protocols/silc/silc.c:2001
+#: ../libpurple/protocols/silc10/silc.c:1720
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;bijnaam|server&gt;:  iemand openbare sleutel opvragen"
 
-#: ../libpurple/protocols/silc/silc.c:1968
-#: ../libpurple/protocols/silc10/silc.c:1687
+#: ../libpurple/protocols/silc/silc.c:2005
+#: ../libpurple/protocols/silc10/silc.c:1724
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- en netwerkstatistieken weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1972
-#: ../libpurple/protocols/silc10/silc.c:1691
+#: ../libpurple/protocols/silc/silc.c:2009
+#: ../libpurple/protocols/silc10/silc.c:1728
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  PING sturen aan huidige server"
 
-#: ../libpurple/protocols/silc/silc.c:1977
-#: ../libpurple/protocols/silc10/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:2014
+#: ../libpurple/protocols/silc10/silc.c:1733
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr ""
-"users &lt;kanaal&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
+msgstr "users &lt;kanaal&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1981
-#: ../libpurple/protocols/silc10/silc.c:1700
-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;kana(a)l(en)&gt;:  Lijst "
-"van gebruikers weergeven"
+#: ../libpurple/protocols/silc/silc.c:2018
+#: ../libpurple/protocols/silc10/silc.c:1737
+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;kana(a)l(en)&gt;:  Lijst van gebruikers weergeven"
 
 #. *< type
 #. *< ui_requirement
@@ -12566,68 +12595,69 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2092
-#: ../libpurple/protocols/silc10/silc.c:1825
+#: ../libpurple/protocols/silc/silc.c:2130
+#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protocol plugin"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2094
-#: ../libpurple/protocols/silc10/silc.c:1827
+#: ../libpurple/protocols/silc/silc.c:2132
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "Secure Internet Live Conferencing (SILC) protocol"
 
-#: ../libpurple/protocols/silc/silc.c:2135
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2150
+#: ../libpurple/protocols/silc/silc.c:2173
+#: ../libpurple/protocols/silc10/silc.c:1896
+#: ../pidgin/gtkprefs.c:2147
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:2146
-#: ../libpurple/protocols/silc10/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:2184
+#: ../libpurple/protocols/silc10/silc.c:1907
 msgid "Public Key file"
 msgstr "Bestand voor openbare sleutel"
 
-#: ../libpurple/protocols/silc/silc.c:2150
-#: ../libpurple/protocols/silc10/silc.c:1874
+#: ../libpurple/protocols/silc/silc.c:2188
+#: ../libpurple/protocols/silc10/silc.c:1911
 msgid "Private Key file"
 msgstr "Bestand voor privésleutel"
 
-#: ../libpurple/protocols/silc/silc.c:2160
-#: ../libpurple/protocols/silc10/silc.c:1884
+#: ../libpurple/protocols/silc/silc.c:2198
+#: ../libpurple/protocols/silc10/silc.c:1921
 msgid "Cipher"
 msgstr "Codering"
 
-#: ../libpurple/protocols/silc/silc.c:2170
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2208
+#: ../libpurple/protocols/silc10/silc.c:1931
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2173
+#: ../libpurple/protocols/silc/silc.c:2211
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Perfecte doorstuur-secretie gebruiken"
 
-#: ../libpurple/protocols/silc/silc.c:2177
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2215
+#: ../libpurple/protocols/silc10/silc.c:1934
 msgid "Public key authentication"
 msgstr "Certificering met openbare sleutel"
 
-#: ../libpurple/protocols/silc/silc.c:2180
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2218
+#: ../libpurple/protocols/silc10/silc.c:1937
 msgid "Block IMs without Key Exchange"
 msgstr "Berichten zonder sleuteluitwisseling blokkeren"
 
-#: ../libpurple/protocols/silc/silc.c:2183
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2221
+#: ../libpurple/protocols/silc10/silc.c:1940
 msgid "Block messages to whiteboard"
 msgstr "Berichten naar whiteboard blokkeren"
 
-#: ../libpurple/protocols/silc/silc.c:2186
-#: ../libpurple/protocols/silc10/silc.c:1906
+#: ../libpurple/protocols/silc/silc.c:2224
+#: ../libpurple/protocols/silc10/silc.c:1943
 msgid "Automatically open whiteboard"
 msgstr "Whiteboard automatisch openen"
 
-#: ../libpurple/protocols/silc/silc.c:2189
-#: ../libpurple/protocols/silc10/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:2227
+#: ../libpurple/protocols/silc10/silc.c:1946
 msgid "Digitally sign and verify all messages"
 msgstr "Alle berichten ondertekenen en controleren"
 
@@ -12662,7 +12692,7 @@ msgstr "Gebruiker: \t%s\n"
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "Email: \t\t%s\n"
+msgstr "E-mail: \t\t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:369
 #: ../libpurple/protocols/silc10/util.c:361
@@ -12751,24 +12781,22 @@ msgstr "PDA"
 #: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
-msgstr "Terminal"
+msgstr "Terminalvenster"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
+#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-"%s verzond een bericht naar het whiteboard. Wil je het whiteboard openen?"
+msgstr "%s verzond een bericht naar het whiteboard. Wil je het whiteboard openen?"
 
-#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
+#: ../libpurple/protocols/silc/wb.c:292
+#: ../libpurple/protocols/silc10/wb.c:291
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr ""
-"%s verzond een bericht naar het whiteboard in kanaal %s. Wil je het "
-"whiteboard openen?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "%s verzond een bericht naar het whiteboard in kanaal %s. Wil je het whiteboard openen?"
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
+#: ../libpurple/protocols/silc/wb.c:306
+#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
@@ -12778,9 +12806,7 @@ msgstr "Geen serverstatistieken beschikbaar"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-"Mislukt: Versies komen niet overeen. Installeer een nieuwe versie van uw "
-"programma"
+msgstr "Mislukt: Versies komen niet overeen. Installeer een nieuwe versie van uw programma"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
@@ -12818,15 +12844,15 @@ msgstr "Mislukt: Ongeldig cookie"
 msgid "Failure: Authentication failed"
 msgstr "Mislukt: Certificering mislukt"
 
-#: ../libpurple/protocols/silc10/silc.c:185
+#: ../libpurple/protocols/silc10/silc.c:186
 msgid "Cannot initialize SILC Client connection"
 msgstr "Kan SILC-verbinding niet starten"
 
-#: ../libpurple/protocols/silc10/silc.c:294
+#: ../libpurple/protocols/silc10/silc.c:295
 msgid "John Noname"
 msgstr "John Zondernaam"
 
-#: ../libpurple/protocols/silc10/silc.c:338
+#: ../libpurple/protocols/silc10/silc.c:339
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "kan SILC sleutelpaar niet laden: %s"
@@ -12851,16 +12877,7 @@ msgstr "Onbekend server-antwoord."
 msgid "Could not create listen socket"
 msgstr "Kan geen socket aanmaken om te luisteren"
 
-#: ../libpurple/protocols/simple/simple.c:1790
-msgid "Couldn't resolve host"
-msgstr "Kan host niet vinden"
-
-#: ../libpurple/protocols/simple/simple.c:1891
-msgid "Could not resolve hostname"
-msgstr "Kan hostnaam niet vinden"
-
 #: ../libpurple/protocols/simple/simple.c:1909
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-bijnamen mogen geen spaties of @-tekens bevatten"
 
@@ -12947,8 +12964,7 @@ msgstr "Waarschuwing van %s is niet toegestaan."
 
 #: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr ""
-"Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
+msgstr "Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
 
 #: ../libpurple/protocols/toc/toc.c:506
 #, c-format
@@ -12968,8 +12984,7 @@ msgstr "Een Bericht van %s is niet overgekomen omdat het te groot was."
 #: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
+msgstr "Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
 #: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
@@ -12989,7 +13004,7 @@ msgstr "Profielen service is momenteel niet toegankelijk."
 
 #: ../libpurple/protocols/toc/toc.c:530
 msgid "Email lookup restricted."
-msgstr "Email zoekfunctie beperkt."
+msgstr "Zoekfunctie e-mail beperkt."
 
 #: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
@@ -13013,7 +13028,6 @@ msgid "Failure unknown: %s."
 msgstr "Onbekende Fout: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, fuzzy
 msgid "Incorrect username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
@@ -13026,17 +13040,13 @@ msgid "Your warning level is currently too high to log in."
 msgstr "Uw waarschuwingsniveau is momenteel te hoog om in te loggen."
 
 #: ../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 ""
-"U hebt zich te snel aan en afgemeld. Wacht 10 Minuten en probeer het nog een "
-"keer."
+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 "U hebt zich te snel aan en afgemeld. Wacht 10 Minuten en probeer het nog een keer."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr "Onbekende Aanmeldingsfout: %s."
+msgstr "Onbekende aanmeldingsfout: %s."
 
 #: ../libpurple/protocols/toc/toc.c:563
 #, c-format
@@ -13063,7 +13073,8 @@ msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
 msgid "Password Change Successful"
 msgstr "Wachtwoord succesvol veranderd"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6848
+#: ../libpurple/protocols/toc/toc.c:1366
+#: ../pidgin/gtkblist.c:6957
 msgid "_Group:"
 msgstr "_Groep:"
 
@@ -13082,19 +13093,18 @@ msgstr "Kon %s niet openen om naar te schrijven!"
 
 #: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
-msgstr ""
-"Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk afgebroken."
+msgstr "Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk afgebroken."
 
-#: ../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 "Kan niet verbinden voor overdracht."
 
 #: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
-msgstr ""
-"Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden "
-"worden."
+msgstr "Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden worden."
 
 #: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
@@ -13122,121 +13132,99 @@ msgstr "%s vraagt u om een bestand te verzenden"
 #. *< 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-protocol plugin"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
+msgstr "%s verzond je een uitnodiging voor een webcam, wat nog niet wordt ondersteund."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:803
+#: ../libpurple/protocols/yahoo/yahoo.c:804
 msgid "Your Yahoo! message did not get sent."
 msgstr "Uw Yahoo! bericht is niet verzonden."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:916
+#: ../libpurple/protocols/yahoo/yahoo.c:917
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systeembericht voor %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "Authorization denied message:"
 msgstr "Identificatie van weigeringsbericht:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1008
+#: ../libpurple/protocols/yahoo/yahoo.c:1009
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
-"contactenlijst met terugwerkende kracht geweigerd met de volgende reden: %s"
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw contactenlijst met terugwerkende kracht geweigerd met de volgende reden: %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1011
+#: ../libpurple/protocols/yahoo/yahoo.c:1012
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"De gebruiker %s heeft geen toestemming gegeven. Hij/zij wordt NIET "
-"toegevoegd aan uw contactenlijst."
+msgstr "De gebruiker %s heeft geen toestemming gegeven. Hij/zij wordt NIET toegevoegd aan uw contactenlijst."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1013
+#: ../libpurple/protocols/yahoo/yahoo.c:1014
 msgid "Add buddy rejected"
 msgstr "Contact toevoegen geweigerd"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:2001
 #, 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 ""
-"De Yahoo-server heeft een niet herkende identificatiemethode aangevraagd. Je "
-"kan waarschijnlijk niet succesvol inloggen bij Yahoo. Kijk op %s voor "
-"updates."
+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 "De Yahoo-server heeft een niet herkende identificatiemethode aangevraagd. Je kan waarschijnlijk niet succesvol inloggen bij Yahoo. Kijk op %s voor updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2000
+#: ../libpurple/protocols/yahoo/yahoo.c:2005
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! identificatie mislukt"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2078
+#: ../libpurple/protocols/yahoo/yahoo.c:2085
 #, 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 ""
-"U probeert %s te negeren, maar de gebruiker staat in uw contactenlijst.  "
-"Klik op \"Ja\" om de gebruiker uit uw lijst te verwijderen en deze te "
-"negeren."
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "U probeert %s te negeren, maar de gebruiker staat in uw contactenlijst.  Klik op \"Ja\" om de gebruiker uit uw lijst te verwijderen en deze te negeren."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2081
+#: ../libpurple/protocols/yahoo/yahoo.c:2088
 msgid "Ignore buddy?"
 msgstr "Contact negeren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2152
+#: ../libpurple/protocols/yahoo/yahoo.c:2159
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Uw account is afgesloten. Meld u aan via de Yahoo website."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2162
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
-"kunnen lossen."
+msgstr "Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op kunnen lossen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2208
+#: ../libpurple/protocols/yahoo/yahoo.c:2215
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Kan contact %s niet toevoegen aan de groep %s in de server-lijst van account "
-"%s."
+msgstr "Kan contact %s niet toevoegen aan de groep %s in de server-lijst van account %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2211
+#: ../libpurple/protocols/yahoo/yahoo.c:2218
 msgid "Could not add buddy to server list"
 msgstr "Kan contact niet toevoegen aan serverlijst"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2333
+#: ../libpurple/protocols/yahoo/yahoo.c:2340
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2689
+#: ../libpurple/protocols/yahoo/yahoo.c:2696
 msgid "Received unexpected HTTP response from server."
 msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2718
-#: ../libpurple/protocols/yahoo/yahoo.c:2906
-#: ../libpurple/protocols/yahoo/yahoo.c:3011
-#: ../libpurple/protocols/yahoo/yahoo.c:3022
+#: ../libpurple/protocols/yahoo/yahoo.c:2725
+#: ../libpurple/protocols/yahoo/yahoo.c:2913
+#: ../libpurple/protocols/yahoo/yahoo.c:3018
+#: ../libpurple/protocols/yahoo/yahoo.c:3029
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/yahoochat.c:1595
 #: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Verbindingprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2744
+#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13245,7 +13233,7 @@ msgstr ""
 "Verbinding met %s:\n"
 "%s verloren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2769
+#: ../libpurple/protocols/yahoo/yahoo.c:2776
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13254,104 +13242,103 @@ msgstr ""
 "Kan geen verbinding maken met %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/protocols/yahoo/yahoo.c:3833
+#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3840
 msgid "Not at Home"
 msgstr "Niet thuis"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3140
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
+#: ../libpurple/protocols/yahoo/yahoo.c:3147
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "Not at Desk"
 msgstr "Niet op m'n plek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3839
+#: ../libpurple/protocols/yahoo/yahoo.c:3149
+#: ../libpurple/protocols/yahoo/yahoo.c:3846
 msgid "Not in Office"
 msgstr "Niet op kantoor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3146
-#: ../libpurple/protocols/yahoo/yahoo.c:3845
+#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3852
 msgid "On Vacation"
 msgstr "Op vakantie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3150
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:3157
+#: ../libpurple/protocols/yahoo/yahoo.c:3858
 msgid "Stepped Out"
 msgstr "Even weg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
+#: ../libpurple/protocols/yahoo/yahoo.c:3250
+#: ../libpurple/protocols/yahoo/yahoo.c:3280
 msgid "Not on server list"
 msgstr "Niet in de serverlijst"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3355
 msgid "Appear Online"
-msgstr "On-line weergeven"
+msgstr "Online weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
-#: ../libpurple/protocols/yahoo/yahoo.c:3369
+#: ../libpurple/protocols/yahoo/yahoo.c:3300
+#: ../libpurple/protocols/yahoo/yahoo.c:3376
 msgid "Appear Permanently Offline"
 msgstr "Altijd off-line weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
+#: ../libpurple/protocols/yahoo/yahoo.c:3318
 msgid "Presence"
 msgstr "Aanwezigheid"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3361
 msgid "Appear Offline"
 msgstr "Off-line weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3363
+#: ../libpurple/protocols/yahoo/yahoo.c:3370
 msgid "Don't Appear Permanently Offline"
 msgstr "Niet altijd off-line weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3411
+#: ../libpurple/protocols/yahoo/yahoo.c:3418
 msgid "Join in Chat"
 msgstr "Deelnemen aan Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3417
+#: ../libpurple/protocols/yahoo/yahoo.c:3424
 msgid "Initiate Conference"
 msgstr "Groepsgesprek openen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3445
+#: ../libpurple/protocols/yahoo/yahoo.c:3452
 msgid "Presence Settings"
 msgstr "Aanwezigheidsinstellingen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3451
+#: ../libpurple/protocols/yahoo/yahoo.c:3458
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3561
+#: ../libpurple/protocols/yahoo/yahoo.c:3568
 msgid "Activate which ID?"
 msgstr "Welk ID activeren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3572
+#: ../libpurple/protocols/yahoo/yahoo.c:3579
 msgid "Join whom in chat?"
 msgstr "Deelnemen aan wiens chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3584
+#: ../libpurple/protocols/yahoo/yahoo.c:3591
 msgid "Activate ID..."
 msgstr "ID activeren..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3588
+#: ../libpurple/protocols/yahoo/yahoo.c:3595
 msgid "Join User in Chat..."
 msgstr "Deelnemen aan chat van gebruiker..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3593
+#: ../libpurple/protocols/yahoo/yahoo.c:3600
 msgid "Open Inbox"
 msgstr "Iinbox Openen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4182
+#: ../libpurple/protocols/yahoo/yahoo.c:4189
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
+msgstr "join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4187
+#: ../libpurple/protocols/yahoo/yahoo.c:4194
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Lijst van kanalen op dit netwerk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4202
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -13365,56 +13352,56 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4411
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protocol plugin"
+msgstr "Yahoo-protocol-plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Pager server"
 msgstr "Semafoonserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4435
+#: ../libpurple/protocols/yahoo/yahoo.c:4442
 msgid "Japan Pager server"
 msgstr "Japanse semafoonserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4438
+#: ../libpurple/protocols/yahoo/yahoo.c:4445
 msgid "Pager port"
-msgstr "semafoon poort"
+msgstr "Semafoon-poort"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4441
+#: ../libpurple/protocols/yahoo/yahoo.c:4448
 msgid "File transfer server"
 msgstr "Server voor bestandsoverdrachten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4444
+#: ../libpurple/protocols/yahoo/yahoo.c:4451
 msgid "Japan file transfer server"
 msgstr "Japanse server voor bestandsoverdrachten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4447
+#: ../libpurple/protocols/yahoo/yahoo.c:4454
 msgid "File transfer port"
 msgstr "Bestandsoverdracht poortnummer"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4450
+#: ../libpurple/protocols/yahoo/yahoo.c:4457
 msgid "Chat room locale"
 msgstr "Taal van chatruimte"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4453
+#: ../libpurple/protocols/yahoo/yahoo.c:4460
 msgid "Ignore conference and chatroom invitations"
 msgstr "Conferentie- en chatruimteverzoeken negeren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4461
+#: ../libpurple/protocols/yahoo/yahoo.c:4468
 msgid "Chat room list URL"
 msgstr "URL voor lijst van ruimtes"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4464
+#: ../libpurple/protocols/yahoo/yahoo.c:4471
 msgid "Yahoo Chat server"
 msgstr "Yahoo chatserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4467
+#: ../libpurple/protocols/yahoo/yahoo.c:4474
 msgid "Yahoo Chat port"
 msgstr "Chatpoort Yahoo"
 
@@ -13438,101 +13425,75 @@ msgstr "Kan geen bestandsbeschrijving aanmaken."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s biedt u een collectie van %d bestanden aan.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Schrijffout"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Japan Profile"
 msgstr "Profiel van Yahoo! Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:799
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profiel"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"Helaas worden profielen met voor volwassenen bedoelde inhoud op dit moment "
-"nog niet ondersteund."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:839
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgstr "Helaas worden profielen met voor volwassenen bedoelde inhoud op dit moment nog niet ondersteund."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr ""
-"Als u dit profiel wilt zien, zult u deze verwijzing moeten openen in uw web-"
-"browser"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:841
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgstr "Als u dit profiel wilt zien, zult u deze verwijzing moeten openen in uw web-browser"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1036
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1112
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "Hobbies"
 
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1130
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "Laatste nieuws"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1155
 msgid "Home Page"
-msgstr "Homepage"
+msgstr "Startpagina"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1170
 msgid "Cool Link 1"
 msgstr "Toffe verwijding 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 msgid "Cool Link 2"
 msgstr "Toffe verwijzing 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 3"
 msgstr "Toffe verwijzing 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1193
 msgid "Last Update"
 msgstr "Laatst bijgewerkt"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1202
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Gebruikersinformatie voor %s niet beschikbaar"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr ""
-"Helaas worden profielen in deze taal op dit moment nog niet ondersteund."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1208
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgstr "Helaas worden profielen in deze taal op dit moment nog niet ondersteund."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"Kan gebruikersprofiel niet ophalen. Dit is waarschijnlijk een tijdelijk "
-"serverprobleem. Probeert u het later nogmaals."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "Kan gebruikersprofiel niet ophalen. Dit is waarschijnlijk een tijdelijk serverprobleem. Probeert u het later nogmaals."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
-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 ""
-"Kan gebruikersprofiel niet ophalen. Dit betekent waarschijnlijk dat de "
-"gebruiker niet bestaat. Soms kan Yahoo! ten onrechte een gebruiker niet "
-"vinde. Als u er zeker van bent dat de gebruiker bestaat, probeert u het dan "
-"later nogmaals."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1227
+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 "Kan gebruikersprofiel niet ophalen. Dit betekent waarschijnlijk dat de gebruiker niet bestaat. Soms kan Yahoo! ten onrechte een gebruiker niet vinde. Als u er zeker van bent dat de gebruiker bestaat, probeert u het dan later nogmaals."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1234
 msgid "The user's profile is empty."
 msgstr "Gebruikersprofiel is leeg."
 
@@ -13566,12 +13527,8 @@ msgid "Not available"
 msgstr "Niet beschikbaar"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:456
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Onbekende fout. U kunt misschien het beste afmelden en vijf minuten wachten "
-"voordta u dit weer probeert"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "Onbekende fout. U kunt misschien het beste afmelden en vijf minuten wachten voordta u dit weer probeert"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
@@ -13621,116 +13578,97 @@ msgstr ""
 "Verbinding met de server \n"
 "%s verloren"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:358
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(Er is een fout opgetreden bij het converteren van het bericht.\t Controleer "
-"de optie 'Codering' in het account)"
+#: ../libpurple/protocols/zephyr/zephyr.c:357
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(Er is een fout opgetreden bij het converteren van het bericht.\t Controleer de optie 'Codering' in het account)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:755
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kan niet naar chat sturen: %s%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:795
-#: ../libpurple/protocols/zephyr/zephyr.c:1170
+#: ../libpurple/protocols/zephyr/zephyr.c:794
+#: ../libpurple/protocols/zephyr/zephyr.c:1174
 msgid "Hidden or not logged-in"
 msgstr "Verborgen of niet aangemeld"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1172
+#: ../libpurple/protocols/zephyr/zephyr.c:800
+#: ../libpurple/protocols/zephyr/zephyr.c:1176
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> Om %s sinds %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1510
-#: ../libpurple/protocols/zephyr/zephyr.c:1511
+#: ../libpurple/protocols/zephyr/zephyr.c:1514
+#: ../libpurple/protocols/zephyr/zephyr.c:1515
 msgid "Anyone"
 msgstr "Iemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2369
+#: ../libpurple/protocols/zephyr/zephyr.c:2373
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2375
+#: ../libpurple/protocols/zephyr/zephyr.c:2379
 msgid "_Instance:"
 msgstr "_Instantie:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2381
+#: ../libpurple/protocols/zephyr/zephyr.c:2385
 msgid "_Recipient:"
 msgstr "_Ontvanger:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2392
+#: ../libpurple/protocols/zephyr/zephyr.c:2396
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Poging om te abonneren op %s,%s,%s mislukt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;bijnaam&gt;: Gebruiker zoeken"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2714
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;bijnaam&gt;: Gebruiker zoeken"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2719
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2724
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2725
+#: ../libpurple/protocols/zephyr/zephyr.c:2729
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2731
+#: ../libpurple/protocols/zephyr/zephyr.c:2735
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;klasse&gt; &lt;instantie&gt; &lt;ontvanger&gt;: Chat openen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2736
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi·&lt;instance&gt;:·Een bericht sturen aan·&lt;bericht,<i>instance</i>,*&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2740
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi·&lt;instance&gt;:·Een bericht sturen aan·&lt;bericht,<i>instance</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2742
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci·&lt;class&gt;·&lt;instance&gt;:·Een bericht sturen aan·&lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2746
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci·&lt;class&gt;·&lt;instance&gt;:·Een bericht sturen aan·&lt;<i>class</i>,<i>instance</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2748
-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;class&gt;·&lt;instance&gt;·&lt;ontvanger&gt;:·Een bericht sturen "
-"aan·&lt;<i>class</i>,<i>instance</i>,<i>ontvanger</i>&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2752
+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;class&gt;·&lt;instance&gt;·&lt;ontvanger&gt;:·Een bericht sturen aan·&lt;<i>class</i>,<i>instance</i>,<i>ontvanger</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2754
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir·&lt;instance&gt;·&lt;recipient&gt;:·Een bericht sturen aan·&lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2758
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir·&lt;instance&gt;·&lt;recipient&gt;:·Een bericht sturen aan·&lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2759
+#: ../libpurple/protocols/zephyr/zephyr.c:2763
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;class&gt;: Een bericht sturen aan &lt;<i>class</i>,PERSOONLIJK,*&gt;"
+msgstr "zc &lt;class&gt;: Een bericht sturen aan &lt;<i>class</i>,PERSOONLIJK,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
+#: ../libpurple/protocols/zephyr/zephyr.c:2839
 msgid "Resubscribe"
 msgstr "Opnieuw abonneren"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2838
+#: ../libpurple/protocols/zephyr/zephyr.c:2842
 msgid "Retrieve subscriptions from server"
 msgstr "Abonnementen ophalen van server"
 
@@ -13744,45 +13682,47 @@ msgstr "Abonnementen ophalen van server"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2931
-#: ../libpurple/protocols/zephyr/zephyr.c:2933
+#: ../libpurple/protocols/zephyr/zephyr.c:2935
+#: ../libpurple/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protocol plugin"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
+#: ../libpurple/protocols/zephyr/zephyr.c:2962
 msgid "Use tzc"
 msgstr "tzc gebruiken"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2965
 msgid "tzc command"
 msgstr "tzc opdracht"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2968
 msgid "Export to .anyone"
 msgstr "Exporteren naar .iemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2971
 msgid "Export to .zephyr.subs"
 msgstr "Exporteren naar .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2974
 msgid "Import from .anyone"
 msgstr "Importeren van .iemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2977
 msgid "Import from .zephyr.subs"
 msgstr "Importeren van .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2980
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2983
 msgid "Exposure"
 msgstr "Ontmaskering"
 
-#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
-#: ../libpurple/proxy.c:1695
+#: ../libpurple/proxy.c:493
+#: ../libpurple/proxy.c:955
+#: ../libpurple/proxy.c:1090
+#: ../libpurple/proxy.c:1698
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13791,39 +13731,43 @@ msgstr ""
 "Kan geen socket aanmaken:\n"
 "%s"
 
-#: ../libpurple/proxy.c:687
-#, fuzzy, c-format
+#: ../libpurple/proxy.c:694
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Kan de rol \"%s\" niet aangeven voor gebruiker: %s"
+msgstr "Kan antwoord van HTTP-proxy niet parsen: %S\n"
 
-#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
-#: ../libpurple/proxy.c:826
+#: ../libpurple/proxy.c:734
+#: ../libpurple/proxy.c:783
+#: ../libpurple/proxy.c:821
+#: ../libpurple/proxy.c:833
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy verbindingsfout %d"
 
-#: ../libpurple/proxy.c:822
+#: ../libpurple/proxy.c:829
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Toegang geweigerd: HTTP-proxy-server verbied tunnelen op poort %d."
 
-#: ../libpurple/proxy.c:1053
+#: ../libpurple/proxy.c:1051
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fout oplossing %s"
 
-#: ../libpurple/proxy.c:1793
+#: ../libpurple/proxy.c:1804
 msgid "Could not resolve host name"
 msgstr "Kan host niet vinden"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
+#: ../libpurple/request.h:1391
+#: ../pidgin/gtkblist.c:554
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
+#: ../libpurple/request.h:1391
+#: ../pidgin/gtkblist.c:554
 msgid "_No"
 msgstr "_Nee"
 
@@ -13845,22 +13789,12 @@ msgstr "Ik ben er even niet"
 msgid "saved statuses"
 msgstr "opgeslagen statussen"
 
-#: ../libpurple/server.c:265
+#: ../libpurple/server.c:264
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s heet nu %s.\n"
 
-#: ../libpurple/server.c:356
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "%s's aandacht vragen..."
-
-#: ../libpurple/server.c:401
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s vraagt om uw aandacht!"
-
-#: ../libpurple/server.c:898
+#: ../libpurple/server.c:827
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13869,15 +13803,34 @@ msgstr ""
 "%s nodigt %s uit in de chatruimte %s\n"
 "%s"
 
-#: ../libpurple/server.c:903
+#: ../libpurple/server.c:832
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s nodigt %s uit in de chatruimte %s\n"
 
-#: ../libpurple/server.c:907
+#: ../libpurple/server.c:836
 msgid "Accept chat invitation?"
 msgstr "Uitnodiging voor chat accepteren?"
 
+#. Shortcut
+#: ../libpurple/smiley.c:411
+#: ../pidgin/gtksmiley.c:504
+msgid "Shortcut"
+msgstr "Snelkoppeling"
+
+#: ../libpurple/smiley.c:412
+msgid "The text-shortcut for the smiley"
+msgstr "De tekst-snelkoppeling voor de smiley"
+
+#. Stored Image
+#: ../libpurple/smiley.c:418
+msgid "Stored Image"
+msgstr "Opgeslagen afbeelding"
+
+#: ../libpurple/smiley.c:419
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Opgeslagen afbeelding."
+
 #: ../libpurple/sslconn.c:164
 msgid "SSL Connection Failed"
 msgstr "SSL Verbinding Mislukt"
@@ -13894,58 +13847,59 @@ msgstr "SSL peer gaf een ongeldig certificaat"
 msgid "Unknown SSL error"
 msgstr "Onbekende SSL fout"
 
-#: ../libpurple/status.c:154
+#: ../libpurple/status.c:158
 msgid "Unset"
 msgstr "Niet ingesteld"
 
-#: ../libpurple/status.c:157 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1088
+#: ../libpurple/status.c:161
+#: ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1091
 msgid "Do not disturb"
 msgstr "Niet storen"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:164
 msgid "Extended away"
-msgstr "Uitgebreid weg"
+msgstr "Uitgebreide weg"
 
-#: ../libpurple/status.c:161
+#: ../libpurple/status.c:165
 msgid "Mobile"
-msgstr "Mobile"
+msgstr "Mobiel"
 
-#: ../libpurple/status.c:162
+#: ../libpurple/status.c:166
 msgid "Listening to music"
 msgstr "Naar muziek aan het luisteren"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:615
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) heeft status veranderd van %s naar %s"
 
-#: ../libpurple/status.c:622
+#: ../libpurple/status.c:626
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) is nu %s"
 
-#: ../libpurple/status.c:628
+#: ../libpurple/status.c:632
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) is niet meer %s"
 
-#: ../libpurple/status.c:1243
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s is inactief"
 
-#: ../libpurple/status.c:1263
+#: ../libpurple/status.c:1267
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is actief"
 
-#: ../libpurple/status.c:1329
+#: ../libpurple/status.c:1333
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s is inactief"
 
-#: ../libpurple/status.c:1331
+#: ../libpurple/status.c:1335
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is actief"
@@ -13955,110 +13909,103 @@ msgstr "+++ %s is actief"
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2804
+#: ../libpurple/util.c:2812
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fout bij lezen van %s"
 
-#: ../libpurple/util.c:2805
+#: ../libpurple/util.c:2813
 #, 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 ""
-"Er is een fout opgetreden bij lezen van uw %s. Deze is niet geladen. Het "
-"oude bestand is verplaatst naar %s~."
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "Er is een fout opgetreden bij lezen van uw %s. Deze is niet geladen. Het oude bestand is verplaatst naar %s~."
 
-#: ../libpurple/util.c:3304
+#: ../libpurple/util.c:3321
 msgid "Calculating..."
 msgstr "Berekenen..."
 
-#: ../libpurple/util.c:3307
+#: ../libpurple/util.c:3324
 msgid "Unknown."
 msgstr "Onbekend."
 
-#: ../libpurple/util.c:3333
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: ../libpurple/util.c:3345
+#: ../libpurple/util.c:3362
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: ../libpurple/util.c:3353
+#: ../libpurple/util.c:3370
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d uur"
 msgstr[1] "%s, %d uren"
 
-#: ../libpurple/util.c:3359
+#: ../libpurple/util.c:3376
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: ../libpurple/util.c:3367
+#: ../libpurple/util.c:3384
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuut"
 msgstr[1] "%s, %d minuten"
 
-#: ../libpurple/util.c:3373
+#: ../libpurple/util.c:3390
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: ../libpurple/util.c:3703
+#: ../libpurple/util.c:3650
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Kan %s niet openen: Te vaak doorverwezen"
 
-#: ../libpurple/util.c:3740 ../libpurple/util.c:4036
+#: ../libpurple/util.c:3687
+#: ../libpurple/util.c:3983
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan geen verbinding maken met %s"
 
-#: ../libpurple/util.c:3863
+#: ../libpurple/util.c:3810
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"Niet mogelijk om genoeg geheugen toe te wijzen om de inhoud van %s te "
-"bewaren. De webserver zou iets kwaadwilligs kunnen proberen te doen."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "Niet mogelijk om genoeg geheugen toe te wijzen om de inhoud van %s te bewaren. De webserver zou iets kwaadwilligs kunnen proberen te doen."
 
-#: ../libpurple/util.c:3898
+#: ../libpurple/util.c:3845
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Er is een fout opgetreden bij het lezen van%s: %s"
 
-#: ../libpurple/util.c:3929
+#: ../libpurple/util.c:3876
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fout bij schrijven naar %s: %s"
 
-#: ../libpurple/util.c:3954
+#: ../libpurple/util.c:3901
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Kan geen verbinding maken met %s: %s"
 
-#: ../libpurple/util.c:4766
+#: ../libpurple/util.c:4713
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4772
+#: ../libpurple/util.c:4719
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
@@ -14083,6 +14030,11 @@ msgstr "Verbinding verlopen."
 msgid "Connection refused."
 msgstr "Verbinding geweigerd."
 
+#. 10048
+#: ../libpurple/win32/libc_interface.c:334
+msgid "Address already in use."
+msgstr "Adres al in gebruik."
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Expresberichten"
@@ -14093,7 +14045,7 @@ msgstr "Pidgin Internet Messenger"
 
 #: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
-msgstr "Multi-protocol programma voor expresberichten"
+msgstr "Stuur chatberichten over verschillende diensten."
 
 #: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
@@ -14104,71 +14056,73 @@ msgid "The orientation of the tray."
 msgstr "De oriëntatie van het systeemvak."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:379
+#: ../pidgin/gtkaccount.c:417
 msgid "Login Options"
 msgstr "Aanmeldopties"
 
-#: ../pidgin/gtkaccount.c:400
+#: ../pidgin/gtkaccount.c:438
 msgid "Pro_tocol:"
 msgstr "Pro_tocol:"
 
-#: ../pidgin/gtkaccount.c:411 ../pidgin/gtkaccount.c:1039
+#: ../pidgin/gtkaccount.c:449
+#: ../pidgin/gtkaccount.c:1093
 msgid "_Username:"
 msgstr "_Gebruiker:"
 
-#: ../pidgin/gtkaccount.c:501
+#: ../pidgin/gtkaccount.c:555
 msgid "Remember pass_word"
 msgstr "_Wachtwoord onthouden"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:555
+#: ../pidgin/gtkaccount.c:609
 msgid "User Options"
 msgstr "Gebruikersopties"
 
-#: ../pidgin/gtkaccount.c:568
+#: ../pidgin/gtkaccount.c:622
 msgid "_Local alias:"
 msgstr "_Lokale bijnaam:"
 
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:626
 msgid "New _mail notifications"
-msgstr "Nieuwe e-_mail meldingen"
+msgstr "Nieuwe e-_mail-meldingen"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:631
 msgid "Use this buddy _icon for this account:"
 msgstr "Dit contact_plaatje gebruiken voor dit account:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:705
+#: ../pidgin/gtkaccount.c:759
 #, c-format
 msgid "%s Options"
 msgstr "%s Opties"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:964
 msgid "Use GNOME Proxy Settings"
 msgstr "Gebruik GNOME Proxy-instellingen"
 
-#: ../pidgin/gtkaccount.c:911
+#: ../pidgin/gtkaccount.c:965
 msgid "Use Global Proxy Settings"
 msgstr "Hoofdinstellingen gebruiken"
 
-#: ../pidgin/gtkaccount.c:917
+#: ../pidgin/gtkaccount.c:971
 msgid "No Proxy"
 msgstr "Geen proxy"
 
-#: ../pidgin/gtkaccount.c:923
+#: ../pidgin/gtkaccount.c:977
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:929
+#: ../pidgin/gtkaccount.c:983
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:989
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:941 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkaccount.c:995
+#: ../pidgin/gtkprefs.c:1337
 msgid "Use Environmental Settings"
 msgstr "Systeeminstellingen gebruiken"
 
@@ -14177,384 +14131,399 @@ msgstr "Systeeminstellingen gebruiken"
 #. 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:980
+#: ../pidgin/gtkaccount.c:1034
 msgid "If you look real closely"
 msgstr "Als u zeer aandachtig kijkt"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:983
+#: ../pidgin/gtkaccount.c:1037
 msgid "you can see the butterflies mating"
-msgstr "kunt u de vlinders zien copuleren"
+msgstr "kunt u de vlinders zien paren"
 
-#: ../pidgin/gtkaccount.c:1004
+#: ../pidgin/gtkaccount.c:1058
 msgid "Proxy Options"
 msgstr "Proxy-opties"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkaccount.c:1072
+#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
 
-#: ../pidgin/gtkaccount.c:1027 ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkaccount.c:1081
+#: ../pidgin/gtkprefs.c:1352
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:1373
+#: ../pidgin/gtkaccount.c:1085
+#: ../pidgin/gtkprefs.c:1370
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkaccount.c:1100
+#: ../pidgin/gtkprefs.c:1407
 msgid "Pa_ssword:"
 msgstr "_Wachtwoord:"
 
-#: ../pidgin/gtkaccount.c:1171
+#: ../pidgin/gtkaccount.c:1224
 msgid "Unable to save new account"
 msgstr "Kan nieuwe account niet opslaan"
 
-#: ../pidgin/gtkaccount.c:1172
+#: ../pidgin/gtkaccount.c:1225
 msgid "An account already exists with the specified criteria."
 msgstr "Er bestaat al een account met de gegeven criteria."
 
-#: ../pidgin/gtkaccount.c:1449
+#: ../pidgin/gtkaccount.c:1501
 msgid "Add Account"
 msgstr "Account toevoegen"
 
-#: ../pidgin/gtkaccount.c:1466
+#: ../pidgin/gtkaccount.c:1518
 msgid "_Basic"
 msgstr "_Simpel"
 
-#: ../pidgin/gtkaccount.c:1473
-msgid "Create this new account on the server"
-msgstr "Maak een nieuw account op deze server aan"
+#: ../pidgin/gtkaccount.c:1526
+msgid "Create _this new account on the server"
+msgstr "_Dit account op de server aanmaken"
 
-#: ../pidgin/gtkaccount.c:1487
+#: ../pidgin/gtkaccount.c:1540
 msgid "_Advanced"
 msgstr "_Geavanceerd"
 
-#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtkplugin.c:753
+#: ../pidgin/gtkaccount.c:1930
+#: ../pidgin/gtkplugin.c:757
 #: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../pidgin/gtkaccount.c:1936
+#: ../pidgin/gtkaccount.c:1958
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2139
+#: ../pidgin/gtkaccount.c:2154
 #, 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'>Welkom bij %s!</span>\n"
 "\n"
-"Je hebt geen accounts ingeschakeld. Om een verbinding te starten met %s druk "
-"op de <b>Toevoegen</b>-button hieronder en stel je eerste account in. Als je "
-"%s meerdere accounts wil laten onthouden, druk opnieuw op <b>Toevoegen</b>Om "
-"ze allemaal in te stellen.\n"
+"Je hebt geen accounts ingeschakeld. Om een verbinding te starten met %s druk op de <b>Toevoegen</b>-button hieronder en stel je eerste account in. Als je %s meerdere accounts wil laten onthouden, druk opnieuw op <b>Toevoegen</b>Om ze allemaal in te stellen.\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"
 
-#: ../pidgin/gtkblist.c:549
+#: ../pidgin/gtkblist.c:551
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural ""
-"You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Je hebt %d contact genaamd %s. Wil je deze samenvoegen?"
 msgstr[1] "Je hebt %d contacten genaamd %s. Wil je deze samenvoegen?"
 
-#: ../pidgin/gtkblist.c:550
-msgid ""
-"Merging these contacts will cause them to share a single entry on the buddy "
-"list and use a single conversation window. You can separate them again by "
-"choosing 'Expand' from the contact's context menu"
-msgstr ""
-"Samenvoeging van deze contacten zullen ze over een item verdelen bij de "
-"contactenlijst en gebruiken een enkel gespreks-venster. U kunt ze weer "
-"scheiden door weer te kiezen voor 'Uitvouwen' in het contact-menu"
+#: ../pidgin/gtkblist.c:552
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr "Samenvoeging van deze contacten zullen ze over een item verdelen bij de contactenlijst en gebruiken een enkel gespreks-venster. U kunt ze weer scheiden door weer te kiezen voor 'Uitvouwen' in het contact-menu"
 
-#: ../pidgin/gtkblist.c:683
-#, fuzzy
+#: ../pidgin/gtkblist.c:685
 msgid "Please update the necessary fields."
-msgstr "Update de belangrijke velden"
+msgstr "Update de belangrijke velden."
 
-#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkblist.c:6795
+#: ../pidgin/gtkblist.c:1040
+#: ../pidgin/gtkblist.c:6904
 msgid "Room _List"
 msgstr "_Lijst Van Ruimtes"
 
-#: ../pidgin/gtkblist.c:1058
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Geef alstublieft de benodigde informatie van de chat die u wilt openen.\n"
+#: ../pidgin/gtkblist.c:1060
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgstr "Geef de benodigde informatie van de chat die u wilt openen.\n"
 
-#: ../pidgin/gtkblist.c:1070 ../pidgin/gtkblist.c:6830
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
+#: ../pidgin/gtkblist.c:1072
+#: ../pidgin/gtkblist.c:6939
+#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkroomlist.c:540
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkblist.c:1351
+#: ../pidgin/gtkprivacy.c:549
 #: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Blokkeren"
 
-#: ../pidgin/gtkblist.c:1349
+#: ../pidgin/gtkblist.c:1351
 msgid "Un_block"
 msgstr "De_blokkeren"
 
-#: ../pidgin/gtkblist.c:1392
+#: ../pidgin/gtkblist.c:1394
 msgid "Move to"
 msgstr "Ga naar"
 
-#: ../pidgin/gtkblist.c:1432
+#: ../pidgin/gtkblist.c:1434
 msgid "Get _Info"
 msgstr "_Info opzoeken"
 
-#: ../pidgin/gtkblist.c:1435 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1437
+#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Bericht sturen"
 
-#: ../pidgin/gtkblist.c:1441
+#: ../pidgin/gtkblist.c:1443
 msgid "_Send File..."
-msgstr "Bestand _Sturen"
+msgstr "Bestand _sturen"
 
-#: ../pidgin/gtkblist.c:1448
+#: ../pidgin/gtkblist.c:1450
 msgid "Add Buddy _Pounce..."
-msgstr "_Contact-alarm Toevoegen"
+msgstr "_Contactalarm toevoegen"
 
-#: ../pidgin/gtkblist.c:1453 ../pidgin/gtkblist.c:1457
-#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1602
+#: ../pidgin/gtkblist.c:1455
+#: ../pidgin/gtkblist.c:1459
+#: ../pidgin/gtkblist.c:1622
+#: ../pidgin/gtkblist.c:1649
 msgid "View _Log"
 msgstr "_Logboek"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
+#: ../pidgin/gtkblist.c:1465
+#: ../pidgin/gtkblist.c:1594
 msgid "Hide when offline"
 msgstr "Verberg tijdens offline zijn"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
+#: ../pidgin/gtkblist.c:1465
+#: ../pidgin/gtkblist.c:1594
 msgid "Show when offline"
 msgstr "Weergeven tijdens offline zijn"
 
-#: ../pidgin/gtkblist.c:1477 ../pidgin/gtkblist.c:1486
-#: ../pidgin/gtkblist.c:1587 ../pidgin/gtkblist.c:1608
+#: ../pidgin/gtkblist.c:1479
+#: ../pidgin/gtkblist.c:1488
+#: ../pidgin/gtkblist.c:1632
+#: ../pidgin/gtkblist.c:1655
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkblist.c:1488
-#: ../pidgin/gtkblist.c:1589 ../pidgin/gtkblist.c:1610
+#: ../pidgin/gtkblist.c:1482
+#: ../pidgin/gtkblist.c:1490
+#: ../pidgin/gtkblist.c:1634
+#: ../pidgin/gtkblist.c:1657
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: ../pidgin/gtkblist.c:1538
+#: ../pidgin/gtkblist.c:1564
+msgid "Set Custom Icon"
+msgstr "Eigen pictogram instellen"
+
+#: ../pidgin/gtkblist.c:1568
+#: ../pidgin/gtkconv.c:2916
+msgid "Remove Custom Icon"
+msgstr "Contactenplaatje Verwijderen"
+
+#: ../pidgin/gtkblist.c:1582
 msgid "Add _Buddy..."
 msgstr "_Contact toevoegen"
 
-#: ../pidgin/gtkblist.c:1541
+#: ../pidgin/gtkblist.c:1585
 msgid "Add C_hat..."
 msgstr "C_hat toevoegen"
 
-#: ../pidgin/gtkblist.c:1544
+#: ../pidgin/gtkblist.c:1588
 msgid "_Delete Group"
 msgstr "Groep _verwijderen"
 
-#: ../pidgin/gtkblist.c:1546
+#: ../pidgin/gtkblist.c:1590
 msgid "_Rename"
 msgstr "_Hernoemen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1616
+#: ../pidgin/gtkroomlist.c:313
+#: ../pidgin/gtkroomlist.c:587
+#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Deelnemen"
 
-#: ../pidgin/gtkblist.c:1573
+#: ../pidgin/gtkblist.c:1618
 msgid "Auto-Join"
-msgstr "Auto-deelnemen"
+msgstr "Automatisch deelnemen"
 
-#: ../pidgin/gtkblist.c:1575
-#, fuzzy
+#: ../pidgin/gtkblist.c:1620
 msgid "Persistent"
-msgstr "Perzisch"
+msgstr "Blijvend deelnemen"
 
-#: ../pidgin/gtkblist.c:1585
+#: ../pidgin/gtkblist.c:1630
 msgid "_Edit Settings..."
-msgstr "Instellingen _Bewerken..."
+msgstr "Instellingen _bewerken..."
 
-#: ../pidgin/gtkblist.c:1615 ../pidgin/gtkblist.c:1638
+#: ../pidgin/gtkblist.c:1664
+#: ../pidgin/gtkblist.c:1689
 msgid "_Collapse"
 msgstr "_Dichtvouwen"
 
-#: ../pidgin/gtkblist.c:1643
+#: ../pidgin/gtkblist.c:1694
 msgid "_Expand"
 msgstr "_Uitvouwen"
 
-#: ../pidgin/gtkblist.c:1894 ../pidgin/gtkblist.c:1906
-#: ../pidgin/gtkblist.c:5494 ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:1947
+#: ../pidgin/gtkblist.c:1959
+#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5603
 msgid "/Tools/Mute Sounds"
 msgstr "/Extra/Geluiden dempen"
 
-#: ../pidgin/gtkblist.c:2366 ../pidgin/gtkconv.c:4947
-#: ../pidgin/gtkpounce.c:437
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"U bent op het moment niet aangemeld met een protocol die deze persoon kan "
-"toevoegen."
+#: ../pidgin/gtkblist.c:2419
+#: ../pidgin/gtkconv.c:4957
+#: ../pidgin/gtkpounce.c:451
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr "U bent op het moment niet aangemeld met een protocol die deze persoon kan toevoegen."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2717
-#, fuzzy
+#: ../pidgin/gtkblist.c:2805
 msgid "Unknown node type"
-msgstr "Onbekende foutcode %d"
+msgstr "Onbekende node-type"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3154
+#: ../pidgin/gtkblist.c:3241
 msgid "/_Buddies"
 msgstr "/_Contacten"
 
-#: ../pidgin/gtkblist.c:3155
+#: ../pidgin/gtkblist.c:3242
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacten/Nieuw _bericht..."
 
-#: ../pidgin/gtkblist.c:3156
+#: ../pidgin/gtkblist.c:3243
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacten/Chat _openen..."
 
-#: ../pidgin/gtkblist.c:3157
+#: ../pidgin/gtkblist.c:3244
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacten/_Gebruikersinfo..."
 
-#: ../pidgin/gtkblist.c:3158
+#: ../pidgin/gtkblist.c:3245
 msgid "/Buddies/View User _Log..."
-msgstr "/Contacten/_Logboek Bekijken..."
+msgstr "/Contacten/_Logboek bekijken..."
 
-#: ../pidgin/gtkblist.c:3160
+#: ../pidgin/gtkblist.c:3247
 msgid "/Buddies/Sh_ow"
-msgstr "/Contacten/_Weergeven"
+msgstr "/Contacten/_Weergave"
 
-#: ../pidgin/gtkblist.c:3161
+#: ../pidgin/gtkblist.c:3248
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Contacten/Weergeven/_Offline Contacten"
+msgstr "/Contacten/Weergave/_Offline contacten"
 
-#: ../pidgin/gtkblist.c:3162
+#: ../pidgin/gtkblist.c:3249
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Contacten/Weergeven/_Lege Groepen"
+msgstr "/Contacten/Weergave/_Lege groepen"
 
-#: ../pidgin/gtkblist.c:3163
+#: ../pidgin/gtkblist.c:3250
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Contacten/Weergeven/Contact_details"
+msgstr "/Contacten/Weergave/Contact_details"
 
-#: ../pidgin/gtkblist.c:3164
+#: ../pidgin/gtkblist.c:3251
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Contacten/Weergeven/Inactieve _Tijden"
+msgstr "/Contacten/Weergave/Inactieve _tijden"
 
-#: ../pidgin/gtkblist.c:3165
+#: ../pidgin/gtkblist.c:3252
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Contacten/Weergave/_Protocol Plaatjes"
+msgstr "/Contacten/Weergave/_Protocol pictogrammen"
 
-#: ../pidgin/gtkblist.c:3166
+#: ../pidgin/gtkblist.c:3253
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Contacten/Contacten _Sorteren"
+msgstr "/Contacten/Contacten _sorteren"
 
-#: ../pidgin/gtkblist.c:3168
+#: ../pidgin/gtkblist.c:3255
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Contacten/Contact _Toevoegen..."
+msgstr "/Contacten/Contact _toevoegen..."
 
-#: ../pidgin/gtkblist.c:3169
+#: ../pidgin/gtkblist.c:3256
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacten/_Chat toevoegen..."
 
-#: ../pidgin/gtkblist.c:3170
+#: ../pidgin/gtkblist.c:3257
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacten/Groep toe_voegen..."
 
-#: ../pidgin/gtkblist.c:3172
+#: ../pidgin/gtkblist.c:3259
 msgid "/Buddies/_Quit"
 msgstr "/Contacten/_Afsluiten"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3175
+#: ../pidgin/gtkblist.c:3262
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#: ../pidgin/gtkblist.c:3176 ../pidgin/gtkblist.c:7515
-msgid "/Accounts/Manage"
-msgstr "/Accounts/Beheer"
+#: ../pidgin/gtkblist.c:3263
+#: ../pidgin/gtkblist.c:7631
+msgid "/Accounts/Manage Accounts"
+msgstr "/Accounts/Accounts beheren"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3179
+#: ../pidgin/gtkblist.c:3266
 msgid "/_Tools"
 msgstr "/E_xtra"
 
-#: ../pidgin/gtkblist.c:3180
+#: ../pidgin/gtkblist.c:3267
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Extra/_Contact-alarm"
+msgstr "/Extra/_Contactalarm"
 
-#: ../pidgin/gtkblist.c:3181
+#: ../pidgin/gtkblist.c:3268
 msgid "/Tools/_Certificates"
 msgstr "/Extra/_Certificaten"
 
-#: ../pidgin/gtkblist.c:3182
+#: ../pidgin/gtkblist.c:3269
 msgid "/Tools/Plu_gins"
 msgstr "/Extra/_Plugins"
 
-#: ../pidgin/gtkblist.c:3183
+#: ../pidgin/gtkblist.c:3270
 msgid "/Tools/Pr_eferences"
 msgstr "/Extra/_Voorkeuren"
 
-#: ../pidgin/gtkblist.c:3184
+#: ../pidgin/gtkblist.c:3271
 msgid "/Tools/Pr_ivacy"
 msgstr "/Extra/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:3186
+#: ../pidgin/gtkblist.c:3272
+msgid "/Tools/Smile_y"
+msgstr "/Extra/Smile_y"
+
+#: ../pidgin/gtkblist.c:3274
 msgid "/Tools/_File Transfers"
 msgstr "/Extra/_Bestandsoverdrachten"
 
-#: ../pidgin/gtkblist.c:3187
+#: ../pidgin/gtkblist.c:3275
 msgid "/Tools/R_oom List"
 msgstr "/Extra/Lijst van _ruimtes"
 
-#: ../pidgin/gtkblist.c:3188
+#: ../pidgin/gtkblist.c:3276
 msgid "/Tools/System _Log"
 msgstr "/Extra/_Systeemlogboek"
 
-#: ../pidgin/gtkblist.c:3190
+#: ../pidgin/gtkblist.c:3278
 msgid "/Tools/Mute _Sounds"
 msgstr "/Extra/Geluiden _dempen"
 
 #. Help
-#: ../pidgin/gtkblist.c:3192
+#: ../pidgin/gtkblist.c:3280
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: ../pidgin/gtkblist.c:3193
+#: ../pidgin/gtkblist.c:3281
 msgid "/Help/Online _Help"
-msgstr "/Hulp/On-line _hulp"
+msgstr "/Hulp/Online _hulp"
 
-#: ../pidgin/gtkblist.c:3194
+#: ../pidgin/gtkblist.c:3282
 msgid "/Help/_Debug Window"
 msgstr "/Hulp/_Debugvenster"
 
-#: ../pidgin/gtkblist.c:3196 ../pidgin/gtkblist.c:3198
+#: ../pidgin/gtkblist.c:3284
+#: ../pidgin/gtkblist.c:3286
 msgid "/Help/_About"
 msgstr "/Hulp/_Info"
 
-#: ../pidgin/gtkblist.c:3229
+#: ../pidgin/gtkblist.c:3317
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Account:</b> %s"
 
-#: ../pidgin/gtkblist.c:3248
+#: ../pidgin/gtkblist.c:3336
 #, c-format
 msgid ""
 "\n"
@@ -14563,7 +14532,7 @@ msgstr ""
 "\n"
 "<b>Deelnemers:</b> %d"
 
-#: ../pidgin/gtkblist.c:3253
+#: ../pidgin/gtkblist.c:3342
 #, c-format
 msgid ""
 "\n"
@@ -14572,86 +14541,89 @@ msgstr ""
 "\n"
 "<b>Onderwerp:</b> %s"
 
-#: ../pidgin/gtkblist.c:3253
+#: ../pidgin/gtkblist.c:3342
 msgid "(no topic set)"
 msgstr "(geen onderwerp ingesteld)"
 
-#: ../pidgin/gtkblist.c:3332
+#: ../pidgin/gtkblist.c:3421
 msgid "Buddy Alias"
 msgstr "Contact Alias"
 
-#: ../pidgin/gtkblist.c:3361
+#: ../pidgin/gtkblist.c:3450
 msgid "Logged In"
 msgstr "Ingelogd"
 
-#: ../pidgin/gtkblist.c:3407
+#: ../pidgin/gtkblist.c:3496
 msgid "Last Seen"
-msgstr "Voor Het Laatst Gezien"
+msgstr "Voor het laatste gezien"
 
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3517
 msgid "Spooky"
 msgstr "Spookachtig"
 
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3519
 msgid "Awesome"
 msgstr "Geweldig"
 
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3521
 msgid "Rockin'"
 msgstr "Rocken"
 
-#: ../pidgin/gtkblist.c:3463
+#: ../pidgin/gtkblist.c:3552
 msgid "Total Buddies"
-msgstr "Totaal Aantal Contacten"
+msgstr "Aantal contacten"
 
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:3914
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactief %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3827
+#: ../pidgin/gtkblist.c:3916
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactief %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3829
+#: ../pidgin/gtkblist.c:3918
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactief %dm"
 
-#: ../pidgin/gtkblist.c:3983
+#: ../pidgin/gtkblist.c:4072
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacten/Nieuw bericht..."
 
-#: ../pidgin/gtkblist.c:3984 ../pidgin/gtkblist.c:4017
+#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4106
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacten/Chat _openen..."
 
-#: ../pidgin/gtkblist.c:3985
+#: ../pidgin/gtkblist.c:4074
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacten/_Gebruikersinfo..."
 
-#: ../pidgin/gtkblist.c:3986
+#: ../pidgin/gtkblist.c:4075
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacten/Contact _toevoegen..."
 
-#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkblist.c:4020
+#: ../pidgin/gtkblist.c:4076
+#: ../pidgin/gtkblist.c:4109
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacten/_Chat toevoegen..."
 
-#: ../pidgin/gtkblist.c:3988
+#: ../pidgin/gtkblist.c:4077
 msgid "/Buddies/Add Group..."
 msgstr "/Contacten/Groep toe_voegen..."
 
-#: ../pidgin/gtkblist.c:4023
+#: ../pidgin/gtkblist.c:4112
 msgid "/Tools/Privacy"
 msgstr "/Extra/Privacy"
 
-#: ../pidgin/gtkblist.c:4026
+#: ../pidgin/gtkblist.c:4115
 msgid "/Tools/Room List"
 msgstr "/Extra/Lijst van ruimtes"
 
-#: ../pidgin/gtkblist.c:4158 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4247
+#: ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14659,186 +14631,173 @@ msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d ongelezen bericht van %s\n"
 msgstr[1] "%d ongelezen berichten van %s\n"
 
-#: ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkblist.c:4410
 msgid "Manually"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkblist.c:4324
+#: ../pidgin/gtkblist.c:4413
 msgid "By status"
 msgstr "Op status"
 
-#: ../pidgin/gtkblist.c:4325
+#: ../pidgin/gtkblist.c:4414
 msgid "By log size"
 msgstr "Op logboekgrootte"
 
-#: ../pidgin/gtkblist.c:4663
+#: ../pidgin/gtkblist.c:4752
 #, c-format
 msgid "%s disconnected"
 msgstr "%s heeft de verbinding verbroken"
 
-#: ../pidgin/gtkblist.c:4665
+#: ../pidgin/gtkblist.c:4754
 #, c-format
 msgid "%s disabled"
 msgstr "%s uitgeschakeld"
 
-#: ../pidgin/gtkblist.c:4669
+#: ../pidgin/gtkblist.c:4758
 msgid "Reconnect"
-msgstr "Verbinding Herstellen"
+msgstr "Verbinding herstellen"
 
-#: ../pidgin/gtkblist.c:4669 ../pidgin/gtkblist.c:4788
+#: ../pidgin/gtkblist.c:4758
+#: ../pidgin/gtkblist.c:4877
 msgid "Re-enable"
-msgstr "Weer Aanzetten"
+msgstr "Weer aanzetten"
 
-#: ../pidgin/gtkblist.c:4786
+#: ../pidgin/gtkblist.c:4875
 msgid "Welcome back!"
-msgstr "Welkom Terug!"
+msgstr "Welkom terug!"
 
-#: ../pidgin/gtkblist.c:4822
+#: ../pidgin/gtkblist.c:4911
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural ""
-"%d accounts were disabled because you signed on from another location:"
-msgstr[0] ""
-"%d account werd uitgeschakeld omdat je inlogde van een andere locatie"
-msgstr[1] ""
-"%d account werden uitgeschakeld omdat je inlogde van een andere locatie"
+msgid_plural "%d accounts were disabled because you signed on from another location:"
+msgstr[0] "%d account werd uitgeschakeld omdat je inlogde van een andere locatie"
+msgstr[1] "%d account werden uitgeschakeld omdat je inlogde van een andere locatie"
 
-#: ../pidgin/gtkblist.c:5101
+#: ../pidgin/gtkblist.c:5195
 msgid "<b>Username:</b>"
 msgstr "<b>Gebruikersnaam:</b>"
 
-#: ../pidgin/gtkblist.c:5108
+#: ../pidgin/gtkblist.c:5202
 msgid "<b>Password:</b>"
 msgstr "<b>Wachtwoord:</b>"
 
-#: ../pidgin/gtkblist.c:5119
+#: ../pidgin/gtkblist.c:5213
 msgid "_Login"
 msgstr "Aanme_lden"
 
-#: ../pidgin/gtkblist.c:5203
+#: ../pidgin/gtkblist.c:5299
 msgid "/Accounts"
 msgstr "/Accounts"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5217
+#: ../pidgin/gtkblist.c:5313
 #, 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->Manage</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->Manage Accounts</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Welkom bij %s!</span>\n"
 "\n"
-"Je hebt geen account ingeschakeld. Schakel je accounts in in het "
-"<b>Accounts</b>-venster bij <b>Accounts->Beheer</b>. Als je het eenmaal hebt "
-"ingeschakeld kan je inloggen, je status instellen en praten met je vrienden."
+"Je hebt geen account ingeschakeld. Schakel je accounts in in het <b>Accounts</b>-venster bij <b>Accounts->Behee accountsr</b>. Als je het eenmaal hebt ingeschakeld kan je inloggen, je status instellen en praten met je vrienden."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5488
+#: ../pidgin/gtkblist.c:5584
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Contacten/Weergave/Off-line contacten"
+msgstr "/Contacten/Weergave/Offline contacten"
 
-#: ../pidgin/gtkblist.c:5491
+#: ../pidgin/gtkblist.c:5587
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Contacten/Weergeven/Lege Groepen"
+msgstr "/Contacten/Weergave/Lege groepen"
 
-#: ../pidgin/gtkblist.c:5497
+#: ../pidgin/gtkblist.c:5593
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Contacten/Weergave/Contactdetails"
 
-#: ../pidgin/gtkblist.c:5500
+#: ../pidgin/gtkblist.c:5596
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Contacten/Weergave/Inactieve Tijden"
+msgstr "/Contacten/Weergave/Inactieve tijden"
 
-#: ../pidgin/gtkblist.c:5503
+#: ../pidgin/gtkblist.c:5599
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Contacten/Weergave/Lege groepen weergeven"
+msgstr "/Contacten/Weergave/Protocol pictogrammen"
 
-#: ../pidgin/gtkblist.c:6456
+#: ../pidgin/gtkblist.c:6565
 msgid "Add a buddy.\n"
 msgstr "Contact toevoegen.\n"
 
-#: ../pidgin/gtkblist.c:6471
+#: ../pidgin/gtkblist.c:6580
 msgid "Buddy's _username:"
 msgstr "_Gebruikersnaam contact"
 
-#: ../pidgin/gtkblist.c:6493
+#: ../pidgin/gtkblist.c:6602
 msgid "(Optional) A_lias:"
 msgstr "(Optionele) A_lias:"
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6620
 msgid "Add buddy to _group:"
 msgstr "Gebruiker toevoegen aan _groep:"
 
-#: ../pidgin/gtkblist.c:6760
+#: ../pidgin/gtkblist.c:6869
 msgid "This protocol does not support chat rooms."
 msgstr "Dit protocol heeft geen ondersteuning voor chatruimtes."
 
-#: ../pidgin/gtkblist.c:6776
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"U bent op het moment niet aangemeld met een protocol die ondersteuning biedt "
-"voor chat."
+#: ../pidgin/gtkblist.c:6885
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr "U bent op het moment niet aangemeld met een protocol die ondersteuning biedt voor chat."
 
-#: ../pidgin/gtkblist.c:6820
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Geef alstublieft de bijnaam en andere informatie van de chat die u wilt "
-"toevoegen aan de contactlijst.\n"
+#: ../pidgin/gtkblist.c:6929
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "Geef de bijnaam en andere informatie van de chat die u wilt toevoegen aan de contactlijst.\n"
 
-#: ../pidgin/gtkblist.c:6843
+#: ../pidgin/gtkblist.c:6952
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6850
+#: ../pidgin/gtkblist.c:6959
 msgid "Auto_join when account becomes online."
 msgstr "Automatisch deelnemen wanneer account online komt."
 
-#: ../pidgin/gtkblist.c:6851
+#: ../pidgin/gtkblist.c:6960
 msgid "_Hide chat when the window is closed."
 msgstr "Verberg c_hat wanneer de verbinding verbroken wordt."
 
-#: ../pidgin/gtkblist.c:6877
+#: ../pidgin/gtkblist.c:6986
 msgid "Please enter the name of the group to be added."
-msgstr "Geef alstublieft de naam van de toe te voegen groep."
+msgstr "Geef de naam van de toe te voegen groep."
+
+#: ../pidgin/gtkblist.c:7645
+msgid "Enable Account"
+msgstr "Account inschakelen"
 
-#: ../pidgin/gtkblist.c:7535
+#: ../pidgin/gtkblist.c:7651
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Accounts/Account inschakelen"
+
+#: ../pidgin/gtkblist.c:7697
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Accounts/"
 
-#: ../pidgin/gtkblist.c:7559
+#: ../pidgin/gtkblist.c:7721
 msgid "_Edit Account"
 msgstr "_Account bewerken"
 
-#: ../pidgin/gtkblist.c:7572 ../pidgin/gtkconv.c:3241
+#: ../pidgin/gtkblist.c:7734
+#: ../pidgin/gtkconv.c:3265
 msgid "No actions available"
 msgstr "Geen acties beschikbaar"
 
-#: ../pidgin/gtkblist.c:7580
+#: ../pidgin/gtkblist.c:7742
 msgid "_Disable"
 msgstr "_Uitzetten"
 
-#: ../pidgin/gtkblist.c:7592
-msgid "Enable Account"
-msgstr "Account inschakelen"
-
-#: ../pidgin/gtkblist.c:7598
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Accounts/Account Inschakeln"
-
-#: ../pidgin/gtkblist.c:7647
+#: ../pidgin/gtkblist.c:7764
 msgid "/Tools"
 msgstr "/Extra"
 
-#: ../pidgin/gtkblist.c:7717
+#: ../pidgin/gtkblist.c:7834
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacten/Sorteren"
 
@@ -14847,216 +14806,209 @@ msgstr "/Contacten/Sorteren"
 msgid "SSL Servers"
 msgstr "SSL Servers"
 
-#: ../pidgin/gtkconv.c:487
+#: ../pidgin/gtkconv.c:486
 msgid "Unknown command."
 msgstr "Onbekende opdracht."
 
-#: ../pidgin/gtkconv.c:771 ../pidgin/gtkconv.c:798
+#: ../pidgin/gtkconv.c:770
+#: ../pidgin/gtkconv.c:797
 msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-"Die gebruiker is niet on-line met hetzelfde protocol als het chatgesprek"
+msgstr "Die gebruiker is niet online met hetzelfde protocol als het chatgesprek"
 
-#: ../pidgin/gtkconv.c:792
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"U bent op het moment niet aangemeld met een protocol die deze persoon kan "
-"uitnodigen."
+#: ../pidgin/gtkconv.c:791
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "U bent op het moment niet aangemeld met een protocol die deze persoon kan uitnodigen."
 
-#: ../pidgin/gtkconv.c:846
+#: ../pidgin/gtkconv.c:845
 msgid "Invite Buddy Into Chat Room"
 msgstr "Contact uitnodigen in chatruimte"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:876
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Geef alstublieft de bijnaam van de persoon die u wilt uitnodigen, eventueel "
-"met een uitnodigende tekst"
+#: ../pidgin/gtkconv.c:875
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "Geef de bijnaam van de persoon die u wilt uitnodigen, eventueel met een uitnodigende tekst"
 
-#: ../pidgin/gtkconv.c:897
+#: ../pidgin/gtkconv.c:896
 msgid "_Buddy:"
 msgstr "_Contact:"
 
-#: ../pidgin/gtkconv.c:910 ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1484
+#: ../pidgin/gtkconv.c:909
+#: ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "Be_richt"
 
-#: ../pidgin/gtkconv.c:973
+#: ../pidgin/gtkconv.c:972
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Gesprek met %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1011
+#: ../pidgin/gtkconv.c:1010
 msgid "Save Conversation"
 msgstr "Gesprek opslaan"
 
-#: ../pidgin/gtkconv.c:1157 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
+#: ../pidgin/gtkconv.c:1156
+#: ../pidgin/gtkdebug.c:167
+#: ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Zoeken"
 
-#: ../pidgin/gtkconv.c:1183 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1182
+#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Zoekopdracht:"
 
-#: ../pidgin/gtkconv.c:1684
+#: ../pidgin/gtkconv.c:1703
 msgid "Un-Ignore"
-msgstr "Negeren Opheffen"
+msgstr "Negeren opheffen"
 
-#: ../pidgin/gtkconv.c:1687
+#: ../pidgin/gtkconv.c:1706
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../pidgin/gtkconv.c:1707
+#: ../pidgin/gtkconv.c:1726
 msgid "Get Away Message"
 msgstr "Afwezigheidsbericht"
 
-#: ../pidgin/gtkconv.c:1730
+#: ../pidgin/gtkconv.c:1749
 msgid "Last said"
 msgstr "Laatst gezegd"
 
-#: ../pidgin/gtkconv.c:2736
+#: ../pidgin/gtkconv.c:2730
 msgid "Unable to save icon file to disk."
-msgstr "Kan contactplaatje niet opslaan op schijf."
+msgstr "Kan pictogram niet opslaan op schijf."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2829
 msgid "Save Icon"
 msgstr "Plaatje opslaan"
 
-#: ../pidgin/gtkconv.c:2872
+#: ../pidgin/gtkconv.c:2887
 msgid "Animate"
 msgstr "Animeren"
 
-#: ../pidgin/gtkconv.c:2877
+#: ../pidgin/gtkconv.c:2892
 msgid "Hide Icon"
 msgstr "Plaatje verbergen"
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2895
 msgid "Save Icon As..."
 msgstr "Plaatje opslaan als..."
 
-#: ../pidgin/gtkconv.c:2884
+#: ../pidgin/gtkconv.c:2899
 msgid "Set Custom Icon..."
-msgstr "Eigen Pictogram Instellen..."
+msgstr "Eigen pictogram instellen..."
 
-#: ../pidgin/gtkconv.c:2888
+#: ../pidgin/gtkconv.c:2903
 msgid "Change Size"
-msgstr "Verander Grootte"
+msgstr "Grootte veranderen"
 
-#: ../pidgin/gtkconv.c:2901
-msgid "Remove Custom Icon"
-msgstr "Contactenplaatje Verwijderen"
-
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3041
 msgid "Show All"
-msgstr "Geef Alles Weer"
+msgstr "Alles weergeven"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:3045
+#: ../pidgin/gtkconv.c:3060
 msgid "/_Conversation"
 msgstr "/_Gesprek"
 
-#: ../pidgin/gtkconv.c:3047
+#: ../pidgin/gtkconv.c:3062
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Gesprek/Nieuw _bericht..."
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3067
 msgid "/Conversation/_Find..."
 msgstr "/Gesprek/_Zoeken..."
 
-#: ../pidgin/gtkconv.c:3054
+#: ../pidgin/gtkconv.c:3069
 msgid "/Conversation/View _Log"
 msgstr "/Gesprek/Logboek _weergeven"
 
-#: ../pidgin/gtkconv.c:3055
+#: ../pidgin/gtkconv.c:3070
 msgid "/Conversation/_Save As..."
 msgstr "/Gesprek/Opslaan _als..."
 
-#: ../pidgin/gtkconv.c:3057
+#: ../pidgin/gtkconv.c:3072
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Gesprek/_Opschonen"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3076
 msgid "/Conversation/Se_nd File..."
 msgstr "/Gesprek/Bestand ver_zenden..."
 
-#: ../pidgin/gtkconv.c:3062
+#: ../pidgin/gtkconv.c:3077
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Gesprek/_Contact-alarm toevoegen..."
+msgstr "/Gesprek/_Contactalarm toevoegen..."
 
-#: ../pidgin/gtkconv.c:3064
+#: ../pidgin/gtkconv.c:3079
 msgid "/Conversation/_Get Info"
 msgstr "/Gesprek/Info _opvragen"
 
-#: ../pidgin/gtkconv.c:3066
+#: ../pidgin/gtkconv.c:3081
 msgid "/Conversation/In_vite..."
 msgstr "/Gesprek/_Uitnodigen..."
 
-#: ../pidgin/gtkconv.c:3068
+#: ../pidgin/gtkconv.c:3083
 msgid "/Conversation/M_ore"
 msgstr "/Gesprek/_Meer"
 
-#: ../pidgin/gtkconv.c:3072
+#: ../pidgin/gtkconv.c:3087
 msgid "/Conversation/Al_ias..."
 msgstr "/Gesprek/A_lias..."
 
-#: ../pidgin/gtkconv.c:3074
+#: ../pidgin/gtkconv.c:3089
 msgid "/Conversation/_Block..."
 msgstr "/Gesprek/Blo_kkeren..."
 
-#: ../pidgin/gtkconv.c:3076
+#: ../pidgin/gtkconv.c:3091
 msgid "/Conversation/_Unblock..."
 msgstr "/Gesprek/_Deblokkeren..."
 
-#: ../pidgin/gtkconv.c:3078
+#: ../pidgin/gtkconv.c:3093
 msgid "/Conversation/_Add..."
 msgstr "/Gesprek/_Toevoegen..."
 
-#: ../pidgin/gtkconv.c:3080
+#: ../pidgin/gtkconv.c:3095
 msgid "/Conversation/_Remove..."
 msgstr "/Gesprek/Ver_wijderen..."
 
-#: ../pidgin/gtkconv.c:3085
+#: ../pidgin/gtkconv.c:3100
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Gesprek/_URL invoegen..."
 
-#: ../pidgin/gtkconv.c:3087
+#: ../pidgin/gtkconv.c:3102
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Gesprek/_Afbeelding invoegen..."
 
-#: ../pidgin/gtkconv.c:3093
+#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/_Close"
 msgstr "/Gesprek/_Sluiten"
 
 #. Options
-#: ../pidgin/gtkconv.c:3097
+#: ../pidgin/gtkconv.c:3112
 msgid "/_Options"
 msgstr "/_Opties"
 
-#: ../pidgin/gtkconv.c:3098
+#: ../pidgin/gtkconv.c:3113
 msgid "/Options/Enable _Logging"
 msgstr "/Opties/_Logboek bijhouden"
 
-#: ../pidgin/gtkconv.c:3099
+#: ../pidgin/gtkconv.c:3114
 msgid "/Options/Enable _Sounds"
 msgstr "/Opties/_Geluid gebruiken"
 
-#: ../pidgin/gtkconv.c:3101
+#: ../pidgin/gtkconv.c:3116
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opties/_Opmaakwerkbalk weergeven"
 
-#: ../pidgin/gtkconv.c:3102
+#: ../pidgin/gtkconv.c:3117
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opties/Bericht_tijd weergeven"
 
-#: ../pidgin/gtkconv.c:3229
+#: ../pidgin/gtkconv.c:3253
 msgid "/Conversation/More"
 msgstr "/Gesprek/Meer"
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3309
 msgid "/Options"
 msgstr "/Opties"
 
@@ -15065,79 +15017,80 @@ msgstr "/Opties"
 #. 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:3320 ../pidgin/gtkconv.c:3352
+#: ../pidgin/gtkconv.c:3344
+#: ../pidgin/gtkconv.c:3376
 msgid "/Conversation"
 msgstr "/Gesprek"
 
-#: ../pidgin/gtkconv.c:3360
+#: ../pidgin/gtkconv.c:3384
 msgid "/Conversation/View Log"
 msgstr "/Gesprek/Logboek weergeven"
 
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3390
 msgid "/Conversation/Send File..."
 msgstr "/Gesprek/Bestand verzenden..."
 
-#: ../pidgin/gtkconv.c:3370
+#: ../pidgin/gtkconv.c:3394
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Gesprek/Contact-alarm toevoegen..."
+msgstr "/Gesprek/Contactalarm toevoegen..."
 
-#: ../pidgin/gtkconv.c:3376
+#: ../pidgin/gtkconv.c:3400
 msgid "/Conversation/Get Info"
 msgstr "/Gesprek/Info opvragen"
 
-#: ../pidgin/gtkconv.c:3380
+#: ../pidgin/gtkconv.c:3404
 msgid "/Conversation/Invite..."
 msgstr "/Gesprek/Uitnodigen..."
 
-#: ../pidgin/gtkconv.c:3386
+#: ../pidgin/gtkconv.c:3410
 msgid "/Conversation/Alias..."
 msgstr "/Gesprek/Alias..."
 
-#: ../pidgin/gtkconv.c:3390
+#: ../pidgin/gtkconv.c:3414
 msgid "/Conversation/Block..."
 msgstr "/Gesprek/Blokkeren..."
 
-#: ../pidgin/gtkconv.c:3394
+#: ../pidgin/gtkconv.c:3418
 msgid "/Conversation/Unblock..."
 msgstr "/Gesprek/Deblokkeren..."
 
-#: ../pidgin/gtkconv.c:3398
+#: ../pidgin/gtkconv.c:3422
 msgid "/Conversation/Add..."
 msgstr "/Gesprek/Toevoegen..."
 
-#: ../pidgin/gtkconv.c:3402
+#: ../pidgin/gtkconv.c:3426
 msgid "/Conversation/Remove..."
 msgstr "/Gesprek/Verwijderen..."
 
-#: ../pidgin/gtkconv.c:3408
+#: ../pidgin/gtkconv.c:3432
 msgid "/Conversation/Insert Link..."
 msgstr "/Gesprek/URL invoegen..."
 
-#: ../pidgin/gtkconv.c:3412
+#: ../pidgin/gtkconv.c:3436
 msgid "/Conversation/Insert Image..."
 msgstr "/Gesprek/Afbeelding invoegen..."
 
-#: ../pidgin/gtkconv.c:3418
+#: ../pidgin/gtkconv.c:3442
 msgid "/Options/Enable Logging"
 msgstr "/Opties/Logboek bijhouden"
 
-#: ../pidgin/gtkconv.c:3421
+#: ../pidgin/gtkconv.c:3445
 msgid "/Options/Enable Sounds"
 msgstr "/Opties/Geluid gebruiken"
 
-#: ../pidgin/gtkconv.c:3434
+#: ../pidgin/gtkconv.c:3458
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opties/Opmaakwerkbalk weergeven"
 
-#: ../pidgin/gtkconv.c:3437
+#: ../pidgin/gtkconv.c:3461
 msgid "/Options/Show Timestamps"
 msgstr "/Opties/Berichttijd weergeven"
 
-#: ../pidgin/gtkconv.c:3515
+#: ../pidgin/gtkconv.c:3539
 msgid "User is typing..."
 msgstr "Gebruiker typt..."
 
-#: ../pidgin/gtkconv.c:3589
+#: ../pidgin/gtkconv.c:3613
 #, c-format
 msgid ""
 "\n"
@@ -15147,98 +15100,103 @@ msgstr ""
 "%s is gestopt met tikken"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3769 ../pidgin/gtkconv.c:8500
+#: ../pidgin/gtkconv.c:3793
+#: ../pidgin/gtkconv.c:8349
 msgid "S_end To"
-msgstr "_Verzenden Aan"
+msgstr "_Verzenden aan"
 
 # verzenden/versturen
-#: ../pidgin/gtkconv.c:4452 ../pidgin/plugins/sendbutton.c:44
+#: ../pidgin/gtkconv.c:4462
+#: ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "Ver_sturen"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4611
+#: ../pidgin/gtkconv.c:4621
 msgid "0 people in room"
 msgstr "0 personen in ruimte"
 
-#: ../pidgin/gtkconv.c:5960 ../pidgin/gtkconv.c:6081
+#: ../pidgin/gtkconv.c:5899
+#: ../pidgin/gtkconv.c:6020
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoon in ruimte"
 msgstr[1] "%d personen in ruimte"
 
-#: ../pidgin/gtkconv.c:6715 ../pidgin/gtkstatusbox.c:684
+#: ../pidgin/gtkconv.c:6564
+#: ../pidgin/gtkstatusbox.c:685
 msgid "Typing"
 msgstr "Typen"
 
-#: ../pidgin/gtkconv.c:6719
+#: ../pidgin/gtkconv.c:6568
 msgid "Stopped Typing"
 msgstr "Gestopt met typen"
 
-#: ../pidgin/gtkconv.c:6722
+#: ../pidgin/gtkconv.c:6571
 msgid "Nick Said"
 msgstr "Bijnaam gezegd"
 
-#: ../pidgin/gtkconv.c:6725 ../pidgin/gtkdocklet.c:686
+#: ../pidgin/gtkconv.c:6574
 msgid "Unread Messages"
 msgstr "Ongelezen berichten"
 
-#: ../pidgin/gtkconv.c:6731
+#: ../pidgin/gtkconv.c:6580
 msgid "New Event"
 msgstr "Nieuwe gebeurtenis"
 
-#: ../pidgin/gtkconv.c:7972
+#: ../pidgin/gtkconv.c:7821
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Maakt alle gespreksvensterers schoon."
 
-#: ../pidgin/gtkconv.c:8176
+#: ../pidgin/gtkconv.c:8025
 msgid "Confirm close"
 msgstr "Sluiten bevestigen"
 
-#: ../pidgin/gtkconv.c:8208
+#: ../pidgin/gtkconv.c:8057
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "U heeft ongelezen berichten. Wilt u het venster echt sluiten?"
+msgstr "Je hebt ongelezen berichten. Wil je het venster echt sluiten?"
 
-#: ../pidgin/gtkconv.c:8841
+#: ../pidgin/gtkconv.c:8690
 msgid "Close other tabs"
 msgstr "Andere tabbladen sluiten"
 
-#: ../pidgin/gtkconv.c:8847
+#: ../pidgin/gtkconv.c:8696
 msgid "Close all tabs"
 msgstr "Alle tabbladen sluiten"
 
-#: ../pidgin/gtkconv.c:8855
+#: ../pidgin/gtkconv.c:8704
 msgid "Detach this tab"
 msgstr "Tabblad losmaken"
 
 # src/bookmarks_editor.c:945
 # src/menubar.c:91
-#: ../pidgin/gtkconv.c:8861
+#: ../pidgin/gtkconv.c:8710
 msgid "Close this tab"
 msgstr "Dit tabblad sluiten"
 
-#: ../pidgin/gtkconv.c:9383
+#: ../pidgin/gtkconv.c:9232
 msgid "Close conversation"
 msgstr "Gesprek sluiten"
 
-#: ../pidgin/gtkconv.c:9987
+#: ../pidgin/gtkconv.c:9836
 msgid "Last created window"
 msgstr "Laatst aangemaakte venster"
 
-#: ../pidgin/gtkconv.c:9989
+#: ../pidgin/gtkconv.c:9838
 msgid "Separate IM and Chat windows"
 msgstr "Gewone gesprekken en chats in gescheiden vensters"
 
-#: ../pidgin/gtkconv.c:9991 ../pidgin/gtkprefs.c:1576
+#: ../pidgin/gtkconv.c:9840
+#: ../pidgin/gtkprefs.c:1573
 msgid "New window"
 msgstr "Nieuw venster"
 
-#: ../pidgin/gtkconv.c:9993
+#: ../pidgin/gtkconv.c:9842
 msgid "By group"
 msgstr "Op groep"
 
-#: ../pidgin/gtkconv.c:9995
+#: ../pidgin/gtkconv.c:9844
 msgid "By account"
 msgstr "Op account"
 
@@ -15256,15 +15214,15 @@ msgstr "Overeenkomsten aangeven"
 
 #: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
-msgstr "Alleen _Plaatje"
+msgstr "Alleen _plaatje"
 
 #: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
-msgstr "Alleen _Tekst"
+msgstr "Alleen _tekst"
 
 #: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
-msgstr "Plaatje & Tekst _Beide"
+msgstr "P_laatje & tekst"
 
 # filteren?
 #: ../pidgin/gtkdebug.c:772
@@ -15279,7 +15237,8 @@ msgstr "Klik met rechter muisknop voor meer opties."
 msgid "Level "
 msgstr "Niveau"
 
-#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
+#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Selecteer het debug-niveau van het filter"
 
@@ -15301,579 +15260,599 @@ msgstr "Fout"
 
 #: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
-msgstr "Fatale Fout"
-
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:120
-msgid "lead developer"
-msgstr "hoofdontwikkelaar"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../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:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+msgstr "Fatale fout"
+
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:77
+#: ../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:85
+#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:92
 #: ../pidgin/gtkdialogs.c:94
+#: ../pidgin/gtkdialogs.c:95
+#: ../pidgin/gtkdialogs.c:96
 msgid "developer"
 msgstr "ontwikkelaar"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+#: ../pidgin/gtkdialogs.c:77
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
+#: ../pidgin/gtkdialogs.c:90
 msgid "support"
 msgstr "ondersteuning"
 
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:91
 msgid "support/QA"
 msgstr "ondersteuning/QA"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:116
 msgid "developer & webmaster"
 msgstr "ontwikkelaar & webmaster"
 
-#: ../pidgin/gtkdialogs.c:101
+#: ../pidgin/gtkdialogs.c:103
 msgid "Senior Contributor/QA"
-msgstr "Senior Meewerker/QA"
+msgstr "Senior meewerker/QA"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:112
 msgid "win32 port"
 msgstr "win32 versie"
 
-#: ../pidgin/gtkdialogs.c:112 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:114
 msgid "maintainer"
 msgstr "beheerder"
 
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
 msgid "libfaim maintainer"
 msgstr "beheerder van libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:118
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker en BOB (luie donder)"
 
-#: ../pidgin/gtkdialogs.c:118
+#: ../pidgin/gtkdialogs.c:119
 msgid "XMPP developer"
-msgstr "XMPP ontwikkelaar"
+msgstr "XMPP-ontwikkelaar"
 
-#: ../pidgin/gtkdialogs.c:119
+#: ../pidgin/gtkdialogs.c:120
 msgid "original author"
 msgstr "originele maker"
 
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:121
+msgid "lead developer"
+msgstr "hoofdontwikkelaar"
+
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:234
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:139
 msgid "Belarusian Latin"
 msgstr "Witrussisch Latijn"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:235
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:145
 msgid "Bengali"
 msgstr "Bengaals"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:146
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Catalan"
 msgstr "Katalaans"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:149
 msgid "Valencian-Catalan"
 msgstr "Valençiaans Catalaans"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Czech"
 msgstr "Tsjechisch"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
 msgid "Danish"
 msgstr "Deens"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:240
 msgid "German"
 msgstr "Duits"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
 #: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Dzongkha"
 msgstr "Bhutaans"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:160
 msgid "Australian English"
 msgstr "Australisch Engels"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:161
 msgid "Canadian English"
 msgstr "Canadees Engels"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:162
 msgid "British English"
 msgstr "Brits Engels"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Esperanto"
 msgstr "Spaans"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:164
 #: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../pidgin/gtkdialogs.c:163
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:165
 msgid "Estonian"
-msgstr "Bosnisch"
+msgstr "Estlands"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Euskera(Basque)"
 msgstr "Baskisch"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167
 #: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 msgid "Persian"
 msgstr "Perzisch"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Finnish"
 msgstr "Fins"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:244
-#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:172
 #: ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
 msgid "French"
 msgstr "Frans"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:251
 msgid "Galician"
 msgstr "Galiciaans"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Gujarati Language Team"
 msgstr "Gujarati Taal Team"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:252
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:178
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:253
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:180
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:254
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Japanese"
 msgstr "Japans"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:258
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:183
 msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu Georgische Vertaleers"
+msgstr "Ubuntu Georgische Vertalers"
 
-#: ../pidgin/gtkdialogs.c:182
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kannada"
-msgstr "Verbannen"
+msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kannada Translation team"
 msgstr "Canada Vertaal Team"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
 #: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188
 msgid "Kurdish"
 msgstr "Koerdisch"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:189
 msgid "Lao"
 msgstr "Laotiaans"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:263
 msgid "Macedonian"
 msgstr "Macedonisch"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Bokmål Norwegian"
 msgstr "Noors"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:195
 msgid "Nepali"
 msgstr "Nepals"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Dutch, Flemish"
 msgstr "Nederlands & Vlaams"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Norwegian Nynorsk"
 msgstr "Noors"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
+msgid "Occitan"
+msgstr "Occitaans"
+
+#: ../pidgin/gtkdialogs.c:199
 msgid "Punjabi"
-msgstr ""
+msgstr "Punjabi"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:266
 msgid "Polish"
 msgstr "Pools"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:203
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:267
 msgid "Portuguese-Brazil"
 msgstr "Braziliaans Portugees"
 
-#: ../pidgin/gtkdialogs.c:202
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:205
 msgid "Pashto"
-msgstr "Foto"
+msgstr "Pasjtoe"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:206
 msgid "Romanian"
 msgstr "Roemeens"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:265
-#: ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:269
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
-#: ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:272
 msgid "Slovak"
 msgstr "Slowaaks"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:273
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:211
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:271 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:275
 msgid "Serbian"
 msgstr "Servisch"
 
-#: ../pidgin/gtkdialogs.c:211
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:214
 msgid "Sinhala"
-msgstr "Sociaal"
+msgstr "Singalees"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:273
-#: ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:276
+#: ../pidgin/gtkdialogs.c:277
 msgid "Swedish"
 msgstr "Zweeds"
 
 # ui/preferences.glade.h:192
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:216
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:217
 msgid "Telugu"
 msgstr "Telugu"
 
 # ui/preferences.glade.h:192
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:218
 msgid "Thai"
 msgstr "Thais"
 
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:275
+#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:278
 msgid "Turkish"
 msgstr "Turks"
 
-#: ../pidgin/gtkdialogs.c:217
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:220
 msgid "Urdu"
-msgstr "Gebruikers-ID"
+msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:221
 msgid "Vietnamese"
 msgstr "Vietnamees"
 
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:221
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh en het GNOME-Vi team"
 
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:276
+#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:279
 msgid "Simplified Chinese"
 msgstr "Eenvoudig Chinees"
 
-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinees"
 
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:277
+#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:280
 msgid "Traditional Chinese"
 msgstr "Traditioneel Chinees"
 
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:233
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:362
+#: ../pidgin/gtkdialogs.c:365
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:401
 #, 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, MySpaceIM, 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 is een modulair programma voor expresberichten en kan gebruik maken van "
-"de netwerken van AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ en "
-"nog allemaal tegelijk ook. Het is geschreven met behulp van GTK+. <BR><BR>U "
-"mag het programma aanpassen en verspreiden als u zich houdt aan de GPL "
-"(versie 2 of nieuwer). Er is een kopie van deze licentie meegeleverd in het "
-"bestandje 'COPYING' geleverd met %s. Het copyright van %s ligt bij de mensen "
-"die  hiereen hebben meegewerkt. Zie voor een volledige lijst van de "
-"bijdragers het bestand 'COPYRIGHT'. Dit programma wordt geleverd zonder "
-"enige garantie.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:416
+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, MySpaceIM, 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 is een grafisch modulair programma voor chatberichten en kan tegelijkertijd gebruik maken van de netwerken: AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, en QQ. Pidgin is geschreven met behulp van GTK+. <BR><BR>U mag het programma aanpassen en verspreiden als u zich houdt aan de GPL (versie 2 of nieuwer). Er is een kopie van deze licentie meegeleverd in het bestand 'COPYING' geleverd met %s. Het copyright van %s ligt bij de mensen die hier aan hebben meegewerkt. Zie voor een volledige lijst van de bijdragers het bestand 'COPYRIGHT'. Dit programma wordt geleverd zonder enige garantie.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:419
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:421
+#: ../pidgin/gtkdialogs.c:424
 msgid "Current Developers"
 msgstr "Huidige ontwikkelaars"
 
-#: ../pidgin/gtkdialogs.c:436
+#: ../pidgin/gtkdialogs.c:439
 msgid "Crazy Patch Writers"
 msgstr "Gestoorde patch-schrijvers"
 
-#: ../pidgin/gtkdialogs.c:451
+#: ../pidgin/gtkdialogs.c:454
 msgid "Retired Developers"
-msgstr "Ex-ontwikkelaars"
+msgstr "Gestopte ontwikkelaars"
 
-#: ../pidgin/gtkdialogs.c:466
+#: ../pidgin/gtkdialogs.c:469
 msgid "Retired Crazy Patch Writers"
 msgstr "Gestoorde Patch-schrijvers"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:484
 msgid "Artists"
 msgstr "Artiesten"
 
-#: ../pidgin/gtkdialogs.c:496
+#: ../pidgin/gtkdialogs.c:499
 msgid "Current Translators"
 msgstr "Huidige vertalers"
 
-#: ../pidgin/gtkdialogs.c:516
+#: ../pidgin/gtkdialogs.c:519
 msgid "Past Translators"
-msgstr "Ex-vertalers"
+msgstr "Gestopte vertalers"
 
-#: ../pidgin/gtkdialogs.c:534
+#: ../pidgin/gtkdialogs.c:537
 msgid "Debugging Information"
 msgstr "Debuginformatie"
 
-#: ../pidgin/gtkdialogs.c:750 ../pidgin/gtkdialogs.c:889
-#: ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:973
 msgid "_Name"
 msgstr "_Naam"
 
-#: ../pidgin/gtkdialogs.c:755 ../pidgin/gtkdialogs.c:894
-#: ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:758
+#: ../pidgin/gtkdialogs.c:897
+#: ../pidgin/gtkdialogs.c:978
 msgid "_Account"
 msgstr "_Account"
 
-#: ../pidgin/gtkdialogs.c:902
+#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "Gebruikersinfo"
 
-#: ../pidgin/gtkdialogs.c:904
-msgid ""
-"Please enter the username or alias of the person whose info you would like "
-"to view."
-msgstr ""
-"Geef alstublieft de gebruikersnaam of bijnaamvan de persoon waarvan u de "
-"informatie wilt opvragen."
+#: ../pidgin/gtkdialogs.c:907
+msgid "Please enter the username or alias of the person whose info you would like to view."
+msgstr "Geef de gebruikersnaam of bijnaamvan de persoon waarvan u de informatie wilt opvragen."
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:997
 msgid "View User Log"
 msgstr "Gebruikerslogboek opvragen"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "Geef een alias voor deze persoon."
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geef een alias voor %s."
 
-#: ../pidgin/gtkdialogs.c:1041
+#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "Alias voor contact"
 
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: ../pidgin/gtkdialogs.c:1063
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "Geef een alias voor deze chat."
 
-#: ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1105
 #, 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] ""
-"Je gaat het contact met %s en %d ander contact van je contactenlijst "
-"wissen.  Wil je doorgaan?"
-msgstr[1] ""
-"Je gaat het contact met %s en %d ander contacten van je contactenlijst "
-"wissen.  Wil je doorgaan?"
+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] "Je gaat het contact met %s en %d ander contact van je contactenlijst wissen.  Wil je doorgaan?"
+msgstr[1] "Je gaat het contact met %s en %d ander contacten van je contactenlijst wissen.  Wil je doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1113
 msgid "Remove Contact"
 msgstr "Contact verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1113
+#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "_Contact verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1147
 #, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"U staat op het punt om de groep %s in de groep %s samen te voegen. Wilt u "
-"doorgaan?"
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "U staat op het punt om de groep %s in de groep %s samen te voegen. Wilt u doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1154
 msgid "Merge Groups"
 msgstr "Groepen Samenvoegen"
 
-#: ../pidgin/gtkdialogs.c:1154
+#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "Groep _Samenvoegen"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1207
 #, 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 ""
-"U staat op het punt om de groep %s en alle contacten in die groep van uw "
-"contactenlijst te verwijderen. Wilt u doorgaan?"
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "U staat op het punt om de groep %s en alle contacten in die groep van uw contactenlijst te verwijderen. Wilt u doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1210
 msgid "Remove Group"
 msgstr "Groep verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "_Groep verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1243
+#: ../pidgin/gtkdialogs.c:1246
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-"U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u "
-"doorgaan?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1249
 msgid "Remove Buddy"
 msgstr "Contact verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1249
+#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "Contact ver_wijderen"
 
-#: ../pidgin/gtkdialogs.c:1270
+#: ../pidgin/gtkdialogs.c:1273
 #, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"U staat op het punt om de chatruimte %s van uw contactenlijst te "
-"verwijderen. Wilt u doorgaan?"
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgstr "U staat op het punt om de chatruimte %s van uw contactenlijst te verwijderen. Wilt u doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkdialogs.c:1276
 msgid "Remove Chat"
 msgstr "Chat verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1276
+#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "Chat _verwijderen"
 
@@ -15882,199 +15861,240 @@ msgid "Right-click for more unread messages...\n"
 msgstr "Klik met de rechter muisknop voor meer ongelezen berichten...\n"
 
 #: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr "Status wijzigen"
+msgid "_Change Status"
+msgstr "Status _wijzigen"
 
 #: ../pidgin/gtkdocklet.c:681
-msgid "Show Buddy List"
-msgstr "Contactenlijst weergeven"
+msgid "Show Buddy _List"
+msgstr "Contactenlijst _weergeven"
+
+#: ../pidgin/gtkdocklet.c:686
+msgid "_Unread Messages"
+msgstr "_Ongelezen berichten"
 
 #: ../pidgin/gtkdocklet.c:707
-msgid "New Message..."
-msgstr "Nieuw bericht..."
+msgid "New _Message..."
+msgstr "Nieuw _bericht..."
+
+#: ../pidgin/gtkdocklet.c:721
+msgid "_Accounts"
+msgstr "_Accounts"
 
 #: ../pidgin/gtkdocklet.c:722
-msgid "Mute Sounds"
-msgstr "Geluiden dempen"
+msgid "Plu_gins"
+msgstr "Plu_gins"
+
+#: ../pidgin/gtkdocklet.c:723
+msgid "Pr_eferences"
+msgstr "Voork_euren"
 
-#: ../pidgin/gtkdocklet.c:729
-msgid "Blink on New Message"
-msgstr "Kinpper bij Niew Bericht..."
+#: ../pidgin/gtkdocklet.c:727
+msgid "Mute _Sounds"
+msgstr "Geluiden _dempen..."
 
-#: ../pidgin/gtkdocklet.c:739
-msgid "Quit"
-msgstr "Afsluiten"
+#: ../pidgin/gtkdocklet.c:734
+msgid "_Blink on New Message"
+msgstr "_Knipperen bij nieuw bericht..."
 
-#: ../pidgin/gtkft.c:152
+#: ../pidgin/gtkdocklet.c:744
+msgid "_Quit"
+msgstr "_Afsluiten"
+
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../pidgin/gtkft.c:272
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Ontvangen als:</b>"
 
-#: ../pidgin/gtkft.c:274
+#: ../pidgin/gtkft.c:278
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Ontvangen van:</b>"
 
-#: ../pidgin/gtkft.c:278
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending To:</b>"
 msgstr "<b>Verzenden naar:</b>"
 
-#: ../pidgin/gtkft.c:280
+#: ../pidgin/gtkft.c:284
 msgid "<b>Sending As:</b>"
 msgstr "<b>Verzenden als:</b>"
 
-#: ../pidgin/gtkft.c:486
+#: ../pidgin/gtkft.c:500
 msgid "There is no application configured to open this type of file."
 msgstr "Er is geen programma geconfigureerd om dit type bestand te openen."
 
-#: ../pidgin/gtkft.c:491
+#: ../pidgin/gtkft.c:505
 msgid "An error occurred while opening the file."
 msgstr "Er is een fout opgetreden bij het openen van het bestand."
 
-#: ../pidgin/gtkft.c:528
+#: ../pidgin/gtkft.c:542
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Fout bij starten van %s: %s"
 
-#: ../pidgin/gtkft.c:537
+#: ../pidgin/gtkft.c:551
 #, c-format
 msgid "Error running %s"
 msgstr "Fout bij uitvoeren van %s"
 
-#: ../pidgin/gtkft.c:538
+#: ../pidgin/gtkft.c:552
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces gaf foutcode terug: %d"
 
-#: ../pidgin/gtkft.c:675
+#: ../pidgin/gtkft.c:699
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: ../pidgin/gtkft.c:676
+#: ../pidgin/gtkft.c:700
 msgid "Local File:"
 msgstr "Lokaal bestand:"
 
-#: ../pidgin/gtkft.c:678
+#: ../pidgin/gtkft.c:702
 msgid "Speed:"
 msgstr "Snelheid:"
 
-#: ../pidgin/gtkft.c:679
+#: ../pidgin/gtkft.c:703
 msgid "Time Elapsed:"
 msgstr "Tijd:"
 
-#: ../pidgin/gtkft.c:680
+#: ../pidgin/gtkft.c:704
 msgid "Time Remaining:"
 msgstr "Schatting:"
 
-#: ../pidgin/gtkft.c:759
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Venster sluiten nadat alles is _voltooid"
 
-#: ../pidgin/gtkft.c:769
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "Verwerkte overdrachten uit lijst _verwijderen"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:778
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Details bestand"
 
-#: ../pidgin/gtkimhtml.c:842
+#. Pause button
+#: ../pidgin/gtkft.c:820
+#: ../pidgin/pidginstock.c:95
+msgid "_Pause"
+msgstr "_Pauzeren"
+
+#. Resume button
+#: ../pidgin/gtkft.c:825
+msgid "_Resume"
+msgstr "_Doorgaan"
+
+#: ../pidgin/gtkimhtml.c:897
 msgid "Paste as Plain _Text"
 msgstr "_Plakken als tekst"
 
-#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtmltoolbar.c:1196
+#: ../pidgin/gtkimhtml.c:914
+#: ../pidgin/gtkimhtmltoolbar.c:1325
 msgid "_Reset formatting"
 msgstr "Opmaak _verwijderen"
 
-#: ../pidgin/gtkimhtml.c:867
+#: ../pidgin/gtkimhtml.c:922
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "Smileys in geselecteerde tekst inschakelen"
 
-#: ../pidgin/gtkimhtml.c:1430
+#: ../pidgin/gtkimhtml.c:1482
 msgid "Hyperlink color"
 msgstr "Kleur van verwijzing"
 
-#: ../pidgin/gtkimhtml.c:1431
+#: ../pidgin/gtkimhtml.c:1483
 msgid "Color to draw hyperlinks."
 msgstr "Kleur van de verwijzingen"
 
-#: ../pidgin/gtkimhtml.c:1434
+#: ../pidgin/gtkimhtml.c:1486
 msgid "Hyperlink prelight color"
 msgstr "Kleur van verwijzing"
 
-#: ../pidgin/gtkimhtml.c:1435
+#: ../pidgin/gtkimhtml.c:1487
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
 
-#: ../pidgin/gtkimhtml.c:1438 ../pidgin/plugins/pidginrc.c:52
+#: ../pidgin/gtkimhtml.c:1490
+#: ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
-msgstr "Verzonden Bericht-kleur"
+msgstr "Verzonden bericht-kleur"
 
-#: ../pidgin/gtkimhtml.c:1439
+#: ../pidgin/gtkimhtml.c:1491
 msgid "Color to draw the name of a message you sent."
-msgstr ""
+msgstr "De kleur die de naam van bericht met zich mee draagt"
 
-#: ../pidgin/gtkimhtml.c:1442 ../pidgin/plugins/pidginrc.c:53
+#: ../pidgin/gtkimhtml.c:1494
+#: ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
-msgstr "Ontvangen Bericht-kleur"
+msgstr "Ontvangen bericht-kleur"
 
-#: ../pidgin/gtkimhtml.c:1443
+#: ../pidgin/gtkimhtml.c:1495
 msgid "Color to draw the name of a message you received."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1446
+#: ../pidgin/gtkimhtml.c:1498
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"Attentie\" -kleur"
 
-#: ../pidgin/gtkimhtml.c:1447
+#: ../pidgin/gtkimhtml.c:1499
 msgid "Color to draw the name of a message you received containing your name."
-msgstr ""
-"De kleur van de naam van een bericht dat je hebt ontvangen inclusief je naam"
+msgstr "De kleur van de naam van een bericht dat je hebt ontvangen inclusief je naam"
 
-#: ../pidgin/gtkimhtml.c:1450 ../pidgin/plugins/pidginrc.c:55
+#: ../pidgin/gtkimhtml.c:1502
+#: ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "Actie-bericht-kleur"
 
-#: ../pidgin/gtkimhtml.c:1451
+#: ../pidgin/gtkimhtml.c:1503
+#: ../pidgin/gtkimhtml.c:1507
+#: ../pidgin/gtkimhtml.c:1511
 msgid "Color to draw the name of an action message."
 msgstr "De kleur van een naam van een melding."
 
-#: ../pidgin/gtkimhtml.c:1460
+#: ../pidgin/gtkimhtml.c:1506
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1510
+msgid "Whisper Message Name Color"
+msgstr "Fluisterend berichtkleur"
+
+#: ../pidgin/gtkimhtml.c:1520
 msgid "Typing notification color"
 msgstr "Kleur van melding van typen"
 
-#: ../pidgin/gtkimhtml.c:1461
+#: ../pidgin/gtkimhtml.c:1521
 msgid "The color to use for the typing notification font"
-msgstr ""
+msgstr "De kleur die gebruikt wordt voor het lettertype van de typmelding"
 
-#: ../pidgin/gtkimhtml.c:1464
+#: ../pidgin/gtkimhtml.c:1524
 msgid "Typing notification font"
 msgstr "Lettertype van melding van typen"
 
-#: ../pidgin/gtkimhtml.c:1465
+#: ../pidgin/gtkimhtml.c:1525
 msgid "The font to use for the typing notification"
-msgstr ""
+msgstr "Het lettertype dat gebruikt wordt bij het typmelding."
 
-#: ../pidgin/gtkimhtml.c:1468 ../pidgin/gtkimhtml.c:1469
+#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1529
 msgid "Enable typing notification"
 msgstr "Schakel typmelding in"
 
-#: ../pidgin/gtkimhtml.c:1688
+#: ../pidgin/gtkimhtml.c:1757
 msgid "_Copy Email Address"
-msgstr "Email adres _kopiëren"
+msgstr "E-mailadres _kopiëren"
 
-#: ../pidgin/gtkimhtml.c:1700
+#: ../pidgin/gtkimhtml.c:1769
 msgid "_Open Link in Browser"
 msgstr "Verwijzing _openen met webbrowser"
 
-#: ../pidgin/gtkimhtml.c:1710
+#: ../pidgin/gtkimhtml.c:1779
 msgid "_Copy Link Location"
 msgstr "Verwijzing _kopiëren"
 
-#: ../pidgin/gtkimhtml.c:3482
+#: ../pidgin/gtkimhtml.c:3551
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16084,7 +16104,7 @@ msgstr ""
 "\n"
 "PNG wordt gebruikt."
 
-#: ../pidgin/gtkimhtml.c:3485
+#: ../pidgin/gtkimhtml.c:3554
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16094,7 +16114,7 @@ msgstr ""
 "\n"
 "PNG wordt gebruikt."
 
-#: ../pidgin/gtkimhtml.c:3514
+#: ../pidgin/gtkimhtml.c:3583
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16105,7 +16125,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3517
+#: ../pidgin/gtkimhtml.c:3586
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16116,193 +16136,212 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3598 ../pidgin/gtkimhtml.c:3610
+#: ../pidgin/gtkimhtml.c:3667
+#: ../pidgin/gtkimhtml.c:3679
 msgid "Save Image"
 msgstr "Afbeelding opslaan"
 
-#: ../pidgin/gtkimhtml.c:3638
+#: ../pidgin/gtkimhtml.c:3716
 msgid "_Save Image..."
 msgstr "Afbeelding _opslaan..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:164
+#: ../pidgin/gtkimhtml.c:3730
+msgid "_Add Custom Smiley..."
+msgstr "_Eigen smiley toevoegen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:165
 msgid "Select Font"
 msgstr "Lettertype selecteren"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
+#: ../pidgin/gtkimhtmltoolbar.c:245
 msgid "Select Text Color"
 msgstr ":Tekstkleur selecteren"
 
-#: ../pidgin/gtkimhtmltoolbar.c:324
+#: ../pidgin/gtkimhtmltoolbar.c:325
 msgid "Select Background Color"
 msgstr "Achtergrondkleur selecteren"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:414
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Description"
 msgstr "_Beschrijving"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Geef de URL en de beschrijving van de verwijzing die u wilt invoegen. De "
-"beschrijving is optioneel."
+#: ../pidgin/gtkimhtmltoolbar.c:425
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "Geef de URL en de beschrijving van de verwijzing die u wilt invoegen. De beschrijving is optioneel."
 
-#: ../pidgin/gtkimhtmltoolbar.c:428
+#: ../pidgin/gtkimhtmltoolbar.c:429
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Geef de URL van de verwijzing die u wilt invoegen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1103
+#: ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtkimhtmltoolbar.c:1232
 msgid "Insert Link"
 msgstr "Verwijzing invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1264
+#: ../pidgin/gtkimhtmltoolbar.c:438
+#: ../pidgin/gtkimhtmltoolbar.c:1393
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:518
+#: ../pidgin/gtkimhtmltoolbar.c:519
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kan de afbeelding niet opslaan: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
+#: ../pidgin/gtkimhtmltoolbar.c:545
+#: ../pidgin/gtkimhtmltoolbar.c:555
 msgid "Insert Image"
 msgstr "Afbeelding invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:712
+#: ../pidgin/gtkimhtmltoolbar.c:684
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:815
 msgid "Smile!"
 msgstr "Lachen!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:763
+#: ../pidgin/gtkimhtmltoolbar.c:830
+msgid "_Manage custom smileys"
+msgstr "Eigen smileys _beheren"
+
+#: ../pidgin/gtkimhtmltoolbar.c:867
 msgid "This theme has no available smileys."
 msgstr "Dit thema heeft geen smileys beschikbaar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:847 ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:973
+#: ../pidgin/gtkimhtmltoolbar.c:1350
 msgid "_Font"
 msgstr "_Lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "Group Items"
-msgstr "Groepeer Items"
+msgstr "Groepeer items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "Ungroup Items"
-msgstr "Degroepeer Items"
+msgstr "Degroepeer items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:342
+#: ../pidgin/gtkimhtmltoolbar.c:1218
+#: ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Vet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:351
+#: ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Cursief"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:360
+#: ../pidgin/gtkimhtmltoolbar.c:1220
+#: ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
+#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "Strikethrough"
 msgstr "Doorstrepen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1223
 msgid "Increase Font Size"
-msgstr "Groter Lettertype"
+msgstr "Groter lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "Decrease Font Size"
-msgstr "Kleiner Lettertype"
+msgstr "Kleiner lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1226
 msgid "Font Face"
 msgstr "Lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "Background Color"
 msgstr "Achtergrondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:1228
 msgid "Foreground Color"
 msgstr "Tekstkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1230
 msgid "Reset Formatting"
-msgstr "Opmaak Verwijderen"
+msgstr "Opmaak verwijderen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1233
 msgid "Insert IM Image"
-msgstr "IM Afbeelding Invoegen"
+msgstr "Afbeelding invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1105
+#: ../pidgin/gtkimhtmltoolbar.c:1234
 msgid "Insert Smiley"
-msgstr "Smiley Invoegen"
+msgstr "Smiley invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1310
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vet: </b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1311
 msgid "<i>_Italic</i>"
-msgstr " <i>(Schuin)</i>"
+msgstr " <i>_Cursief</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1312
 msgid "<u>_Underline</u>"
 msgstr "<u>Onderstrepen</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1313
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Doorstrepen</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1314
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Groter</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1316
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1189
+#: ../pidgin/gtkimhtmltoolbar.c:1318
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Kleiner</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1322
 msgid "_Font face"
 msgstr "_Lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtmltoolbar.c:1323
 msgid "Foreground _color"
 msgstr "Tekst_kleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
+#: ../pidgin/gtkimhtmltoolbar.c:1324
 msgid "Bac_kground color"
 msgstr "Achtergrond_kleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1272
+#: ../pidgin/gtkimhtmltoolbar.c:1401
 msgid "_Image"
-msgstr "Afbeelding"
+msgstr "_Afbeelding"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1278
+#: ../pidgin/gtkimhtmltoolbar.c:1407
 msgid "_Link"
-msgstr "Link"
+msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1284
+#: ../pidgin/gtkimhtmltoolbar.c:1413
 msgid "_Horizontal rule"
 msgstr "_Horizontale streep"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1306
+#: ../pidgin/gtkimhtmltoolbar.c:1435
 msgid "_Smile!"
-msgstr "Lachen!"
+msgstr "L_achen!"
 
 #: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
-msgstr "Verwijderen Logboek Mislukt"
+msgstr "Logboek verwijderen mislukt"
 
 #: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
@@ -16310,30 +16349,18 @@ msgstr "Controleer permissies en probeer het opnieuw."
 
 #: ../pidgin/gtklog.c:292
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
-"Weet je zeker dat je het logboek van het gesprek in met %s  dat starte op %s "
-"permanent wilt verwijderen?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgstr "Weet je zeker dat je het logboek van het gesprek in met %s  dat startte op %s permanent wilt verwijderen?"
 
 #: ../pidgin/gtklog.c:303
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-"Weet je zeker dat je het logboek van het gesprek in %s  dat starte op %s "
-"permanent wilt verwijderen?"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgstr "Weet je zeker dat je het logboek van het gesprek in %s  dat startte op %s permanent wilt verwijderen?"
 
 #: ../pidgin/gtklog.c:308
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr ""
-"Weet je zeker dat je het systeem-logboek dat starte op %s permanent wilt "
-"verwijderen?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgstr "Weet je zeker dat je het systeem-logboek dat startte op %s permanent wilt verwijderen?"
 
 #: ../pidgin/gtklog.c:323
 msgid "Delete Log?"
@@ -16354,17 +16381,17 @@ msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Gesprek met %s op %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:594
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Bekijk logboek-folder"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:384
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Probeer '%s -h' voor meer informatie.\n"
 
-#: ../pidgin/gtkmain.c:389
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:387
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -16386,13 +16413,14 @@ msgstr ""
 "  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
 "  -d, --debug         debugberichten naar stdout sturen\n"
 "  -h, --help          deze hulptekst weergeven\n"
+"  -m, --multiple      niet voor enkele instantie zorgen\n"
 "  -n, --nologin       niet automatisch aanmelden\n"
 "  -l, --login[=NAAM]  automatisch aanmelden (optioneel argument NAAM geeft\n"
 "                      (kommagescheiden)te gebruiken account(s) aan)\n"
 "  -v, --version       versie-info weergeven\n"
 
-#: ../pidgin/gtkmain.c:402
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:400
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -16413,12 +16441,13 @@ msgstr ""
 "  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
 "  -d, --debug         debugberichten naar stdout sturen\n"
 "  -h, --help          deze hulptekst weergeven\n"
+"  -m, --multiple      niet voor enkele instantie zorgen\n"
 "  -n, --nologin       niet automatisch aanmelden\n"
 "  -l, --login[=NAAM]  automatisch aanmelden (optioneel argument NAAM geeft\n"
 "                      (kommagescheiden)te gebruiken account(s) aan)\n"
 "  -v, --version       versie-info weergeven\n"
 
-#: ../pidgin/gtkmain.c:532
+#: ../pidgin/gtkmain.c:530
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16459,7 +16488,8 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:726 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:724
+#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -16469,7 +16499,7 @@ msgstr "Alle berichten openen"
 
 #: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">U heeft email!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
 
 #: ../pidgin/gtknotify.c:570
 #, c-format
@@ -16482,30 +16512,30 @@ msgstr[1] "%s heeft %d nieuwe berichten."
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>%d nieuwe email.</b>"
-msgstr[1] "<b>%d nieuwe emails.</b>"
+msgstr[0] "<b>%d nieuwe e-mail.</b>"
+msgstr[1] "<b>%d nieuwe e-mails.</b>"
 
 #: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "De webbrowseropdracht \"%s\" is ongeldig."
+msgstr "De webbrowser-opdracht \"%s\" is ongeldig."
 
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1047
-#: ../pidgin/gtknotify.c:1060 ../pidgin/gtknotify.c:1197
+#: ../pidgin/gtknotify.c:1035
+#: ../pidgin/gtknotify.c:1047
+#: ../pidgin/gtknotify.c:1060
+#: ../pidgin/gtknotify.c:1197
 msgid "Unable to open URL"
 msgstr "Kan URL niet openen"
 
-#: ../pidgin/gtknotify.c:1045 ../pidgin/gtknotify.c:1058
+#: ../pidgin/gtknotify.c:1045
+#: ../pidgin/gtknotify.c:1058
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fout bij starten van \"%s\": %s"
 
 #: ../pidgin/gtknotify.c:1198
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"Kan handmatige browser niet starten omdat er geen correcte opdracht is "
-"ingesteld."
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Kan handmatige browser niet starten omdat er geen correcte opdracht is ingesteld."
 
 #: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
@@ -16524,14 +16554,10 @@ msgid "Could not unload plugin"
 msgstr "Kan plugin niet uitschakelen"
 
 #: ../pidgin/gtkplugin.c:319
-msgid ""
-"The plugin could not be unloaded now, but will be disabled at the next "
-"startup."
-msgstr ""
-"De plugin kan nu niet uitgeschakeld worden, maar zal de volgende keer worden "
-"uitgeschakeld."
+msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
+msgstr "De plugin kan nu niet uitgeschakeld worden, maar zal de volgende keer worden uitgeschakeld."
 
-#: ../pidgin/gtkplugin.c:454
+#: ../pidgin/gtkplugin.c:456
 #, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
@@ -16540,125 +16566,125 @@ msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Fout: %s\n"
 "Controleer de website van de plugin voor een update.</span>"
 
-#: ../pidgin/gtkplugin.c:583
+#: ../pidgin/gtkplugin.c:585
 msgid "Author"
 msgstr "Auteur"
 
-#: ../pidgin/gtkplugin.c:661
+#: ../pidgin/gtkplugin.c:663
 msgid "<b>Written by:</b>"
 msgstr "<b>Geschreven door:</b>"
 
-#: ../pidgin/gtkplugin.c:685
+#: ../pidgin/gtkplugin.c:687
 msgid "<b>Web site:</b>"
 msgstr "<b>Website:</b> "
 
-#: ../pidgin/gtkplugin.c:694
+#: ../pidgin/gtkplugin.c:696
 msgid "<b>Filename:</b>"
 msgstr "<b>Bestandsnaam:</b>"
 
-#: ../pidgin/gtkplugin.c:720
+#: ../pidgin/gtkplugin.c:724
 msgid "Configure Pl_ugin"
 msgstr "_Plugin instellen"
 
-#: ../pidgin/gtkplugin.c:788
+#: ../pidgin/gtkplugin.c:792
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Details plugin</b>"
 
-#: ../pidgin/gtkpounce.c:157
+#: ../pidgin/gtkpounce.c:158
 msgid "Select a file"
 msgstr "Kies een bestand"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkpounce.c:553
 msgid "Pounce on Whom"
-msgstr "Wie Alarmeren"
+msgstr "Wie alarmeren"
 
-#: ../pidgin/gtkpounce.c:566
+#: ../pidgin/gtkpounce.c:580
 msgid "_Buddy name:"
 msgstr "_Contactnaam:"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:614
 msgid "Si_gns on"
 msgstr "_Aanmelden"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:616
 msgid "Signs o_ff"
 msgstr "Af_melden"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:618
 msgid "Goes a_way"
 msgstr "_Weggaan"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:620
 msgid "Ret_urns from away"
 msgstr "_Terugkeren van afwezigheid"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:622
 msgid "Becomes _idle"
 msgstr "_Inactief is"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:624
 msgid "Is no longer i_dle"
 msgstr "Weer _actief is"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:626
 msgid "Starts _typing"
 msgstr "Start met _typen"
 
-#: ../pidgin/gtkpounce.c:614
+#: ../pidgin/gtkpounce.c:628
 msgid "P_auses while typing"
 msgstr "Pauzeert tijdens typen"
 
-#: ../pidgin/gtkpounce.c:616
+#: ../pidgin/gtkpounce.c:630
 msgid "Stops t_yping"
 msgstr "Stopt _met typen"
 
-#: ../pidgin/gtkpounce.c:618
+#: ../pidgin/gtkpounce.c:632
 msgid "Sends a _message"
 msgstr "Een bericht ver_stuurt"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:675
 msgid "Ope_n an IM window"
 msgstr "Be_richtvenster openen"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:677
 msgid "_Pop up a notification"
 msgstr "_Melding weergeven"
 
-#: ../pidgin/gtkpounce.c:665
+#: ../pidgin/gtkpounce.c:679
 msgid "Send a _message"
 msgstr "Een bericht ver_sturen"
 
-#: ../pidgin/gtkpounce.c:667
+#: ../pidgin/gtkpounce.c:681
 msgid "E_xecute a command"
 msgstr "Opdracht _uitvoeren"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:683
 msgid "P_lay a sound"
 msgstr "_Geluid afspelen"
 
-#: ../pidgin/gtkpounce.c:675
+#: ../pidgin/gtkpounce.c:689
 msgid "Brows_e..."
 msgstr "Bl_aderen..."
 
-#: ../pidgin/gtkpounce.c:677
+#: ../pidgin/gtkpounce.c:693
 msgid "Br_owse..."
 msgstr "Bl_aderen..."
 
-#: ../pidgin/gtkpounce.c:678
+#: ../pidgin/gtkpounce.c:694
+#: ../pidgin/gtkprefs.c:2008
 msgid "Pre_view"
 msgstr "_Voorbeeld"
 
-#: ../pidgin/gtkpounce.c:810
-#, fuzzy
+#: ../pidgin/gtkpounce.c:834
 msgid "P_ounce only when my status is not Available"
-msgstr "Contactalarm alleen wanneer mijn status niet beschikbaar is"
+msgstr "_Contactalarm alleen wanneer mijn status niet beschikbaar is"
 
-#: ../pidgin/gtkpounce.c:815
+#: ../pidgin/gtkpounce.c:839
 msgid "_Recurring"
 msgstr "_Herhalend"
 
-#: ../pidgin/gtkpounce.c:1259
+#: ../pidgin/gtkpounce.c:1283
 msgid "Pounce Target"
 msgstr "Alarmdoel"
 
@@ -16668,322 +16694,315 @@ msgstr "Kan smileythema niet uitpakken."
 
 #: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
-msgstr "Installeer Thema"
+msgstr "Installeer thema"
 
 #: ../pidgin/gtkprefs.c:646
-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 ""
-"Kies een smileythema uit de lijst. U kunt nieuwe thema's installeren door "
-"deze naar de lijst te slepen."
+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 "Kies een smileythema uit de lijst. U kunt nieuwe thema's installeren door deze naar de lijst te slepen."
 
 #: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Pictogram"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:891
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../pidgin/gtkprefs.c:914
+#: ../pidgin/gtkprefs.c:911
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Sluit gesprekken af met de Escape toets"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:940
 msgid "System Tray Icon"
 msgstr "Systeemvakpictogram"
 
-#: ../pidgin/gtkprefs.c:944
+#: ../pidgin/gtkprefs.c:941
 msgid "_Show system tray icon:"
 msgstr "_Systeemvakpictogram weergeven:"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:944
 msgid "On unread messages"
 msgstr "Bij ongelezen berichten"
 
-#: ../pidgin/gtkprefs.c:953
+#: ../pidgin/gtkprefs.c:950
 msgid "Conversation Window Hiding"
-msgstr "Gesprek-venster Verbergen"
+msgstr "Gespreksvenster verbergen"
 
-#: ../pidgin/gtkprefs.c:954
+#: ../pidgin/gtkprefs.c:951
 msgid "_Hide new IM conversations:"
 msgstr "_Nieuwe gesprekken verbergen:"
 
-#: ../pidgin/gtkprefs.c:957 ../pidgin/gtkprefs.c:2075
+#: ../pidgin/gtkprefs.c:954
+#: ../pidgin/gtkprefs.c:2072
 msgid "When away"
 msgstr "Bij afwezigheid"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:965
+#: ../pidgin/gtkprefs.c:962
 msgid "Tabs"
 msgstr "Tabs"
 
-#: ../pidgin/gtkprefs.c:967
+#: ../pidgin/gtkprefs.c:964
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Gesprekken en chats in venster met _tabbaden plaatsen"
 
-#: ../pidgin/gtkprefs.c:981
+#: ../pidgin/gtkprefs.c:978
 msgid "Show close b_utton on tabs"
 msgstr "_Sluitknoppen weergeven op tabbladen"
 
-#: ../pidgin/gtkprefs.c:984
+#: ../pidgin/gtkprefs.c:981
 msgid "_Placement:"
 msgstr "_Plaatsing:"
 
-#: ../pidgin/gtkprefs.c:986
+#: ../pidgin/gtkprefs.c:983
 msgid "Top"
 msgstr "Boven"
 
-#: ../pidgin/gtkprefs.c:987
+#: ../pidgin/gtkprefs.c:984
 msgid "Bottom"
 msgstr "Onder"
 
-#: ../pidgin/gtkprefs.c:988
+#: ../pidgin/gtkprefs.c:985
 msgid "Left"
 msgstr "Links"
 
-#: ../pidgin/gtkprefs.c:989
+#: ../pidgin/gtkprefs.c:986
 msgid "Right"
 msgstr "Rechts"
 
-#: ../pidgin/gtkprefs.c:991
+#: ../pidgin/gtkprefs.c:988
 msgid "Left Vertical"
-msgstr "Links vertikaal"
+msgstr "Links verticaal"
 
-#: ../pidgin/gtkprefs.c:992
+#: ../pidgin/gtkprefs.c:989
 msgid "Right Vertical"
-msgstr "rechts vertikaal"
+msgstr "rechts verticaal"
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:996
 msgid "N_ew conversations:"
 msgstr "_Nieuwe gesprekken:"
 
-#: ../pidgin/gtkprefs.c:1048
+#: ../pidgin/gtkprefs.c:1045
 msgid "Show _formatting on incoming messages"
 msgstr "_Opmaak weergeven bij ontvangen berichten"
 
-#: ../pidgin/gtkprefs.c:1050
+#: ../pidgin/gtkprefs.c:1047
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "Chat direct sluiten wanneer de tab gesloten wordt"
 
-#: ../pidgin/gtkprefs.c:1053
+#: ../pidgin/gtkprefs.c:1050
 msgid "Show _detailed information"
 msgstr "Laat ge_detaileerde informatie zien"
 
-#: ../pidgin/gtkprefs.c:1055
+#: ../pidgin/gtkprefs.c:1052
 msgid "Enable buddy ic_on animation"
-msgstr "Bewegende _contactplaatjes weergeven"
+msgstr "Bewegende _pictogrammen weergeven"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1059
 msgid "_Notify buddies that you are typing to them"
-msgstr "Laat anderen weten dat je aan het _typen bent"
+msgstr "Laat anderen weten dat je naar ze aan het _typen bent"
 
-#: ../pidgin/gtkprefs.c:1065
+#: ../pidgin/gtkprefs.c:1062
 msgid "Highlight _misspelled words"
 msgstr "Verkeerd gespelde woorden _oplichten"
 
-#: ../pidgin/gtkprefs.c:1069
+#: ../pidgin/gtkprefs.c:1066
 msgid "Use smooth-scrolling"
 msgstr "Vloeiend schuiven"
 
-#: ../pidgin/gtkprefs.c:1072
+#: ../pidgin/gtkprefs.c:1069
 msgid "F_lash window when IMs are received"
 msgstr "Venster laten _knipperen wanneer gespreksberichten worden ontvangen"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1071
 msgid "Minimi_ze new conversation windows"
-msgstr "Venster Minimaliseren "
+msgstr "Minimalizeer nieuwe gespreksvensters "
 
-#: ../pidgin/gtkprefs.c:1078
+#: ../pidgin/gtkprefs.c:1075
 msgid "Minimum input area height in lines:"
 msgstr "Minimale invoerhoogte in regels:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1081
 msgid "Font"
 msgstr "Lettertype"
 
-#: ../pidgin/gtkprefs.c:1086
+#: ../pidgin/gtkprefs.c:1083
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "Gebruik lettertype uit _thema"
 
-#: ../pidgin/gtkprefs.c:1088
+#: ../pidgin/gtkprefs.c:1085
 msgid "Use font from _theme"
 msgstr "Gebruik lettertype van thema"
 
-#: ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkprefs.c:1091
 msgid "Conversation _font:"
 msgstr "Gesprek _Lettertype:"
 
-#: ../pidgin/gtkprefs.c:1101
+#: ../pidgin/gtkprefs.c:1098
 msgid "Default Formatting"
 msgstr "Standaardopmaak"
 
-#: ../pidgin/gtkprefs.c:1120
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"Dit is hoe uitgaande berichten eruit zien via protocollen die ondersteuning "
-"voor berichtopmaak hebben."
+#: ../pidgin/gtkprefs.c:1117
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "Dit is hoe uitgaande berichten eruit zien via protocollen die ondersteuning voor berichtopmaak hebben."
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1177
 msgid "Cannot start proxy configuration program."
 msgstr "Kan het programma voor proxy-instellingen niet starten."
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1189
 msgid "Cannot start browser configuration program."
 msgstr "Kan het programma voor browser-instellingen niet starten."
 
-#: ../pidgin/gtkprefs.c:1212
+#: ../pidgin/gtkprefs.c:1209
 msgid "ST_UN server:"
 msgstr "ST_UN-server:"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1221
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Bijvoorbeeld: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkprefs.c:1225
 msgid "_Autodetect IP address"
 msgstr "IP-adres _automatisch bepalen"
 
-#: ../pidgin/gtkprefs.c:1237
+#: ../pidgin/gtkprefs.c:1234
 msgid "Public _IP:"
 msgstr "Publiek _IP-adres:"
 
-#: ../pidgin/gtkprefs.c:1268
+#: ../pidgin/gtkprefs.c:1265
 msgid "Ports"
 msgstr "Poorten"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1268
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "_Automatisch router port forwarding inschakelen"
 
-#: ../pidgin/gtkprefs.c:1274
+#: ../pidgin/gtkprefs.c:1271
 msgid "_Manually specify range of ports to listen on"
 msgstr "Poortbereik _handmatig aangeven"
 
-#: ../pidgin/gtkprefs.c:1277
+#: ../pidgin/gtkprefs.c:1274
 msgid "_Start port:"
 msgstr "_Beginpoort:"
 
-#: ../pidgin/gtkprefs.c:1284
+#: ../pidgin/gtkprefs.c:1281
 msgid "_End port:"
 msgstr "_Eindpoort:"
 
-#: ../pidgin/gtkprefs.c:1292
+#: ../pidgin/gtkprefs.c:1289
 msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Server &amp; Browser"
+msgstr "Proxy-server &amp; browser"
 
-#: ../pidgin/gtkprefs.c:1300
+#: ../pidgin/gtkprefs.c:1297
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Proxy-configuratie programma werd niet gevonden.</b>"
 
-#: ../pidgin/gtkprefs.c:1308
+#: ../pidgin/gtkprefs.c:1305
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Programma voor browser-instellingen werd niet gevonden.</b>"
 
-#: ../pidgin/gtkprefs.c:1313
+#: ../pidgin/gtkprefs.c:1310
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
-"Proxy & Browser voorkeuren zijn ingesteld\n"
-"in GNOME Instellingen"
+"Proxy- en browser-voorkeuren zijn ingesteld\n"
+"in GNOME-instellingen"
 
-#: ../pidgin/gtkprefs.c:1320
+#: ../pidgin/gtkprefs.c:1317
 msgid "Configure _Proxy"
-msgstr "_Proxy Instellingen Veranderen"
+msgstr "_Proxy-instellingen veranderen"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1322
 msgid "Configure _Browser"
-msgstr "_Browser Instellen"
+msgstr "_Browser instellen"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1328
 msgid "Proxy Server"
-msgstr "Proxy Server"
+msgstr "Proxy-server"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1333
 msgid "No proxy"
 msgstr "Geen proxy"
 
-#: ../pidgin/gtkprefs.c:1392
+#: ../pidgin/gtkprefs.c:1389
 msgid "_User:"
 msgstr "_Gebruiker:"
 
-#: ../pidgin/gtkprefs.c:1480
+#: ../pidgin/gtkprefs.c:1477
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1478
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1482
+#: ../pidgin/gtkprefs.c:1479
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1483
+#: ../pidgin/gtkprefs.c:1480
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1484
+#: ../pidgin/gtkprefs.c:1481
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1485
+#: ../pidgin/gtkprefs.c:1482
 msgid "Desktop Default"
-msgstr "Desktop Standaard"
+msgstr "Desktop standaard"
 
-#: ../pidgin/gtkprefs.c:1486
+#: ../pidgin/gtkprefs.c:1483
 msgid "GNOME Default"
 msgstr "GNOME standaard"
 
-#: ../pidgin/gtkprefs.c:1487
+#: ../pidgin/gtkprefs.c:1484
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1488
+#: ../pidgin/gtkprefs.c:1485
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1489
+#: ../pidgin/gtkprefs.c:1486
 msgid "Firebird"
-msgstr "Firefox"
+msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1490
+#: ../pidgin/gtkprefs.c:1487
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1499
+#: ../pidgin/gtkprefs.c:1496
 msgid "Manual"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1557
 msgid "Browser Selection"
-msgstr "Browserselectie"
+msgstr "Browser-selectie"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1561
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1569
 msgid "_Open link in:"
 msgstr "Verwijzing _openen met:"
 
-#: ../pidgin/gtkprefs.c:1574
+#: ../pidgin/gtkprefs.c:1571
 msgid "Browser default"
-msgstr "Standaardbrowser"
+msgstr "Standaard-browser"
 
-#: ../pidgin/gtkprefs.c:1575
+#: ../pidgin/gtkprefs.c:1572
 msgid "Existing window"
 msgstr "Bestaand venster"
 
-#: ../pidgin/gtkprefs.c:1577
+#: ../pidgin/gtkprefs.c:1574
 msgid "New tab"
 msgstr "Nieuw tabblad"
 
-#: ../pidgin/gtkprefs.c:1594
+#: ../pidgin/gtkprefs.c:1591
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16992,63 +17011,63 @@ msgstr ""
 "_Handmatig:\n"
 "(%s voor URL)"
 
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1617
 msgid "Log _format:"
 msgstr "Logboekop_maak:"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1622
 msgid "Log all _instant messages"
 msgstr "Alle gesprekken _opslaan"
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1624
 msgid "Log all c_hats"
 msgstr "Alle _chats opslaan"
 
-#: ../pidgin/gtkprefs.c:1629
+#: ../pidgin/gtkprefs.c:1626
 msgid "Log all _status changes to system log"
 msgstr "_Statusveranderingen opslaan in systeemlogboek"
 
-#: ../pidgin/gtkprefs.c:1779
+#: ../pidgin/gtkprefs.c:1776
 msgid "Sound Selection"
 msgstr "Geluid selecteren"
 
-#: ../pidgin/gtkprefs.c:1789
+#: ../pidgin/gtkprefs.c:1786
 msgid "Quietest"
 msgstr "Stilst"
 
-#: ../pidgin/gtkprefs.c:1791
+#: ../pidgin/gtkprefs.c:1788
 msgid "Quieter"
 msgstr "Stiller"
 
-#: ../pidgin/gtkprefs.c:1793
+#: ../pidgin/gtkprefs.c:1790
 msgid "Quiet"
 msgstr "Stil"
 
-#: ../pidgin/gtkprefs.c:1797
+#: ../pidgin/gtkprefs.c:1794
 msgid "Loud"
 msgstr "Hard"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1796
 msgid "Louder"
 msgstr "Harder"
 
-#: ../pidgin/gtkprefs.c:1801
+#: ../pidgin/gtkprefs.c:1798
 msgid "Loudest"
 msgstr "Hardst"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1861
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: ../pidgin/gtkprefs.c:1866
+#: ../pidgin/gtkprefs.c:1863
 msgid "Console beep"
 msgstr "Terminal-pieptoon"
 
-#: ../pidgin/gtkprefs.c:1873
+#: ../pidgin/gtkprefs.c:1870
 msgid "No sounds"
 msgstr "Geen geluid"
 
-#: ../pidgin/gtkprefs.c:1886
+#: ../pidgin/gtkprefs.c:1883
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17057,83 +17076,91 @@ msgstr ""
 "Geluids_opdracht:\n"
 "(%s voor bestandsnaam)"
 
-#: ../pidgin/gtkprefs.c:1895
+#: ../pidgin/gtkprefs.c:1892
 msgid "Sounds when conversation has _focus"
 msgstr "Geluiden wanneer gesprek de _aandacht heeft"
 
-#: ../pidgin/gtkprefs.c:1897
+#: ../pidgin/gtkprefs.c:1894
 msgid "Enable sounds:"
 msgstr "Geluidjes inschakelen:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1911
 msgid "Volume:"
-msgstr "Geluid:"
+msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1978
 msgid "Play"
 msgstr "Afspelen"
 
-#: ../pidgin/gtkprefs.c:2058
+#: ../pidgin/gtkprefs.c:2004
+msgid "_Browse..."
+msgstr "Bl_aderen..."
+
+#: ../pidgin/gtkprefs.c:2012
+msgid "_Reset"
+msgstr "_Herstellen"
+
+#: ../pidgin/gtkprefs.c:2055
 msgid "_Report idle time:"
 msgstr "Bijhouden van activiteit:"
 
-#: ../pidgin/gtkprefs.c:2063
+#: ../pidgin/gtkprefs.c:2060
 msgid "Based on keyboard or mouse use"
 msgstr "Activiteit van toetsenbord en muis"
 
-#: ../pidgin/gtkprefs.c:2072
+#: ../pidgin/gtkprefs.c:2069
 msgid "_Auto-reply:"
-msgstr "_Auto-antwoord:"
+msgstr "_Automatisch antwoord:"
 
-#: ../pidgin/gtkprefs.c:2076
+#: ../pidgin/gtkprefs.c:2073
 msgid "When both away and idle"
 msgstr "Bij afwezigheid en inactiviteit"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2082
+#: ../pidgin/gtkprefs.c:2079
 msgid "Auto-away"
-msgstr "Auto-afwezig"
+msgstr "Automatisch afwezig"
 
-#: ../pidgin/gtkprefs.c:2084
+#: ../pidgin/gtkprefs.c:2081
 msgid "Change status when _idle"
-msgstr "Status op afwezig zetten _wanneer ik niets doe"
+msgstr "Status op afwezig zetten _wanneer ik inactief ben"
 
-#: ../pidgin/gtkprefs.c:2088
+#: ../pidgin/gtkprefs.c:2085
 msgid "_Minutes before becoming idle:"
-msgstr "_Minuten voor afwezig worden:"
+msgstr "_Minuten voor inactief worden:"
 
-#: ../pidgin/gtkprefs.c:2095
+#: ../pidgin/gtkprefs.c:2092
 msgid "Change _status to:"
 msgstr "_Status veranderen in: "
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2108
+#: ../pidgin/gtkprefs.c:2105
 msgid "Status at Startup"
 msgstr "Status bij starten"
 
-#: ../pidgin/gtkprefs.c:2110
+#: ../pidgin/gtkprefs.c:2107
 msgid "Use status from last _exit at startup"
 msgstr "_Laatst gebruikte status herstellen bij opstarten"
 
-#: ../pidgin/gtkprefs.c:2117
+#: ../pidgin/gtkprefs.c:2114
 msgid "Status to a_pply at startup:"
 msgstr "Te gebruiken _status bij opstarten:"
 
-#: ../pidgin/gtkprefs.c:2146
+#: ../pidgin/gtkprefs.c:2143
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2148
+#: ../pidgin/gtkprefs.c:2145
 msgid "Smiley Themes"
 msgstr "Smiley-thema's"
 
-#: ../pidgin/gtkprefs.c:2155
+#: ../pidgin/gtkprefs.c:2152
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2159
+#: ../pidgin/gtkprefs.c:2156
 msgid "Status / Idle"
-msgstr "Status /Inactief"
+msgstr "Status / inactief"
 
 #: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
@@ -17141,11 +17168,11 @@ msgstr "Alle gebruikers mogen contact met mij leggen"
 
 #: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
-msgstr "Alleen gebruikers uit mijn contactenlijst toestaan"
+msgstr "Alleen gebruikers uit mijn contactenlijst mogen contact met mij leggen"
 
 #: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
-msgstr "Alleen onderstaande gebruikers toestaan"
+msgstr "Alleen onderstaande gebruikers mogen contact met mij leggen"
 
 #: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
@@ -17170,9 +17197,10 @@ msgstr "Privacy instellen voor:"
 #. Remove All button
 #: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
-msgstr "Verwijderen Al_les"
+msgstr "Alles _verwijderen"
 
-#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
+#: ../pidgin/gtkprivacy.c:503
+#: ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Gebruiker toestaan"
 
@@ -17182,10 +17210,10 @@ msgstr "Geef een gebruiker die contact met u mag leggen."
 
 #: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Geef alstublieft de naam van de gebruiker die contact met u mag leggen."
+msgstr "Geef de naam van de gebruiker die contact met u mag leggen."
 
-#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
+#: ../pidgin/gtkprivacy.c:508
+#: ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Toestaan"
 
@@ -17199,7 +17227,8 @@ msgstr "%s toestaan contact met u te leggen?"
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Weet u zeker dat u %s toestemming wilt geven?"
 
-#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:545
+#: ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Gebruiker blokkeren"
 
@@ -17209,7 +17238,7 @@ msgstr "Geef een gebruiker die geblokkeerd moet worden."
 
 #: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
-msgstr "Geef alstublieft de naam van de gebruiker die u wilt blokkeren."
+msgstr "Geef de naam van de gebruiker die u wilt blokkeren."
 
 #: ../pidgin/gtkprivacy.c:555
 #, c-format
@@ -17241,169 +17270,207 @@ msgstr "Overschrijven"
 msgid "Choose New Name"
 msgstr "Kies een nieuwe naam"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1650
+#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Map selecteren..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:577
+#: ../pidgin/gtkroomlist.c:570
 msgid "_Get List"
 msgstr "_Lijst ophalen"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:585
+#: ../pidgin/gtkroomlist.c:578
 msgid "_Add Chat"
 msgstr "_Chat toevoegen"
 
-#: ../pidgin/gtksavedstatuses.c:337
+#: ../pidgin/gtksavedstatuses.c:339
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr ""
-"Weet je zeker dat je de geselecteerde opgeslagen statussen wilt veranderen?"
+msgstr "Weet je zeker dat je de geselecteerde opgeslagen statussen wilt veranderen?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
+#: ../pidgin/gtksavedstatuses.c:648
+#: ../pidgin/gtksavedstatuses.c:1277
 msgid "_Use"
 msgstr "_Gebruiken"
 
-#: ../pidgin/gtksavedstatuses.c:765
+#: ../pidgin/gtksavedstatuses.c:791
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titel al in gebruik. U dient een unieke titel te kiezen."
 
-#: ../pidgin/gtksavedstatuses.c:961
+#: ../pidgin/gtksavedstatuses.c:1001
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1153
+#: ../pidgin/gtksavedstatuses.c:1200
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
+#: ../pidgin/gtksavedstatuses.c:1208
+#: ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Status:"
 
 #  Different status message expander
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
+#: ../pidgin/gtksavedstatuses.c:1224
 msgid "Use a _different status for some accounts"
 msgstr "Een _andere status gebruiken voor sommige accounts"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1236
+#: ../pidgin/gtksavedstatuses.c:1284
 msgid "Sa_ve & Use"
 msgstr "Op_slaan & gebruiken"
 
-#: ../pidgin/gtksavedstatuses.c:1437
+#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "Status van %s"
 
-#: ../pidgin/gtkstatusbox.c:688
+#: ../pidgin/gtksmiley.c:229
+#: ../pidgin/gtksmiley.c:254
+#: ../pidgin/gtksmiley.c:327
+msgid "Custom Smiley"
+msgstr "Eigen smiley"
+
+#: ../pidgin/gtksmiley.c:230
+msgid "Duplicate Shortcut"
+msgstr "Dubbele snelkoppeling"
+
+#: ../pidgin/gtksmiley.c:231
+msgid "A custom smiley for the selected shortcut already exists. Please specify a different shortcut."
+msgstr "Een eigen smiley voor de geselecteerde snelkoppeling bestaat al reeds. Geef alsjeblieft een andere snelkoppeling."
+
+#: ../pidgin/gtksmiley.c:255
+msgid "More Data needed"
+msgstr "Meer gegevens vereist"
+
+#: ../pidgin/gtksmiley.c:256
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Geef een snelkoppeling om te associëren met de smiley."
+
+#: ../pidgin/gtksmiley.c:257
+msgid "Please select an image for the smiley."
+msgstr "Selecteer een afbeelding uit de lijst voor de smiley"
+
+#: ../pidgin/gtksmiley.c:346
+msgid "Edit Smiley"
+msgstr "Smiley bewerken"
+
+#: ../pidgin/gtksmiley.c:346
+msgid "Add Smiley"
+msgstr "Smiley toevoegen"
+
+#: ../pidgin/gtksmiley.c:367
+msgid "Smiley _Image"
+msgstr "_Smiley-afbeelding"
+
+#. Smiley shortcut
+#: ../pidgin/gtksmiley.c:398
+msgid "Smiley S_hortcut"
+msgstr "Sneltoets smiley"
+
+#: ../pidgin/gtksmiley.c:494
+msgid "Smiley"
+msgstr "Eigen smileys"
+
+#: ../pidgin/gtksmiley.c:691
+msgid "Custom Smiley Manager"
+msgstr "Eigen smileys beheren"
+
+#: ../pidgin/gtkstatusbox.c:689
 msgid "Waiting for network connection"
 msgstr "Wachten op netwerk-verbinding"
 
-#: ../pidgin/gtkstatusbox.c:1101
+#: ../pidgin/gtkstatusbox.c:1104
 msgid "New status..."
 msgstr "Nieuwe status..."
 
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../pidgin/gtkstatusbox.c:1105
 msgid "Saved statuses..."
 msgstr "Opgeslagen statussen..."
 
-#: ../pidgin/gtkstatusbox.c:1737
-#, fuzzy
+#: ../pidgin/gtkstatusbox.c:1782
 msgid "Status Selector"
-msgstr "Statustekst"
+msgstr "Statusselectie"
 
 #: ../pidgin/gtkutils.c:685
 msgid "Google Talk"
-msgstr "Google Talk"
+msgstr "Google talk"
 
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1475
+#: ../pidgin/gtkutils.c:1455
+#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "De volgende fout is opgetreden bij laden van %s: %s"
 
-#: ../pidgin/gtkutils.c:1455 ../pidgin/gtkutils.c:1477
+#: ../pidgin/gtkutils.c:1458
+#: ../pidgin/gtkutils.c:1486
 msgid "Failed to load image"
 msgstr "Kan afbeelding niet laden"
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1560
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kan map %s niet verzenden."
 
-#: ../pidgin/gtkutils.c:1553
+#: ../pidgin/gtkutils.c:1561
 #, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr ""
-"%s kan geen hele map ineens sturen. U zult de bestanden per stuk moeten "
-"selecteren."
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgstr "%s kan geen hele map ineens sturen. U zult de bestanden per stuk moeten selecteren."
 
-#: ../pidgin/gtkutils.c:1590 ../pidgin/gtkutils.c:1602
-#: ../pidgin/gtkutils.c:1609
+#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1607
+#: ../pidgin/gtkutils.c:1614
 msgid "You have dragged an image"
-msgstr "U heeft een afbeelding hierheen gesleept"
+msgstr "Je hebt een afbeelding hierheen gesleept"
 
-#: ../pidgin/gtkutils.c:1591
-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 ""
-"U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als "
-"contactplaatje gebruiken voor deze gebruiker."
+#: ../pidgin/gtkutils.c:1596
+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 "U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als pictogram gebruiken voor deze gebruiker."
 
-#: ../pidgin/gtkutils.c:1597 ../pidgin/gtkutils.c:1617
+#: ../pidgin/gtkutils.c:1602
+#: ../pidgin/gtkutils.c:1622
 msgid "Set as buddy icon"
-msgstr "Instellen als contactplaatje"
+msgstr "Instellen als pictogram"
 
-#: ../pidgin/gtkutils.c:1598 ../pidgin/gtkutils.c:1618
+#: ../pidgin/gtkutils.c:1603
+#: ../pidgin/gtkutils.c:1623
 msgid "Send image file"
 msgstr "Afbeelding sturen"
 
-#: ../pidgin/gtkutils.c:1599 ../pidgin/gtkutils.c:1618
+#: ../pidgin/gtkutils.c:1604
+#: ../pidgin/gtkutils.c:1623
 msgid "Insert in message"
 msgstr "Invoegen in gesprek"
 
-#: ../pidgin/gtkutils.c:1603
+#: ../pidgin/gtkutils.c:1608
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Wilt u het instellen als het contactplaatje van deze gebruiker?"
+msgstr "Wilt u het instellen als het pictogram van deze gebruiker?"
 
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"U kunt deze afbeelding verzenden via bestandsoverdracht, in dit gesprek "
-"invoegen, of als contactplaatje gebruiken voor deze gebruiker."
+#: ../pidgin/gtkutils.c:1615
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
+msgstr "U kunt deze afbeelding verzenden via bestandsoverdracht, in dit gesprek invoegen, of als pictogram gebruiken voor deze gebruiker."
 
-#: ../pidgin/gtkutils.c:1611
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"U kunt deze afbeelding in dit gesprek invoegen, of als contactplaatje "
-"gebruiken voor deze gebruiker."
+#: ../pidgin/gtkutils.c:1616
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "U kunt deze afbeelding in dit gesprek invoegen, of als pictogram gebruiken voor deze gebruiker."
 
 #. 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:1669
+#: ../pidgin/gtkutils.c:1675
 msgid "Cannot send launcher"
 msgstr "Kan starter niet sturen"
 
-#: ../pidgin/gtkutils.c:1669
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"U heeft een starter hierheen gesleept. Waarschijnlijk wilt u waar deze "
-"starter naar verwijst, sturen."
+#: ../pidgin/gtkutils.c:1675
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "Je hebt een starter hierheen gesleept. Waarschijnlijk wil je het waar deze starter naar verwijst sturen."
 
-#: ../pidgin/gtkutils.c:2407
+#: ../pidgin/gtkutils.c:2413
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17414,34 +17481,31 @@ msgstr ""
 "<b>Grootte:</b> %s\n"
 "<b>Afbeeldingsgrootte:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2709
+#: ../pidgin/gtkutils.c:2715
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-"Het bestand '%s' is te groot voor %s. Probeer een kleinere afbeelding\n"
+msgstr "Het bestand '%s' is te groot voor %s. Probeer een kleinere afbeelding\n"
 
-#: ../pidgin/gtkutils.c:2711
+#: ../pidgin/gtkutils.c:2717
 msgid "Icon Error"
-msgstr "Icoon Fout"
+msgstr "Icoonfout"
 
-#: ../pidgin/gtkutils.c:2712
+#: ../pidgin/gtkutils.c:2718
 msgid "Could not set icon"
 msgstr "Kan plaatje niet instellen"
 
-#: ../pidgin/gtkutils.c:2812
+#: ../pidgin/gtkutils.c:2818
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kan bestand '%s' niet openen: %s"
 
-#: ../pidgin/gtkutils.c:2861
+#: ../pidgin/gtkutils.c:2867
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"kan afbeelding '%s' niet laden: reden onbekend, waarschijnlijk een kapotte "
-"afbeelding"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "kan afbeelding '%s' niet laden: reden onbekend, waarschijnlijk een kapotte afbeelding"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Bestand opslaan"
 
@@ -17471,15 +17535,11 @@ msgstr "Be_werken"
 
 #: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
-msgstr "Email _openen"
-
-#: ../pidgin/pidginstock.c:95
-msgid "_Pause"
-msgstr "_Pauzeren"
+msgstr "E-mail _openen"
 
-#: ../pidgin/pidgintooltip.c:100
+#: ../pidgin/pidgintooltip.c:101
 msgid "Pidgin Tooltip"
-msgstr "Pidgin Toolti["
+msgstr "Pidgin tooltip"
 
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
@@ -17487,7 +17547,7 @@ msgstr "Pidgin smileys"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
+msgstr "Penguin oppimpen"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
@@ -17497,35 +17557,34 @@ msgstr "Als je dit selecteert, schakel je graphische emoticons uit."
 msgid "none"
 msgstr "geen"
 
-#: ../pidgin/plugins/cap/cap.c:573
-msgid "Display Statistics"
-msgstr "Statistieke weergeven"
-
-#: ../pidgin/plugins/cap/cap.c:586 ../pidgin/plugins/cap/cap.c:589
+#: ../pidgin/plugins/cap/cap.c:441
+#: ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Reactiewaarschijnlijkheid:"
 
-#: ../pidgin/plugins/cap/cap.c:886
+#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Instellingen Statistieken"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:889
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Maximale reactietijd:"
 
-#: ../pidgin/plugins/cap/cap.c:892 ../pidgin/plugins/cap/cap.c:899
-#: ../pidgin/plugins/cap/cap.c:906 ../pidgin/plugins/timestamp.c:148
+#: ../pidgin/plugins/cap/cap.c:775
+#: ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:789
+#: ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minuten"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:896
+#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Maximaal verschil in laatst aanwezig:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:903
+#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Drempel:"
 
@@ -17535,20 +17594,20 @@ msgstr "Drempel:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:1025
+#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
-msgstr "Contact Beschikbaarheids Voorspelling"
+msgstr "Contact-beschikbaarheids-voorspelling"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:1027
+#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
-msgstr "Contactbeschikbaarheidsvoorspellingsplugin"
+msgstr "Contact-beschikbaarheids-voorspellings-plugin"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:1028
+#: ../pidgin/plugins/cap/cap.c:897
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "Geeft statististieke informatie over de beschikbaarheid van je contact"
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -17576,12 +17635,8 @@ msgid "Point values to use when..."
 msgstr "Te gebruiken puntentelling bij..."
 
 #: ../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 ""
-"Het contact met de <i>hoogste score</i> is het contact met de hoogste "
-"prioriteit in de contactgroep.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "Het contact met de <i>hoogste score</i> is het contact met de hoogste prioriteit in de contactgroep.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -17605,25 +17660,20 @@ msgstr "Contactprioriteit"
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:191
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Geeft de mogelijkheid om waardes toe te kennen aan de status van het contact."
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Geeft de mogelijkheid om waardes toe te kennen aan de status van het contact."
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:193
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Geeft de mogelijkheid om de waardes te veranderen van de diverse "
-"contactstatussen bij berekening van de prioriteit."
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "Geeft de mogelijkheid om de waardes te veranderen van de diverse contactstatussen bij berekening van de prioriteit."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
-msgstr "Gesprek Kleuren"
+msgstr "Gesprekskleuren"
 
-#: ../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 "Verander kleuren in het gesprek-venster"
 
@@ -17641,13 +17691,14 @@ msgstr "Systeemberichten"
 
 #: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
-msgstr "Verzonden Berichten"
+msgstr "Verzonden berichten"
 
 #: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
-msgstr "Ontvangen Berichten"
+msgstr "Ontvangen berichten"
 
-#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
+#: ../pidgin/plugins/convcolors.c:223
+#: ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Kies kleur voor %s"
@@ -17662,7 +17713,7 @@ msgstr "Toepassen in de gesprekken"
 
 #: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
-msgstr "Toepassen in IM's."
+msgstr "Toepassen in gesprekken."
 
 #: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
@@ -17674,12 +17725,8 @@ msgstr "Plaatsing van gesprekken"
 
 #. 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 ""
-"Opmerking: The voorkeur voor \"Nieuwe gesprekken\" moet veranderd worden "
-"naar \"By conversation count\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "Opmerking: The voorkeur voor \"Nieuwe gesprekken\" moet veranderd worden naar \"By conversation count\"."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -17708,12 +17755,8 @@ msgstr "Extra opties voor plaatsen van gespreksvensters."
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Het aantal gesprekken per venster beperken, al of niet met splitsing van "
-"chats en gewone gesprekken."
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Het aantal gesprekken per venster beperken, al of niet met splitsing van chats en gewone gesprekken."
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -17759,14 +17802,12 @@ msgstr "Ondersteuning voor muisgebaren"
 #. *  description
 #: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
-"Allows support for mouse gestures in conversation windows. Drag the middle "
-"mouse button to perform certain actions:\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle mouse button to perform certain actions:\n"
 " • Drag down and then to the right to close a conversation.\n"
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Geeft ondersteuning voor muisgebaren in gespreksvensters. Sleep met de "
-"middelste muisknop ingedruk om bepaalde acties uit te voeren:\n"
+"Geeft ondersteuning voor muisgebaren in gespreksvensters. Sleep met de middelste muisknop ingedruk om bepaalde acties uit te voeren:\n"
 "• Sleep naar beneden en dan naar rechts om een gesprek te sluiten.\n"
 "• Sleep naar boven en dan naar links om naar het vorige gesprek te gaan.\n"
 "• Sleep naar boven en dan naar rechts om naar het volgende gesprek te gaan."
@@ -17776,60 +17817,54 @@ msgid "Instant Messaging"
 msgstr "Expresberichten"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:472
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Kies een persoon uit het hieronder weergegeven adresboek, of voeg een nieuw "
-"persoon toe."
+msgstr "Kies een persoon uit het hieronder weergegeven adresboek, of voeg een nieuw persoon toe."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:566
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Groep:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:591
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:478
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Nieuw persoon"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:608
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Contact selecteren"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:354
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Kies een persoon uit uw adresboek om dit contact aan toe te voegen, of maak "
-"een nieuw persoon aan."
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Kies een persoon uit uw adresboek om dit contact aan toe te voegen, of maak een nieuw persoon aan."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:442
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Gebruiker_details"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:495
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "Contact _associëren"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:242
 #: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send email"
-msgstr "Kan geen email verzenden"
+msgstr "Kan geen e-mail verzenden"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
-msgstr "Kan evolution niet vinden."
+msgstr "Kan het uitvoerbaar bestand van Evolution niet vinden in het PATH."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An email address was not found for this buddy."
-msgstr "Er is geen emailadres gevonden van dit contact"
+msgstr "Er is geen e-mailadres gevonden van dit contact"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
@@ -17837,19 +17872,17 @@ msgstr "Toevoegen aan adresboek"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send Email"
-msgstr "Email sturen"
+msgstr "E-mail sturen"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:432
+#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Evolution integratie-opties"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:435
+#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Selecteer de accounts waar contacten automatisch aan toegevoegd moeten "
-"worden."
+msgstr "Selecteer de accounts waar contacten automatisch aan toegevoegd moeten worden."
 
 #. *< type
 #. *< ui_requirement
@@ -17857,7 +17890,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:547
+#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Integratie met Evolution"
 
@@ -17865,8 +17898,8 @@ msgstr "Integratie met Evolution"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:550
-#: ../pidgin/plugins/gevolution/gevolution.c:552
+#: ../pidgin/plugins/gevolution/gevolution.c:532
+#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Verzorgt de integratie met Evolution."
 
@@ -17875,7 +17908,6 @@ msgid "Please enter the person's information below."
 msgstr "Vul hieronder de persoonsgegevens in."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:270
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
 msgstr "Vul hieronder de gebruikersnaam en accounttype van uw contact in."
 
@@ -17898,7 +17930,7 @@ msgstr "Achternaam:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "Email:"
-msgstr "Email:"
+msgstr "E-mail:"
 
 #. *< type
 #. *< ui_requirement
@@ -17908,7 +17940,7 @@ msgstr "Email:"
 #. *< id
 #: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
-msgstr "GTK Signalentest"
+msgstr "GTK signalentest"
 
 #. *< name
 #. *< version
@@ -17946,58 +17978,53 @@ msgstr "Minimaliseren bij afwezigheid"
 #. *< 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 ""
-"Minimaliseert het gespreksvenster en de contactenlijst bij afwezigheid."
+msgstr "Minimaliseert het gespreksvenster en de contactenlijst bij afwezigheid."
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr "Emailcontrole"
+msgstr "E-mailcontrole"
 
 #: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "Controleert op lokale email."
+msgstr "Controleert op lokale e-mail."
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Voegt een klein vak toe aan de contactenlijst die aangeeft of u nieuwe e-"
-"mail heeft."
+msgstr "Voegt een klein vak toe aan de contactenlijst die aangeeft of u nieuwe e-mail heeft."
 
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Markeerlijn"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
-#, fuzzy
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Mededelingen in het gesprek weergeven."
+msgstr "Een lijn aanmaken om nieuwe berichten in een gesprek aan te geven."
 
 #: ../pidgin/plugins/markerline.c:240
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "Markeerlijn"
+msgstr "Ga naar markeerlijn"
 
 #: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "Teken Markeerlijn in"
 
-#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:693
+#: ../pidgin/plugins/markerline.c:278
+#: ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "_Berichtvensters"
 
-#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:700
+#: ../pidgin/plugins/markerline.c:282
+#: ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "C_hatvensters"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Er wordt gevraagd om een Muzieksessie. Klik op het MM-pictogram om te "
-"accepteren."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "Er wordt gevraagd om een Muzieksessie. Klik op het MM-pictogram om te accepteren."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -18005,7 +18032,7 @@ msgstr "Muzieksessie geaccepteerd."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
-msgstr "Expresberichten met muziek"
+msgstr "Berichten met muziek"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
@@ -18022,7 +18049,7 @@ msgstr "De volgende fout is opgetreden:"
 #. Configuration frame
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
-msgstr "Instellingen voor expresberichten met muziek"
+msgstr "Instellingen voor berichten met muziek"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
@@ -18055,12 +18082,8 @@ msgstr "Muzieksessie-plugin voor gezamenlijk componeren."
 #  *  summary
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-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 ""
-"De muzieksessie-plugin geeft enkele gebruikers de mogelijkheid om "
-"tegelijkertijd gezamenlijk aan een muziekstuk te werken."
+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 "De muzieksessie-plugin geeft enkele gebruikers de mogelijkheid om tegelijkertijd gezamenlijk aan een muziekstuk te werken."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:689
@@ -18068,9 +18091,8 @@ msgid "Notify For"
 msgstr "Melding geven voor"
 
 #: ../pidgin/plugins/notify.c:708
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t _alleen als iemand uw naam zegt"
+msgstr "\t _Alleen wanneer iemand uw gebruikersnaam vermeldt"
 
 #: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
@@ -18104,13 +18126,12 @@ msgstr "\"_URGENT\" (hoge prioriteit) doorgeven aan het vensterbeheer"
 #. Raise window method button
 #: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
-msgstr "Venster _optillen"
+msgstr "Gespreksvenster _optillen"
 
 #. Present conversation method button
 #: ../pidgin/plugins/notify.c:786
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "Venster _optillen"
+msgstr "Gespreksventer _aanwezig"
 
 #. ---------- "Notification Removals" ----------
 #: ../pidgin/plugins/notify.c:794
@@ -18156,9 +18177,10 @@ msgstr "Bericht-attendering"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:927 ../pidgin/plugins/notify.c:929
+#: ../pidgin/plugins/notify.c:927
+#: ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Geeft u een aantal manieren om u te attenderen op nieuwe berichten."
+msgstr "Geeft je een aantal manieren om u te attenderen op nieuwe berichten."
 
 #. *< type
 #. *< ui_requirement
@@ -18168,7 +18190,7 @@ msgstr "Geeft u een aantal manieren om u te attenderen op nieuwe berichten."
 #. *< id
 #: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin Demonstratieplugin"
+msgstr "Pidgin demonstratieplugin"
 
 #. *< name
 #. *< version
@@ -18188,7 +18210,7 @@ msgstr ""
 "Dit is een erg gave plugin die een hoop dingen doet:\n"
 "- Het vertelt je wie het programma geschreven heeft bij aanmelden\n"
 "- Het keert alle binnenkomende tekst om\n"
-"- Het stuurt direct een bericht naar mensen wanneer ze on-line komen"
+"- Het stuurt direct een bericht naar mensen wanneer ze online komen"
 
 #: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
@@ -18203,13 +18225,12 @@ msgid "Hyperlink Color"
 msgstr "Kleur van verwijzing"
 
 #: ../pidgin/plugins/pidginrc.c:54
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "Overeenkomsten aangeven"
+msgstr "Gemarkeerde bericht-kleur"
 
 #: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView horizontale scheiding"
 
 #: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
@@ -18243,7 +18264,7 @@ msgstr "GTK+ lettertype"
 
 #: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Text Shortcut Theme"
+msgstr "GTK+ snelkoppelingtekst-thema"
 
 #.
 #. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
@@ -18292,9 +18313,10 @@ msgstr "gtkrc-bestanden opnieuw inlezen"
 
 #: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Pidgin GTK+ Themabeheer"
+msgstr "Pidgin GTK+ themabeheer"
 
-#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
+#: ../pidgin/plugins/pidginrc.c:557
+#: ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Geeft toegang tot veelgebruikte gtkrc-instellingen"
 
@@ -18304,34 +18326,24 @@ msgstr "Direct"
 
 #: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-"Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
-"protocollen."
+msgstr "Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde protocollen."
 
 #: ../pidgin/plugins/raw.c:178
-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 ""
-"Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
-"protocollen (XMPP, MSN, IRC, TOC). Druk op 'Enter' om te sturen en houd het "
-"debugvenster in de gaten."
+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 "Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde protocollen (XMPP, MSN, IRC, TOC). Druk op 'Enter' om te sturen en houd het debugvenster in de gaten."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr ""
-"U maakt gebruik van %s versie %s. De huidige versie is echter %s. Je kan het "
-"krijgen van <a href=\"%s\">%s</a><hr>"
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "Je maakt gebruik van %s versie %s. De huidige versie is echter %s. Je kan het krijgen via <a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Veranderingen:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nieuwe versie beschikbaar"
 
@@ -18354,12 +18366,8 @@ msgstr "Controleert regelmatig of er een nieuwe versie beschikbaar is."
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Controleert regelmatig of er een nieuwe versie beschikbaar is en presenteert "
-"de veranderingen aan de gebruiker."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Controleert regelmatig of er een nieuwe versie beschikbaar is en presenteert de veranderingen aan de gebruiker."
 
 #. *< major version
 #. *< minor version
@@ -18371,86 +18379,83 @@ msgstr ""
 #. *< id
 #: ../pidgin/plugins/sendbutton.c:138
 msgid "Send Button"
-msgstr "Verzend knop"
+msgstr "Verzendknop"
 
 #. *< name
 #. *< version
 #: ../pidgin/plugins/sendbutton.c:140
 msgid "Conversation Window Send Button."
-msgstr "Gespreksvenser Verzend knop"
+msgstr "Gespreksvenser verzendknop"
 
 #. *< summary
 #: ../pidgin/plugins/sendbutton.c:141
-msgid ""
-"Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr ""
-"Voegt een Verzend knop toe bij de invoerruimte van het gespreksvenster. Dit "
-"is bedoeld wanneer er geen fysiek keyboard aanwezig is."
+msgid "Adds a Send button to the entry area of the conversation window. Intended for when no physical keyboard is present."
+msgstr "Voegt een verzendknop toe bij de invoerruimte van het gespreksvenster. Dit is bedoeld wanneer er geen fysiek keyboard aanwezig is."
 
-#: ../pidgin/plugins/spellchk.c:1970
+#: ../pidgin/plugins/spellchk.c:1971
 msgid "Duplicate Correction"
 msgstr "Dubbele correctie"
 
-#: ../pidgin/plugins/spellchk.c:1971
+#: ../pidgin/plugins/spellchk.c:1972
 msgid "The specified word already exists in the correction list."
 msgstr "Het aangegeven woord bestaat reeds in de correctielijst."
 
-#: ../pidgin/plugins/spellchk.c:2184
+#: ../pidgin/plugins/spellchk.c:2185
 msgid "Text Replacements"
 msgstr "Actieve tekstvervangingen"
 
-#: ../pidgin/plugins/spellchk.c:2207
+#: ../pidgin/plugins/spellchk.c:2208
 msgid "You type"
-msgstr "U tikt"
+msgstr "Je tikt"
 
-#: ../pidgin/plugins/spellchk.c:2221
+#: ../pidgin/plugins/spellchk.c:2222
 msgid "You send"
-msgstr "U stuurt"
+msgstr "Je stuurt"
 
-#: ../pidgin/plugins/spellchk.c:2235
+#: ../pidgin/plugins/spellchk.c:2236
 msgid "Whole words only"
 msgstr "Alleen hele woorden"
 
-#: ../pidgin/plugins/spellchk.c:2247
+#: ../pidgin/plugins/spellchk.c:2248
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: ../pidgin/plugins/spellchk.c:2273
+#: ../pidgin/plugins/spellchk.c:2274
 msgid "Add a new text replacement"
 msgstr "Nieuwe tekstvervanging toevoegen"
 
-#: ../pidgin/plugins/spellchk.c:2289
+#: ../pidgin/plugins/spellchk.c:2290
 msgid "You _type:"
-msgstr "U _tikt:"
+msgstr "Je _tikt:"
 
-#: ../pidgin/plugins/spellchk.c:2293
+#: ../pidgin/plugins/spellchk.c:2294
 msgid "You _send:"
-msgstr "U _stuurt:"
+msgstr "Je _stuurt:"
 
 #  Created here so it can be passed to whole_words_button_toggled.
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2296
+#: ../pidgin/plugins/spellchk.c:2297
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Hoofdlettergevoelig (uitzetten voor voor automatisch afhandelen)"
 
-#: ../pidgin/plugins/spellchk.c:2298
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "Only replace _whole words"
 msgstr "Alleen _hele woorden vervangen"
 
-#: ../pidgin/plugins/spellchk.c:2323
+#: ../pidgin/plugins/spellchk.c:2324
 msgid "General Text Replacement Options"
 msgstr "Instellingen voor tekstvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2324
+#: ../pidgin/plugins/spellchk.c:2325
 msgid "Enable replacement of last word on send"
 msgstr "Laatste woord vervangen bij versturen"
 
-#: ../pidgin/plugins/spellchk.c:2357
+#: ../pidgin/plugins/spellchk.c:2358
 msgid "Text replacement"
 msgstr "Tekstvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
+#: ../pidgin/plugins/spellchk.c:2360
+#: ../pidgin/plugins/spellchk.c:2361
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Vervangt tekst in uitgaande berichten volgens uw eigen regels."
 
@@ -18460,7 +18465,8 @@ msgstr "Vervangt tekst in uitgaande berichten volgens uw eigen regels."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Contacten-ticker"
 
@@ -18468,13 +18474,14 @@ msgstr "Contacten-ticker"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
+#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Een horizontale schuivende versie van de contactenlijst."
 
 #: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
-msgstr "Gesprekstijd Altijd Weergeven"
+msgstr "Gesprekstijd altijd weergeven"
 
 #. *< type
 #. *< ui_requirement
@@ -18557,12 +18564,8 @@ msgstr "Opmaak aanpassen van tijdsaanduiding."
 #  *  description
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Deze plugin geeft de gebruiker de mogelijkheid om de opmaak van de "
-"tijdsaanduiding aante passen."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Deze plugin geeft de gebruiker de mogelijkheid om de opmaak van de tijdsaanduiding aante passen."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
@@ -18573,7 +18576,7 @@ msgstr "Doorschijnendheid:"
 #. IM Convo trans options
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
-msgstr "IM Gespreksvensters"
+msgstr "IM gespreksvensters"
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
@@ -18625,13 +18628,11 @@ msgstr "Variabele doorschijnendheid voor de contactenlijst en gesprekken."
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 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 ""
-"Deze plugin zorgt voor variabele doorschijnendheid in gespreksvensters en de "
-"contactenlijst.\n"
+"Deze plugin zorgt voor variabele doorschijnendheid in gespreksvensters en de contactenlijst.\n"
 "\n"
 "* Opmerking: Deze plugin vereist Windows 2000 of nieuwer."
 
@@ -18677,8 +18678,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "Opties van Pidgin voor Windows."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "Specifieke Windows-opties voor Pidgin, zoals contactenlijst."
 
 #: ../pidgin/plugins/xmppconsole.c:670
@@ -18691,7 +18691,8 @@ msgstr "<font color='#777777'>Uitgelogd.</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:749
+#: ../pidgin/plugins/xmppconsole.c:844
 #: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP Console"
@@ -18728,27 +18729,55 @@ msgstr "Verstuur en ontvang ruwe XMPP stanza's."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 
-#~ msgid "_Resume"
-#~ msgstr "_Doorgaan"
-
+#, fuzzy
+#~ msgid "Error requesting login token"
+#~ msgstr "Fout bij maken verbinding"
+#~ msgid "Unable to login. Check debug log."
+#~ msgstr "Kan niet aanmelden. Controleer debuglogboek."
+#~ msgid "Unable to login"
+#~ msgstr "Aanmelden niet mogelijk"
+#~ msgid "TCP Address"
+#~ msgstr "TCP-adres"
+#~ msgid "UDP Address"
+#~ msgstr "UDP-adres"
+#~ msgid "Login failed, no reply"
+#~ msgstr "Aanmelden mislukt, geen reactie!"
+#~ msgid "Error setting socket options"
+#~ msgstr "Kan socket niet instellen"
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Windows Live ID identificatie: kan de identiteit niet vinden die in het "
+#~ "server-antwoord werd gegeven"
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Windows Live ID identificatie Mislukt"
+#~ msgid "Too evil (sender)"
+#~ msgstr "Te kwaadaardig (afzender)"
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Te kwaadaardig (ontvanger)"
+#~ msgid "Available Message"
+#~ msgstr "Beschikbaarheidsbericht"
+#~ msgid "Away Message"
+#~ msgstr "Afwezigheidsbericht"
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(ophalen)</i>"
+#~ msgid "Requesting %s's attention..."
+#~ msgstr "%s's aandacht vragen..."
+#~ msgid "%s has requested your attention!"
+#~ msgstr "%s vraagt om uw aandacht!"
+#~ msgid "Display Statistics"
+#~ msgstr "Statistieke weergeven"
 #~ msgid "Screen name:"
 #~ msgstr "Bijnaam:"
-
-#~ msgid "Screen Name"
-#~ msgstr "Gebruikersnaam"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Iemand zegt uw naam in chatgesprek"
-
 #~ msgid "Invalid screen name"
 #~ msgstr "Ongeldige gebruikersnaam"
-
 #~ msgid "Invalid screen name."
 #~ msgstr "Ongeldige gebruikersnaam."
-
 #~ msgid "Screen _name:"
 #~ msgstr "Bij_naam:"
-
 #~ msgid ""
 #~ "This server requires plaintext authentication over an unencrypted "
 #~ "connection.  Allow this and continue authentication?"
@@ -18759,7 +18788,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Use GSSAPI (Kerberos v5) for authentication"
 #~ msgstr "Gebruiker %d vereist autentificatie"
-
 #~ msgid ""
 #~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -18768,7 +18796,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "%s%s<span weight=\"bold\">Geschreven door:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
 #~ "<span weight=\"bold\">Bestandsnaam:</span>\\tt%s"
-
 #~ msgid ""
 #~ "The contact availability plugin (cap) is used to display statistical "
 #~ "information about buddies in a users contact list."
@@ -18780,17 +18807,14 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Contactalarm alleen wanneer mijn status niet beschikbaar is"
-
 #~ msgid "Current media"
 #~ msgstr "Huidige media"
-
 #~ msgid ""
 #~ "Sorry, passwords over %d characters in length (yours is %d) are not "
 #~ "supported by MySpace."
 #~ msgstr ""
 #~ "Sorry, wachtwoorden die groter zijn dan %d tekens (die van jou is %d "
 #~ "tekens lang) worden niet ondersteund door MySpace."
-
 #~ msgid ""
 #~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 #~ "username and choose a username and try to login again."
@@ -18798,25 +18822,18 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Ga alstublieft naar http://editprofile.myspace.com/index.cfm?"
 #~ "fuseaction=profile.username en kies een gebruikersnaam en probeer opnieuw "
 #~ "in te loggen"
-
 #~ msgid "Screen name sent"
 #~ msgstr "Bijnaam verzonden"
-
 #~ msgid "Screen name"
 #~ msgstr "Gebruikersnaam"
-
 #~ msgid "Use recent buddies group"
 #~ msgstr "Groep voor recente contacten gebruiken"
-
 #~ msgid "Show how long you have been idle"
 #~ msgstr "Geeft aan hoe lang u inactief bent"
-
 #~ msgid "Cannot find/access ~/.silc directory"
 #~ msgstr "kan de map ~/.silc niet benaderen"
-
 #~ msgid "_Merge"
 #~ msgstr "Sa_menvoegen"
-
 #~ 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 "
@@ -18827,20 +18844,16 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "zou willen toevoegen. U kunt ook een alias of bij bijnaam voor deze "
 #~ "persoon opgeven. Deze alias wordt dan gebruikt in plaats van de echte "
 #~ "naam (wanneer mogelijk).\n"
-
 #~ msgid "A_ccount:"
 #~ msgstr "A_ccount:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "Gebruiker is gestopt met typen"
-
 #~ msgid ""
 #~ "\n"
 #~ "%s has typed something and stopped"
 #~ msgstr ""
 #~ "\n"
 #~ "%s typte wat en is ermee gestopt"
-
 #~ msgid "S_mile!"
 #~ msgstr "L_achen!"
 
@@ -18863,25 +18876,18 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Fout opgetreden bij uitschakelen plugin."
-
 #~ msgid "Couldn't open file"
 #~ msgstr "Kan bestand niet openen"
-
 #~ msgid "Error initializing session"
 #~ msgstr "Fout bij initialiseren van sessie"
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Kan geen beveiligde verbinding (SSL) maken met de server."
-
 #~ msgid "Invalid chat name specified."
 #~ msgstr "Onjuiste chat-naam opgegeven."
-
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s heeft status veranderd van %s naar %s"
-
 #~ msgid "%s is now %s"
 #~ msgstr "%s is nu %s"
-
 #~ msgid "%s is no longer %s"
 #~ msgstr "%s is niet meer %s"
 
@@ -18891,14 +18897,11 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 
 #, fuzzy
 #~ msgid "Add Buddy _Pounce"
-#~ msgstr "Contact-alarm toevoegen"
-
+#~ msgstr "Contactalarm toevoegen"
 #~ msgid "Add a C_hat"
 #~ msgstr "_Chat toevoegen"
-
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "/Accounts/Toevoegen\\/Bewerken"
-
 #~ msgid "<span color=\"red\">%s disconnected: %s</span>"
 #~ msgstr "<span color=\"red\">%s heeft de verbinding verbroken: %s</span>"
 
@@ -18916,14 +18919,8 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "_Send To"
 #~ msgstr "_Verzenden aan"
-
-#, fuzzy
-#~ msgid "_Smiley"
-#~ msgstr "Lachen!"
-
 #~ msgid "Conversation History"
 #~ msgstr "Geschiedenis gesprek"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Logboek"
 
@@ -18934,118 +18931,90 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Unable to connect to OIM server"
 #~ msgstr "Kan geen verbinding maken met de server"
-
 #~ msgid ""
 #~ "\n"
 #~ "Idle: %s"
 #~ msgstr ""
 #~ "\n"
 #~ "Inactief: %s"
-
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "%s heeft de verbinding verbroken om de volgende reden:\n"
 #~ "%s"
-
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "Opdrachten worden nog niet ondersteund. Bericht NIET verzonden."
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
 #~ msgid "..."
 #~ msgstr "..."
-
 #~ msgid "Still need to do something about this."
 #~ msgstr "Hier moet nog wat aan gedaan worden."
-
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim - Expresberichten"
-
 #~ msgid "Alias..."
 #~ msgstr "Alias..."
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Gebruikersnaam:</b> %s"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Logged In:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Aangemeld:</b> %s"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Idle:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Inactief:</b> %s"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Off-line"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Description:</b> Spooky"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Beschrijving:</b> Spookachtig"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Zwaar flex"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Rockin'"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Rockin'"
-
 #~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/Extra/Contact-alarm"
-
+#~ msgstr "/Extra/Contactalarm"
 #~ msgid "/Options/Show Buddy _Icon"
 #~ msgstr "/Opties/Contact_plaatjes weergeven"
-
 #~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Opties/Contactplaatjes weergeven"
-
+#~ msgstr "/Opties/pictograms weergeven"
 #~ msgid "Timestamps"
 #~ msgstr "Tijd in gesprek"
-
 #~ msgid "Jabber developer"
 #~ msgstr "ontwikkelaar van Jabber"
-
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
-
 #~ msgid "Smaller font size"
 #~ msgstr "Kleinere letters"
-
 #~ msgid "Insert link"
 #~ msgstr "Verwijzing invoegen"
-
 #~ msgid "Insert image"
 #~ msgstr "Afbeelding invoegen"
-
 #~ msgid "Gaim %s. Try `%s -h' for more information.\n"
 #~ msgstr "Gaim %s. Probeer '%s -h' voor meer informatie.\n"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 #~ "\n"
@@ -19054,53 +19023,38 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "<span weight=\"bold\" size=\"larger\">U heeft email!</span>\n"
 #~ "\n"
 #~ "%s"
-
 #~ msgid "Send unknown \"_slash\" commands as messages"
 #~ msgstr "Onbekende \"_slash\"-opdrachten ( / ) als normaal bericht sturen"
-
 #~ msgid "Show buddy _icons"
 #~ msgstr "Contact_plaatjes weergeven"
-
 #~ msgid "Tab Options"
 #~ msgstr "Tab-opties"
-
 #~ msgid "_Sounds while away"
 #~ msgstr "Geluiden wanneer u _weg bent"
-
 #~ 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 ""
 #~ "U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als "
-#~ "contactplaatje gebruiken voor deze gebruiker."
-
+#~ "pictogram gebruiken voor deze gebruiker."
 #~ msgid "Error initializing libdbi."
 #~ msgstr "Fout bij initialiseren van libdbi."
-
 #~ msgid "Contact Availability Prediction Configuration"
 #~ msgstr "Configuratie van contactbeschikbaarheidsvoorspelling"
-
 #~ msgid "mysql"
 #~ msgstr "mysql"
-
 #~ msgid "Driver:"
 #~ msgstr "Driver:"
-
 #~ msgid "_Configure"
 #~ msgstr "_Instellen"
-
 #~ msgid "libdbi driver path:"
 #~ msgstr "libdbi pad:"
-
 #~ msgid "Host:"
 #~ msgstr "Host:"
-
 #~ msgid "Database:"
 #~ msgstr "Database:"
-
 #~ msgid "Port:"
 #~ msgstr "Poort:"
-
 #~ msgid "Crazychat"
 #~ msgstr "Crazychat"
 
@@ -19109,40 +19063,29 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #  *  summary
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Plugin om een crazychat sessie te starten."
-
 #  *  description
 #~ msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
 #~ msgstr ""
 #~ "Gebruikt gaim om IPs te verkrijgen van contacten om zo een "
 #~ "crazychatsessie te starten"
-
 #~ msgid "Network Configuration"
 #~ msgstr "Netwerkinstellingen"
-
 #~ msgid "TCP port"
 #~ msgstr "TCP-poort"
-
 #~ msgid "UDP port"
 #~ msgstr "UDP-poort"
-
 #~ msgid "Feature Calibration"
 #~ msgstr "Kalibreren"
-
 #~ msgid "Blink tray icon for unread..."
 #~ msgstr "Pictogram in mededelingengebied laten knipperen bij ongelezen..."
-
 #~ msgid "_Instant Messages:"
 #~ msgstr "_Expresberichten:"
-
 #~ msgid "C_hat Messages:"
 #~ msgstr "_Kanaalberichten:"
-
 #~ msgid "When my nick is said"
 #~ msgstr "Wanneer mijn bijnaam wordt gezegd"
-
 #~ msgid "Displays an icon for Gaim in the system tray."
 #~ msgstr "Geeft een pictogram voor Gaim weer in het mededelingengebied."
-
 #~ 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 "
@@ -19154,160 +19097,115 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "te geven tot veelgebruikte functies en om het hoofdvenster te verbergen "
 #~ "of juist weer te geven. Ook biedt het de mogelijkheid om inkomende "
 #~ "berichten te laten wachten totdat erop geklikt wordt."
-
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "Grootte van uitklappijltje"
-
 #~ msgid "GtkTreeView Indent Expanders"
 #~ msgstr "Grootte uitklappijltje"
-
 #~ msgid "Tools"
 #~ msgstr "Gereedschap"
-
 #~ msgid "The specified buddy was not found in the Evolution Contacts."
 #~ msgstr ""
 #~ "De contactpersoon kan niet gevonden worden in het Evolution adresboek."
-
 #~ msgid ""
 #~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
 #~ "\">http://gaim.sourceforge.net</a>."
 #~ msgstr ""
 #~ "U kunt versie %s ophalen op:<br><a href=\"http://gaim.sourceforge.net/ "
 #~ "\">http://gaim.sourceforge.net</a>."
-
 #~ msgid "Delay"
 #~ msgstr "Vertraging"
-
 #~ msgid "minutes."
 #~ msgstr "minuten."
-
 #~ msgid "WinGaim Options"
 #~ msgstr "WinGaim opties"
-
 #~ msgid "Group not removed"
 #~ msgstr "Groep niet verwijderd"
-
 #~ msgid "Old Gaim"
 #~ msgstr "Oude Gaim"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> %s"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Message:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Bericht:</b> %s"
-
 #~ msgid "Gaim User"
 #~ msgstr "Gaim gebruiker"
-
 #~ msgid "Jabber Account"
 #~ msgstr "Jabber-account"
-
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
-
 #~ msgid "<b>%s:</b> %s<br>"
 #~ msgstr "<b>%s:</b> %s<br>"
-
 #~ msgid "<b>Idle for:</b> %s<br>"
 #~ msgstr "<b>Inactief voor:</b> %s<br>"
-
 #~ msgid ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
 #~ "Server vereist TLS/SSL voor aanmelding. Selecteer \"TLS gebruiken indien "
 #~ "beschikbaar\" in de accounteigenschappen"
-
 #~ msgid "Server couldn't authenticate you without a password"
 #~ msgstr "Server kan u niet identificeren zonder wachtwoord"
-
 #~ msgid "Client:"
 #~ msgstr "Client:"
-
 #~ msgid "Search for Jabber users"
 #~ msgstr "Zoeken naar Jabbergebruikers"
-
 #~ msgid "Invalid Jabber ID"
 #~ msgstr "Ongeldige Jabber-ID"
-
 #~ msgid "Change Jabber Password"
 #~ msgstr "Jabber-wachtwoord veranderen"
-
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber-protocol plugin"
-
 #~ msgid "Use TLS if available"
 #~ msgstr "TLS gebruiken indien beschikbaar"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "De gebruiker %s wil %s toevoegen aan zijn/haar contactenlijst."
-
 #~ msgid "_Authorize"
 #~ msgstr "_Autoriseren"
-
 #~ msgid "_Deny"
 #~ msgstr "Ne_geer"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "U heeft zojuist een duwtje gestuurd!"
-
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<b>Alias:</b> %s<br>"
-
 #~ msgid "MSN Profile"
 #~ msgstr "MSN-profiel"
-
 #~ msgid "%s<b>General</b><br>%s"
 #~ msgstr "%s<b>Algemeen</b><br>%s"
-
 #~ msgid "%s<b>Social</b><br>%s"
 #~ msgstr "%s<b>Sociaal</b><br>%s"
-
 #~ msgid "<br><b>Personal</b><br>%s"
 #~ msgstr "<br><b>Persoonlijk</b><br>%s"
-
 #~ msgid "<br><b>Business</b><br>%s"
 #~ msgstr "<br><b>Zakelijk</b><br>%s"
-
 #~ msgid "<hr><b>Contact Info</b>%s%s"
 #~ msgstr "<hr><b>Contactinfo</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 "De gebruiker %s (%s) wil %s toevoegen aan zijn/haar contactenlijst."
-
 #~ msgid "Invalid password"
 #~ msgstr "Ongeldig wachtwoord"
-
 #~ msgid "Invalid username or password"
 #~ msgstr "Ongeldige gebruikersnaam of wachtwoord"
-
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "Verbinding verbroken: Reden onbekend."
-
 #~ msgid ""
 #~ "The user %s requires authorization before being added to a buddy list.  "
 #~ "Do you want to send an authorization request?"
 #~ msgstr ""
 #~ "U heeft toestemming nodig om %s toe te voegen aan uw contactenlijst. Wilt "
 #~ "u om toestemming vragen?"
-
 #~ msgid "Request Authorization"
 #~ msgstr "Toestemming vragen"
-
 #~ msgid "_Request Authorization"
 #~ msgstr "_Toestemming vragen"
-
 #~ msgid ""
 #~ "The user %u wants to add %s to their buddy list for the following "
 #~ "reason:\n"
@@ -19316,32 +19214,24 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %u wil %s toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
-
 #~ msgid "Authorization Request"
 #~ msgstr "Identificatie-aanvraag"
-
 #~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 #~ msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-
 #~ msgid "SNAC threw error: %s\n"
 #~ msgstr "SNAC threw fout: %s\n"
-
 #~ msgid "User information for %s unavailable:"
 #~ msgstr "Gebruikersinformatie voor %s niet beschikbaar:"
-
 #~ msgid "Rate limiting error."
 #~ msgstr "Snelheidsoverschrijding."
-
 #~ msgid "You have been signed off for an unknown reason."
 #~ msgstr "De verbinding is verbroken om een onbekende reden."
-
 #~ msgid ""
 #~ "Your screen name is currently formatted as follows:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Uw gebruikersnaam wordt op het moment als volgt weergegeven:\n"
 #~ "%s"
-
 #~ 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 "
@@ -19350,7 +19240,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Kon het contact %s niet toevoegen om onbekende redenen. De meest "
 #~ "voorkomende reden is dat het maximum aantal contacten in uw lijst is "
 #~ "bereikt."
-
 #~ msgid ""
 #~ "The user %s wants to add %s to their buddy list for the following "
 #~ "reason:\n"
@@ -19359,168 +19248,118 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %s wil %s toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
-
 #~ msgid "_Connect"
 #~ msgstr "_Verbinden"
-
 #~ msgid "New screen name formatting:"
 #~ msgstr "Opmaak van gebruikersnaam:"
-
 #~ msgid "Format Screen Name..."
 #~ msgstr "Gebruikersnaam opmaken..."
-
 #~ msgid "A"
 #~ msgstr "A"
-
 #~ msgid "B"
 #~ msgstr "B"
-
 #~ msgid "AB"
 #~ msgstr "AB"
-
 #~ msgid ""
 #~ "Find one Qun in the server list, but i don't know its external id, please "
 #~ "re-rejoin it manually"
 #~ msgstr ""
 #~ "Eén Qun gevonden in de lijst, maar kan geen extern ID vinden. Probeer het "
 #~ "eens met de hand"
-
 #~ msgid ""
 #~ "Invalid QQid, to add buddy 1234567, \n"
 #~ "you should input qq-1234567"
 #~ msgstr ""
 #~ "Ongeldig QQid. Om de gebruiker 1234567 toe te voegen\n"
 #~ "dient u qq-1234567 te gebruiken"
-
 #~ msgid "Admin: "
 #~ msgstr "Admin: "
-
 #~ msgid "Status: "
 #~ msgstr "Status:"
-
 #~ msgid "Are you sure to exit this Qun?"
 #~ msgstr "Wilt u echt deze Qun verlaten?"
-
 #~ msgid "Go ahead"
 #~ msgstr "Ga maar door"
-
 #~ msgid "Server ACK"
 #~ msgstr "Server ACK"
-
 #~ msgid "Send IM fail\n"
 #~ msgstr "Sturen van bericht mislukt\n"
-
 #~ msgid "Keep alive error, seems connection lost!"
 #~ msgstr "Fout bij in stand houden van verbinding!"
-
 #~ msgid "Request login token error!"
 #~ msgstr "Tekenfout bij aanmelden!"
-
 #~ msgid "Wrong password!"
 #~ msgstr "Wachtwoord onjuist!"
-
 #~ msgid "QQ: Available"
 #~ msgstr "QQ: Beschikbaar"
-
 #~ msgid "QQ: Away"
 #~ msgstr "QQ: Afwezig"
-
 #~ msgid "QQ: Invisible"
 #~ msgstr "QQ: Onzichtbaar"
-
 #~ msgid "QQ: Offline"
 #~ msgstr "QQ: Off-line "
-
 #~ msgid "Invalid name, please input in qq-xxxxxxxx format"
 #~ msgstr "Ongeldige naam. Gebruik de opmaak qq-xxxxxxx."
-
 #~ msgid "Faces"
 #~ msgstr "gezichten"
-
 #~ msgid "Change Your QQ Face"
 #~ msgstr "QQ-gezicht wijzigen"
-
 #~ msgid "Update"
 #~ msgstr "Bijwerken"
-
 #~ msgid "Modify My Information"
 #~ msgstr "Mijn informatie wijzigen"
-
 #~ msgid "Please wait for new version"
 #~ msgstr "Wacht op een niewe versie"
-
 #~ msgid "Login in TCP"
 #~ msgstr "Aanmelden met TCP"
-
 #~ msgid "Login Hidden"
 #~ msgstr "Verborgen aanmelden"
-
 #~ msgid "QQ Server"
 #~ msgstr "QQ Server"
-
 #~ msgid "QQ Port"
 #~ msgstr "QQ Poort"
-
 #~ msgid "Socket send error"
 #~ msgstr "Socket-zendfout"
-
 #~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
 #~ msgstr ""
 #~ "Uw verzoek om het bestand[%s] te sturen is geweigerd door de gebruiker[%d]"
-
 #~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
 #~ msgstr ""
 #~ "het oversturen van het bestand[%s] is afgebroken door de gebruiker[%d]"
-
 #~ msgid "User info is not updated"
 #~ msgstr "Gebruikerinformatie niet bijgewerkt"
-
 #~ msgid "Send packet"
 #~ msgstr "pakket sturen"
-
 #~ msgid "Packets lost, send again?"
 #~ msgstr "We zijn pakketten kwijt. Nogmaals sturen?"
-
 #~ msgid "Would like to add him?"
 #~ msgstr "Wilt u hem/haar toevoegen?"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Supports:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Ondersteunt:</b> %s"
-
 #~ msgid "<b>External User</b><br>"
 #~ msgstr "<b>Externe gebruiker</b><br>"
-
 #~ msgid "<b>User ID:</b> %s<br>"
 #~ msgstr "<b>GebruikersID:</b> %s<br>"
-
 #~ msgid "<b>Full Name:</b> %s<br>"
 #~ msgstr "<b>Volledige naam:</b> %s<br>"
-
 #~ msgid "<b>Supports:</b> %s<br>"
 #~ msgstr "<b>Ondersteunt:</b> %s<br>"
-
 #~ msgid "<b>Status:</b> %s"
 #~ msgstr "<b>Status:</b> %s"
-
 #~ msgid "Reject watching by other users"
 #~ msgstr "Anderen mogen u niet in de gaten houden"
-
 #~ msgid "Block invites"
 #~ msgstr "Uitnodigingen blokkeren"
-
 #~ msgid "Reject online status attribute requests"
-#~ msgstr "Opvragen van uw on-line status weigeren"
-
+#~ msgstr "Opvragen van uw online status weigeren"
 #~ msgid "Wrong Password"
 #~ msgstr "Wachtwoord onjuist"
-
 #~ msgid "TOC has sent a PAUSE command."
 #~ msgstr "TOC heeft een PAUSE-opdracht verstuurd."
-
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
 #~ "off if you send a message. Gaim will prevent anything from going through. "
@@ -19530,10 +19369,8 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "misschien van het netwerk geschopt. Gaim voorkomt deze situatie door geen "
 #~ "berichten door te geven. Dit is slechts een tijdelijke oplossing, wees "
 #~ "geduldig."
-
 #~ msgid "Gaim - Save As..."
 #~ msgstr "Gaim - Opslaan als..."
-
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
@@ -19544,55 +19381,38 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "wachtwoord onjuist is, of datYahoo! zijn aanmelding heeft veranderd. Gaim "
 #~ "zal nu proberen om via het Webmessenger-protocol aan te melden. Dit "
 #~ "resulteert wel in minder mogelijkheden en features."
-
 #~ msgid "Unable to read"
 #~ msgstr "Kan niet lezen"
-
 #~ msgid "<b>IP Address:</b> %s<br>"
 #~ msgstr "<b>IP-adres:</b> %s<br>"
-
 #~ msgid "<b>User:</b> %s<br>"
 #~ msgstr "<b>Gebruiker:</b> %s<br>"
-
 #~ msgid "g003: Error opening connection.\n"
 #~ msgstr "g003: Fout: Kan geen verbinding maken.\n"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Verbindingsfouten verbergen"
-
 #~ msgid "Hide Login Errors"
 #~ msgstr "Aanmeldfouten verbergen"
-
 #~ msgid "Hide Reconnecting Dialog"
 #~ msgstr "Fouten over de netwerkverbinding verbergen"
-
 #~ msgid "When you are kicked offline, this reconnects you."
 #~ msgstr "Wanneer je offline wordt geschopt, herstelt dit de verbinding."
-
 #~ msgid "Mail Server"
 #~ msgstr "Emailserver"
-
 #~ msgid "%s (%d new/%d total)"
 #~ msgstr "%s (%d nieuw/%d totaal)"
-
 #~ msgid "Check Mail"
 #~ msgstr "Email controleren"
-
 #~ msgid "Check email every X seconds.\n"
 #~ msgstr "Email iedere X seconden controleren.\n"
-
 #~ msgid "Buddy is offline:"
 #~ msgstr "Contact is off-line:"
-
 #~ msgid "Buddy is away:"
 #~ msgstr "Contact is weg:"
-
 #~ msgid "Buddy is idle:"
 #~ msgstr "Contact is inactief:"
-
 #~ msgid "Use last matching buddy"
 #~ msgstr "Laatst overeenkomend contact gebruiken"
-
 #~ msgid ""
 #~ "The buddy with the lowest score is the buddy who will have priority in "
 #~ "the contact.\n"
@@ -19604,25 +19424,18 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De standaardwaardes (off-line = -4, weg = -2, inactief = -1)\n"
 #~ "zullen de ingebouwde volgorde vervangen van actief -> inactief -> weg -> "
 #~ "weg+inactief -> off-line."
-
 #~ msgid "Point values to use for Account..."
 #~ msgstr "Puntentelling voor account..."
-
 #~ msgid "Gaim"
 #~ msgstr "Gaim"
-
 #~ msgid "Gaim - Signed off"
 #~ msgstr "Gaim - Afgemeld"
-
 #~ msgid "Gaim - Away"
 #~ msgstr "Gaim - Afwezig"
-
 #~ msgid "Auto-login"
 #~ msgstr "Auto-aanmelden"
-
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr "Nieuwe berichten _verbergen tot pictogram wordt aangeklikt"
-
 #~ 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 "
@@ -19634,58 +19447,43 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "te geven tot veelgebruikte functies en om het hoofdvenster te verbergen "
 #~ "of juist weer te geven. Ook biedt het de mogelijkheid om inkomende "
 #~ "berichten te laten wachten totdat erop geklikt wordt, net als in ICQ."
-
 #~ msgid "Not connected to AIM"
 #~ msgstr "Niet verbonden met AIM"
-
 #~ msgid "No screenname given."
 #~ msgstr "Geen bijnaam gegeven."
-
 #~ msgid "No roomname given."
 #~ msgstr "Geen ruimte gegeven."
-
 #~ msgid "Invalid AIM URI"
 #~ msgstr "Ongeldige AIM URI"
-
 #~ msgid ""
 #~ "Failed to assign %s to a socket:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Kan %s niet aan een \"socket\" binden:\n"
 #~ "%s"
-
 #~ msgid "Unable to open socket"
 #~ msgstr "Kan socket. niet openen"
-
 #~ msgid "Remote Control"
 #~ msgstr "Afstandbediening"
-
 #~ msgid "Provides remote control for gaim applications."
 #~ msgstr ""
 #~ "Geeft u de mogelijkheid om Gaim te besturen via een afstandbediening."
-
 #~ msgid ""
 #~ "Gives Gaim the ability to be remote-controlled through third-party "
 #~ "applications or through the gaim-remote tool."
 #~ msgstr ""
 #~ "Geeft u de mogelijkheid om Gaim te besturen via een afstandbediening van "
 #~ "derden of via gaim-remote."
-
 #~ msgid "Show user details"
 #~ msgstr "Gebruikerdetails weergeven"
-
 #~ msgid "Hide user details"
 #~ msgstr "Gebruikerdetails verbergen"
-
 #~ msgid "Provides integration with Ximian Evolution."
 #~ msgstr "Verzorgt de integratie met Ximian Evolution."
-
 #~ msgid "Screenname:"
 #~ msgstr "Gebruikersnaam:"
-
 #~ msgid "Allows you to hand-configure how long you've been idle for"
 #~ msgstr "Stelt u in staat om zelf de tijd van afwezigheid in te stellen"
-
 #~ msgid ""
 #~ "This plugin enables variable alpha transparency on conversation windows "
 #~ "and the buddy list.\n"
@@ -19696,16 +19494,12 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "de contactenlijst.\n"
 #~ "\n"
 #~ "* Opmerking: Deze plugin vereist Windows2000 of Windows XP."
-
 #~ msgid "Docked _Buddy List is always on top"
 #~ msgstr "Gekoppelde contactenlijst ligt altijd bovenop"
-
 #~ msgid "_Keep Buddy List window on top"
 #~ msgstr "Contactenlijst bovenop _houden"
-
 #~ msgid "_Flash Window when messages are received"
 #~ msgstr "Venster laten _knipperen wanneer berichten worden ontvangen"
-
 #~ msgid ""
 #~ "%d buddy from group %s was not removed because its account was not logged "
 #~ "in.  This buddy and the group were not removed.\n"
@@ -19718,7 +19512,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr[1] ""
 #~ "%d contacten uit de groep %s zijn niet verwijderd omdat deze niet "
 #~ "aangemeld zijn. Deze gebruikers en de groep zijn niet verwijderd.\n"
-
 #~ msgid ""
 #~ "An error was encountered parsing the file containing your buddy list (%"
 #~ "s).  It has not been loaded, and the old file has been renamed to blist."
@@ -19727,26 +19520,19 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Er is een error opgetreden tijdens het parsen van het bestand met uw "
 #~ "buddy lijst (%s). Het is niet geladen, en het oude bestand is hernoemd "
 #~ "naar blist.xml~."
-
 #~ msgid "Buddy List Error"
 #~ msgstr "Contactenlijst fout"
-
 #~ msgid "(+%d more)"
 #~ msgstr "(+%d meer)"
-
 #~ msgid " left the room (%s)."
 #~ msgstr " is weggegaan (%s)."
-
 #, fuzzy
 #~ msgid "Transfer of %s complete"
 #~ msgstr "Bestandsoverdracht naar %s volledig"
-
 #~ msgid "File transfer to %s aborted.\n"
 #~ msgstr "Bestandsoverdracht naar %s afgebroken.\n"
-
 #~ msgid "File transfer from %s aborted.\n"
 #~ msgstr "Bestandsoverdracht van %s afgebroken.\n"
-
 #~ msgid ""
 #~ "Usage: %s command [OPTIONS] [URI]\n"
 #~ "\n"
@@ -19786,21 +19572,18 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "       -f, --from=SCREENNAME Specificeer scherm-naam om te gebruiken\n"
 #~ "       -s, --session=SESSION Specificeer welke Gaim sessie te gebruiken\n"
 #~ "       -h, --help [opdracht] Geef hulp weer voor opdracht\n"
-
 #~ msgid ""
 #~ "Gaim not running (on session %d)\n"
 #~ "Is the \"Remote Control\" plugin loaded?\n"
 #~ msgstr ""
 #~ "Gaim is niet actief (in sessie %d)\n"
 #~ "Is de \"bediening op afstand\" plugin geladen?\n"
-
 #~ msgid ""
 #~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 #~ "greater than 9999 chars\n"
 #~ msgstr ""
 #~ "Onvoldoende argumenten (-t, -f, -p, & -m zijn allemaal vereist) of "
 #~ "argumenten langer dan 9999 karakters.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Using AIM: URIs:\n"
@@ -19844,28 +19627,24 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Een contact toevoegen aan de contactenlijst:\n"
 #~ "\tgaim-remote uri 'aim:addbuddy?screenname=Pinguin'\n"
 #~ "...zal Pinguin toevoegen aan de contactenlijst.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Log out all accounts\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Log uit alle accounts\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Close running copy of Gaim\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Actieve Gaim sluiten\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Mark all accounts as \"away\" with the default message.\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Markeer alle accounts als \"afwezig\" met het standaard bericht.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Set all accounts as not away.\n"
@@ -19880,19 +19659,14 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "\n"
 #~ "Een bericht ver_sturen\n"
-
 #~ msgid "Screen Name:"
 #~ msgstr "Gebruikersnaam:"
-
 #~ msgid "Show more options"
 #~ msgstr "Meer opties"
-
 #~ msgid "Show fewer options"
 #~ msgstr "Minder opties"
-
 #~ msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 #~ msgstr "%s%s%s%s heeft %s in zijn/haar contactenlijst gezet%s%s%s"
-
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -19901,72 +19675,56 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "\n"
 #~ "\n"
 #~ "Wilt u hem of haar toevoegen aan uw contactenlijst?"
-
 #~ msgid "_Alias Buddy..."
 #~ msgstr "_Alias voor contact..."
-
 #~ msgid "Alias Contact..."
 #~ msgstr "Alias voor contactgroep..."
 
 #, fuzzy
 #~ msgid "/Buddies/_Log Out"
 #~ msgstr "/Contacten/_Afsluiten"
-
 #~ msgid "/Tools/Buddy _Pounce"
-#~ msgstr "/Extra/_Contact-alarm"
-
+#~ msgstr "/Extra/_Contactalarm"
 #~ msgid "/Tools/Account Ac_tions"
 #~ msgstr "/Extra/Account-acties"
-
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/Extra/Plugin-acties"
-
 #~ msgid "/Tools/A_ccounts"
 #~ msgstr "/Extra/Acco_unts"
-
 #~ msgid "/Tools/View System _Log"
 #~ msgstr "/Extra/_Systeemlogboek"
-
 #~ msgid "Rename Group"
 #~ msgstr "Groep hernoemen"
-
 #~ msgid "New group name"
 #~ msgstr "Nieuwe groepsnaam"
-
 #~ msgid "Please enter a new name for the selected group."
 #~ msgstr "Geef alstublieft de nieuwe naam voor deze groep."
-
 #~ msgid "%d%%"
 #~ msgstr "%d%%"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Account:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Account:</b>"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Contact Alias:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Alias van contact:</b>"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Alias:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Alias:</b>"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Logged In:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Aangemeld:</b>"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Idle:</b>"
@@ -19981,45 +19739,34 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Afwezig:</b>"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status</b>: Awesome"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Zwaar flex"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status</b>: Rockin'"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Rockin'"
-
 #~ msgid "Idle (%dh%02dm) "
 #~ msgstr "Afwezig (%dh%02dm) "
-
 #~ msgid "Idle (%dm) "
 #~ msgstr "Afwezig (%dm) "
-
 #~ msgid "Warned (%d%%) "
 #~ msgstr "Gewaarschuwd (%d%%) "
-
 #~ msgid "/Buddies/Log Out"
 #~ msgstr "Vrienden/Log uit"
-
 #~ msgid "Alphabetical"
 #~ msgstr "Alfabetisch"
-
 #~ msgid "/Tools/Buddy Pounce"
-#~ msgstr "/Extra/Contact-alarm"
-
+#~ msgstr "/Extra/Contactalarm"
 #~ msgid "/Tools/Account Actions"
 #~ msgstr "/Extra/Account acties"
-
 #~ msgid "/Tools/Plugin Actions"
 #~ msgstr "/Extra/Plugin-acties"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
 #~ "\n"
@@ -20031,75 +19778,55 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "\n"
 #~ "%s\n"
 #~ "%s"
-
 #~ msgid "Reason Unknown."
 #~ msgstr "Reden onbekend."
 
 #, fuzzy
 #~ msgid "Disconnected"
 #~ msgstr "Verbinding verbroken"
-
 #~ msgid "Reconnect _All"
 #~ msgstr "_Alle verbindingen herstellen"
-
 #~ msgid "me is using Gaim v%s."
 #~ msgstr "Ik gebruik Gaim v%s."
-
 #~ msgid "That command only works in Chats, not IMs."
 #~ msgstr "Die opdracht werkt alleen in chats, niet in gewone gesprekken."
-
 #~ msgid "That command only works in IMs, not Chats."
 #~ msgstr "Die opdracht werkt alleen in gewone gesprekken, niet in chats."
 
 #, fuzzy
 #~ msgid "That buddy is not on the same protocol as this chat"
 #~ msgstr "Deze vriend werkt niet met hetzelfde protocol als deze chat"
-
 #~ msgid "User has typed something and paused"
 #~ msgstr "Gebruiker is gestopt met typen"
-
 #~ msgid "_Send As"
 #~ msgstr "_Verzenden als"
-
 #~ msgid "/Conversation/Clear"
 #~ msgstr "/Gesprek/_Opschonen"
-
 #~ msgid "/Conversation/_Warn..."
 #~ msgstr "/Gesprek/_Waarschuwen..."
-
 #~ msgid "/Conversation/A_lias..."
 #~ msgid_plural ""
 #~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%s)."
 #~ msgstr[0] "/Gesprek/A_lias..."
 #~ msgstr[1] ""
-
 #~ msgid "/Options/Show T_imestamps"
 #~ msgstr "/Opties/Berichttijd _weergeven"
-
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Gesprek/Waarschuwen..."
-
 #~ msgid "<main>/Conversation/Close"
 #~ msgstr "<main>/Gesprek/Sluiten"
-
 #~ msgid "former libfaim maintainer"
 #~ msgstr "ex-beheerder van libfaim"
-
 #~ msgid "former lead developer"
 #~ msgstr "ex-hoofdontwikkelaar"
-
 #~ msgid "former maintainer"
 #~ msgstr "ex-beheerder"
-
 #~ msgid "former Jabber developer"
 #~ msgstr "ex-ontwikkelaar van Jabber"
-
 #~ msgid "Dutch; Flemish"
 #~ msgstr "Nederlands; Vlaams"
-
 #~ msgid "Chinese"
 #~ msgstr "Chinees"
-
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 #~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
@@ -20110,31 +19837,24 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Groupwise, Napster, "
 #~ "Zephyr en GaduGadu en dat allemaal tegelijk! Het is geschreven m.b.v. Gtk"
 #~ "+ en wordt verspreid onder een GPL-licentie.<BR><BR>"
-
 #~ msgid "Active Developers"
 #~ msgstr "Huidige ontwikkelaars"
-
 #~ msgid "_Screen name"
 #~ msgstr "_Gebruikersnaam"
-
 #~ msgid "Please enter the screen name of the person you would like to IM."
 #~ msgstr ""
 #~ "Geef alstublieft de gebruikersnaam van de persoon aan wie u een bericht "
 #~ "zou willen sturen."
-
 #~ msgid "Get User Log"
 #~ msgstr "Gebruikerslogboek opvragen"
-
 #~ msgid ""
 #~ "Please enter the screen name of the person whose log you would like to "
 #~ "view."
 #~ msgstr ""
 #~ "Geef alstublieft de gebruikersnaam van de persoon waarvan u het logboek "
 #~ "wilt opvragen."
-
 #~ msgid "Warn User"
 #~ msgstr "Gebruiker waarschuwen"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
 #~ "\n"
@@ -20145,54 +19865,40 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "\n"
 #~ "Dit zal %s zijn/haar waarschuwingsniveau verhogen en strengere regels "
 #~ "zullen worden toegepast.\n"
-
 #~ msgid "Warn _anonymously?"
 #~ msgstr "_Anoniem waarschuwen?"
-
 #~ msgid "<b>Anonymous warnings are less severe.</b>"
 #~ msgstr "<b>Anonieme waarschuwingen zijn minder erg.</b>"
-
 #~ msgid "_Keep the dialog open"
 #~ msgstr "Dialoogvenster open _houden"
-
 #~ msgid "_Clear finished transfers"
 #~ msgstr "Verwerkte overdrachten uit lijst _verwijderen"
-
 #~ msgid "Show transfer details"
 #~ msgstr "Details weergeven"
-
 #~ msgid "Hide transfer details"
 #~ msgstr "Details verbergen"
-
 #~ msgid "Expander Size"
 #~ msgstr "Uitklapgrootte"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Grootte van de uitklappijl"
-
 #~ msgid "Pa_ste As Text"
 #~ msgstr "_Plakken als tekst"
-
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
 #~ msgstr ""
 #~ "Gaim kon het type afbeelding niet bepalen aan de hand van het "
 #~ "achtervoegsel. PNG wordt geprobeerd."
-
 #~ msgid "Error saving image: %s"
 #~ msgstr "Fout bij opslaan afbeelding: %s"
 
 #, fuzzy
 #~ msgid "Unable to load preferences"
 #~ msgstr "Kan socket. niet openen"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">Van:</span> %s\n"
-
 #~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">Onderwerp:</span> %s\n"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 #~ "\n"
@@ -20209,155 +19915,110 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Error launching <b>%s</b>: %s"
 #~ msgstr "Fout bij starten van \"%s\": %s"
-
 #~ msgid "Pounce When"
-#~ msgstr "Wanneer Alarmeren"
+#~ msgstr "Wanneer alarmeren"
 
 #, fuzzy
 #~ msgid "Si_gn on"
 #~ msgstr "_Aanmelden"
-
 #~ msgid "Sign _off"
 #~ msgstr "Af_melden"
-
 #~ msgid "A_way"
 #~ msgstr "_Afwezig"
 
 #, fuzzy
 #~ msgid "_Return from away"
 #~ msgstr "_Terugkeren van afwezigheid"
-
 #~ msgid "_Idle"
 #~ msgstr "_Inactief"
-
 #~ msgid "Retur_n from idle"
 #~ msgstr "Terugkeren _van inactief"
-
 #~ msgid "Buddy starts _typing"
 #~ msgstr "Contact start met _tikken"
-
 #~ msgid "Buddy stops t_yping"
 #~ msgstr "Contact _stopt met tikken"
-
 #~ msgid "Pounce Action"
 #~ msgstr "Alarm Actie"
-
 #~ msgid "Op_en an IM window"
 #~ msgstr "Be_richtvenster openen"
-
 #~ msgid "B_rowse..."
 #~ msgstr "Bl_aderen..."
-
 #~ msgid "Bro_wse..."
 #~ msgstr "Bl_aderen..."
-
 #~ msgid "Sav_e this pounce after activation"
 #~ msgstr "Dit alarm _opslaan na activatie"
-
 #~ msgid "Remove Buddy Pounce"
-#~ msgstr "Contact-alarm verwijderen"
-
+#~ msgstr "Contactalarm verwijderen"
 #~ msgid "Display"
 #~ msgstr "Weergave"
-
 #~ msgid "_Highlight misspelled words"
 #~ msgstr "Verkeerd gespelde woorden _oplichten"
-
 #~ msgid "Ignore font _faces"
 #~ msgstr "Lettertype ne_geren"
-
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "Opmaak _meesturen met uitgaande berichten"
-
 #~ msgid "_Clear Formatting"
 #~ msgstr "Opmaak _verwijderen"
-
 #~ msgid "Window Closing"
 #~ msgstr "Sluiten van venster"
-
 #~ msgid "_Escape closes window"
 #~ msgstr "_Escape sluit het venster"
-
 #~ msgid "Buddy List Sorting"
 #~ msgstr "Sorteren van contactenlijst"
-
 #~ msgid "Buddy Display"
 #~ msgstr "Contactenlijst"
-
 #~ msgid "Show more buddy details"
 #~ msgstr "Laat meer contact details zien"
-
 #~ msgid "Tab p_lacement:"
 #~ msgstr "Tabblad_plaatsing:"
-
 #~ msgid "New conversation _placement:"
 #~ msgstr "Plaatsing van nieuwe _gesprekken:"
-
 #~ msgid "_Autodetect IP Address"
 #~ msgstr "IP-adres _opzoeken"
-
 #~ msgid "_Start Port:"
 #~ msgstr "_Beginpoort:"
-
 #~ msgid "_End Port:"
 #~ msgstr "_Eindpoort:"
-
 #~ msgid "Gnome Default"
 #~ msgstr "GNOME standaard"
-
 #~ msgid "Message Logs"
 #~ msgstr "Gesprek-logboek"
-
 #~ msgid "Log _Format:"
 #~ msgstr "Logboekop_maak:"
-
 #~ msgid "_Log all instant messages"
 #~ msgstr "Alle gesprekken _opslaan"
-
 #~ msgid "System Logs"
 #~ msgstr "Systeemlogboeken"
-
 #~ msgid "_Enable system log"
 #~ msgstr "Systeemlogboek bijhouden"
 
 #, fuzzy
 #~ msgid "Log when buddies log in/log _out"
 #~ msgstr "Bijhouden wanneer contacten zich aan- of a_fmelden"
-
 #~ msgid "Log when buddies become _idle/un-idle"
 #~ msgstr "Bijhouden wanneer contacten (in)_actief zijn"
-
 #~ msgid "Log when buddies go away/come _back"
 #~ msgstr "Bijhouden wanneer contacten aan- of af_wezig zijn"
-
 #~ msgid "Log your own _signons/idleness/awayness"
 #~ msgstr "_Eigen aanmelding/inactiviteit/afwezigheid bijhouden"
-
 #~ msgid "_Queue new messages when away"
 #~ msgstr "Berichten in de _wachtrij zetten tijdens afwezigheid"
 
 #, fuzzy
 #~ msgid "When away and idle"
 #~ msgstr "Status op afwezig zetten _wanneer ik niets doe"
-
 #~ msgid "Idle _time reporting:"
 #~ msgstr "Afwezigheid _berekenen:"
-
 #~ msgid "Gaim usage"
 #~ msgstr "Gebruik van gaim"
-
 #~ msgid "X usage"
 #~ msgstr "Gebruik grafische omgeving (X)"
-
 #~ msgid "Windows usage"
 #~ msgstr "Gebruik grafische omgeving (Windows)"
-
 #~ msgid "Set away _when idle"
 #~ msgstr "Status op afwezig zetten _wanneer ik niets doe"
-
 #~ msgid "Away m_essage:"
 #~ msgstr "Afwezigheids_bericht:"
-
 #~ msgid ""
 #~ "<span size=\"larger\">%s %s</span>\n"
 #~ "\n"
@@ -20370,7 +20031,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "<span weight=\"bold\">Geschreven door:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t%s\n"
 #~ "<span weight=\"bold\">Bestandsnaam:</span>\t%s"
-
 #~ msgid ""
 #~ "<span size=\"larger\">%s %s</span>\n"
 #~ "\n"
@@ -20383,183 +20043,130 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "<span weight=\"bold\">Geschreven door:</span>  %s\n"
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">Bestandsnaam:</span>  %s"
-
 #~ msgid "Load"
 #~ msgstr "Laden"
-
 #~ msgid "Summary"
 #~ msgstr "Samenvatting"
-
 #~ msgid "Details"
 #~ msgstr "Details"
-
 #~ msgid "Message Text"
 #~ msgstr "Berichttekst"
-
 #~ msgid "Permit"
 #~ msgstr "Toestaan"
-
 #~ msgid "Hidden"
 #~ msgstr "Onzichtbaar"
-
 #~ msgid "_Warn"
 #~ msgstr "_Waarschuwen"
-
 #~ msgid "Slightly less boring default"
 #~ msgstr "Iets minder saaie standaardtekst"
-
 #~ msgid "Available for friends only"
 #~ msgstr "Alleen beschikbaar voor vrienden"
-
 #~ msgid "Away for friends only"
 #~ msgstr "Alleen afwezig voor vrienden"
-
 #~ msgid "Invisible for friends only"
 #~ msgstr "Alleen onzichtbaar voor vrienden"
-
 #~ msgid "Unable to resolve hostname."
 #~ msgstr "Kan computernaam niet opzoeken."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "Fout opgetreden bij schrijven naar socket."
-
 #~ msgid "Authentication failed."
 #~ msgstr "Identificatie mislukt."
-
 #~ msgid "Unknown Error Code."
 #~ msgstr "Onbekende Foutcode."
-
 #~ msgid "Status: %s"
 #~ msgstr "Status: %s"
-
 #~ msgid "Balancer handshake"
 #~ msgstr "Balancer handshake"
-
 #~ msgid "Reading server key"
 #~ msgstr "Serversleutel wordt gelezen"
-
 #~ msgid "Exchanging key hash"
 #~ msgstr "Sleutelhash wordt uitgewisseld"
-
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Kritieke fout in GaduGadu bibliotheek\n"
-
 #~ msgid "Unable to ping server"
 #~ msgstr "Kan server niet pingen"
-
 #~ msgid "Send as message"
 #~ msgstr "Verstuur als bericht"
-
 #~ msgid "Looking up GG server"
 #~ msgstr "GG-server wordt opgezocht"
-
 #~ msgid "Invalid Gadu-Gadu UIN specified"
 #~ msgstr "Onjuiste Gadu-Gadu UIN opgegeven"
-
 #~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 #~ msgstr "U probeert een bericht te verzenden naar een ongeldig GaduGadu UIN."
-
 #~ msgid "Couldn't get search results"
 #~ msgstr "Geen zoekresultaten gevonden"
-
 #~ msgid "Gadu-Gadu Search Engine"
 #~ msgstr "Gadu-Gadu Zoekmachine"
-
 #~ msgid "Active"
 #~ msgstr "Actief"
-
 #~ msgid "Sex"
 #~ msgstr "Geslacht"
-
 #~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
 #~ msgstr "Er is geen contactenlijst opgeslagen op de GaduGadu-server."
-
 #~ msgid "Couldn't Import Buddy List from Server"
 #~ msgstr "Kon de contactenlijst niet importeren van de server"
-
 #~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
 #~ msgstr "Contactenlijst is naar de GaduGadu-server gestuurd"
-
 #~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 #~ msgstr "Kon de contactenlijst niet versturen naar de GaduGadu-server"
-
 #~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
 #~ msgstr "Contactenlijst is verwijderd van de GaduGadu-server"
-
 #~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 #~ msgstr "Kon de contactenlijst niet verwijderen van de GaduGadu-server"
-
 #~ msgid "Password changed successfully"
 #~ msgstr "Wachtwoord veranderen gelukt"
-
 #~ msgid "Password couldn't be changed"
 #~ msgstr "Wachtwoord kon niet veranderd worden"
-
 #~ msgid "Error communicating with Gadu-Gadu server"
 #~ msgstr "Fout opgetreden bij communicatie met de GaduGadu-server"
-
 #~ msgid ""
 #~ "Gaim was unable to complete your request due to a problem communicating "
 #~ "with the Gadu-Gadu HTTP server.  Please try again later."
 #~ msgstr ""
 #~ "Gaim kon niet aan uw verzoek voldoen wegens een communicatieprobleem met "
 #~ "de GaduGadu HTTP-server. Probeert u het later nogmaals."
-
 #~ msgid "Unable to import Gadu-Gadu buddy list"
 #~ msgstr "Kon de GaduGadu contactenlijst niet importeren"
-
 #~ msgid ""
 #~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
 #~ "try again later."
 #~ msgstr ""
 #~ "Gaim kon geen verbinding maken met de GaduGadu contactenlijst-server. "
 #~ "Probeert u het later nogmaals."
-
 #~ msgid ""
 #~ "Gaim was unable to connect to the buddy list server.  Please try again "
 #~ "later."
 #~ msgstr ""
 #~ "Gaim kon geen verbinding maken met de contactenlijst-server. Probeert u "
 #~ "het later nogmaals."
-
 #~ msgid "Unable to delete Gadu-Gadu buddy list"
 #~ msgstr "Kan de GaduGadu contactenlijst niet verwijderen"
-
 #~ msgid "Unable to access directory"
 #~ msgstr "Kan adresboek niet benaderen"
-
 #~ msgid ""
 #~ "Gaim was unable to search the Directory because it was unable to connect "
 #~ "to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Gaim kon niet zoeken in het adresboek omdat de adresboek-server "
 #~ "onbereikbaar is. Probeert u het later nogmaals."
-
 #~ msgid "Unable to change Gadu-Gadu password"
 #~ msgstr "Kon GaduGadu-wachtwoord niet veranderen"
-
 #~ msgid ""
 #~ "Gaim was unable to change your password due to an error connecting to the "
 #~ "Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "Gaim kon uw wachtwoord niet veranderen wegens een communicatieprobleem "
 #~ "met de GaduGadu-server. Probeert u het later nogmaals."
-
 #~ msgid "Directory Search"
 #~ msgstr "Adresboek doorzoeken"
-
 #~ msgid "Import Buddy List from Server"
 #~ msgstr "Contactenlijst importeren van server"
-
 #~ msgid "Export Buddy List to Server"
 #~ msgstr "Contactenlijst exporteren naar server"
-
 #~ msgid "Delete Buddy List from Server"
 #~ msgstr "Contactenlijst verwijderen van server"
-
 #~ msgid "Unable to access user profile."
 #~ msgstr "Kan het gebruikersprofiel niet benaderen."
-
 #~ msgid ""
 #~ "Gaim was unable to access this user's profile due to an error connecting "
 #~ "to the directory server.  Please try again later."
@@ -20567,148 +20174,107 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Gaim kon het gebruikersprofiel niet benaderen wegens een "
 #~ "communicatieprobleem met de adresboek-server. Probeert u het later "
 #~ "nogmaals."
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "Bestandsoverdracht afgebroken"
 
 #, fuzzy
 #~ msgid "Logging in: %s"
 #~ msgstr "Aanmelden"
-
 #~ msgid "Realname"
 #~ msgstr "Echte naam"
-
 #~ msgid "Buddy Information for %s"
 #~ msgstr "Contact-info voor %s"
-
 #~ msgid ""
 #~ "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a "
 #~ "channel or user mode."
 #~ msgstr ""
 #~ "mode &lt;bijnaam|ruimte&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Kanaal- / "
 #~ "gebruikersmodus aan of uitschakelen."
-
 #~ msgid "Server requires SSL for login"
 #~ msgstr "Server vereist SSL voor aanmelding"
-
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber ID"
-
 #~ msgid "Jabber Profile"
 #~ msgstr "Jabber profiel"
-
 #~ msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 #~ msgstr ""
 #~ "invite &lt;bijnaam&gt; [ruimte]:  Een gebruiker uitnodigen in een ruimte."
-
 #~ msgid "Hide Operating System"
 #~ msgstr "Besturingssysteem verbergen"
-
 #~ msgid "Force old SSL"
 #~ msgstr "Oude SSL forceren"
-
 #~ msgid "The user %s wants to add you to their buddy list."
 #~ msgstr "De gebruiker %s wil u toevoegen aan zijn/haar contactenlijst."
-
 #~ msgid "Miscellaneous error"
 #~ msgstr "Onebeknde fout"
-
 #~ msgid "Tried to add a contact to a group that doesn't exist"
 #~ msgstr "Probeerde een contact aan een niet bestaande groep toe te voegen"
-
 #~ msgid "Set Friendly Name"
 #~ msgstr "Bijnaam instellen"
-
 #~ msgid "Enable/Disable Mobile Devices"
 #~ msgstr "Mobiele apparaten inschakelen/uitschakelen"
-
 #~ msgid "Allow/Disallow Mobile Pages"
 #~ msgstr "MSN-mobile pagina's toestaan/weigeren"
-
 #~ msgid "Initiate Chat"
 #~ msgstr "Chat starten"
-
 #~ msgid "Display conversation closed notices"
 #~ msgstr "Berichten over sluiting van gesprek weergeven"
-
 #~ msgid "Display timeout notices"
 #~ msgstr "Berichten over timeouts weergeven"
-
 #~ msgid "Login server"
 #~ msgstr "Aanmeldserver"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr "Onbekende fout opgetreden bij aanmeldpoging op MSN-server."
-
 #~ msgid "Requesting to send password"
 #~ msgstr "Wachtwoord-toestemming aangevraagd"
-
 #~ msgid ""
 #~ "Your MSN buddy list for %s is temporarily unavailable. Please wait and "
 #~ "try again."
 #~ msgstr ""
 #~ "Uw MSN vriendenlijst voor %s is tijdelijk niet beschikbaar. Probeer het "
 #~ "later nog eens."
-
 #~ msgid "Error writing to %s server"
 #~ msgstr "Fout bij schrijven naar %s-server"
-
 #~ msgid "Error reading from %s server"
 #~ msgstr "Fout bij inlezen van %s server"
-
 #~ msgid "Unknown error from %s server"
 #~ msgstr "Onbekende fout van %s-server"
-
 #~ msgid "Received HTTP error. Please report this."
 #~ msgstr "HTTP-fout ontvangen. Dit kunt u het beste rapporteren."
-
 #~ msgid "The conversation has become inactive and timed out."
 #~ msgstr "Het gesprek is niet meer actief en gemarkeerd als verlopen."
-
 #~ msgid ""
 #~ "You were disconnected from the server, because you logged on from a "
 #~ "different location"
 #~ msgstr ""
 #~ "De verbinding is verbroken. U heeft uzelf aangemeld vanaf een andere "
 #~ "locatie."
-
 #~ msgid "User Properties"
 #~ msgstr "Gebruikerseigenschappen"
-
 #~ msgid "Error processing event or response (%s)."
 #~ msgstr "Fout bij verwerken van gebeurtenis / reactie (%s)."
-
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "Directe verbinding met %s afgesloten"
-
 #~ msgid "Direct IM with %s failed"
 #~ msgstr "Directe verbinding met %s mislukt"
-
 #~ msgid "Direct Connect failed"
 #~ msgstr "Directe verbinding mislukt"
-
 #~ msgid "Direct IM with %s established"
 #~ msgstr "Direkte verbinding met %s hersteld"
-
 #~ msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 #~ msgstr "Verbinding maken met %s om %s:%hu voor directe verbinding."
-
 #~ msgid "Unable to open Direct IM"
 #~ msgstr "Kan geen directe verbinding openen"
-
 #~ msgid ""
 #~ "Because this reveals your IP address, it may be considered a privacy "
 #~ "risk.  Do you wish to continue?"
 #~ msgstr ""
 #~ "Omdat dit uw IP-adres zichtbaar maakt voor de andere partij, kan het "
 #~ "worden gezien als inbreuk op uw privacy. Wilt u doorgaan?"
-
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "Chatruimte is momenteel niet bereikbaar."
-
 #~ msgid "Unable to establish listener socket."
 #~ msgstr "Kan geen luistersocket aanmaken."
-
 #~ msgid ""
 #~ "The user %u wants to add you to their buddy list for the following "
 #~ "reason:\n"
@@ -20717,44 +20283,36 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %u wil u toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
-
 #~ msgid ""
 #~ "You have been disconnected because you have signed on with this screen "
 #~ "name at another location."
 #~ msgstr ""
 #~ "De verbinding is verbroken. U heeft uzelf aangemeld met dit account vanaf "
 #~ "een andere locatie."
-
 #~ msgid "ICQ Info for %s"
 #~ msgstr "ICQ info voor %s"
-
 #~ msgid "The following screen names are associated with %s"
 #~ msgstr "De volgende gebruikersnamen zijn geassocieerd met %s"
-
 #~ msgid ""
 #~ "Error 0x%04x: Unable to format screen name because the requested screen "
 #~ "name ends in a space."
 #~ msgstr ""
 #~ "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde "
 #~ "gebruikersnaam eindigt op een spatie."
-
 #~ msgid ""
 #~ "Error 0x%04x: Unable to change email address because there is already a "
 #~ "request pending for this screen name."
 #~ msgstr ""
 #~ "Fout 0x%04x: Kan email adres niet veranderen omdat het adres al is "
 #~ "aangevraagd door een ander."
-
 #~ msgid ""
 #~ "Error 0x%04x: Unable to change email address because the given address "
 #~ "has too many screen names associated with it."
 #~ msgstr ""
 #~ "Fout 0x%04x: Kan email adres niet veranderen omdat het adres reeds te "
 #~ "veel gebruikersnamen toegewezen heeft gekregen."
-
 #~ msgid "Unable to set AIM away message."
 #~ msgstr "Kan geen AIM afwezigheidsbericht instellen."
-
 #~ msgid ""
 #~ "You have probably requested to set your away message before the login "
 #~ "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -20763,7 +20321,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "U heeft waarschijnlijk uw afwezigheidsbericht aangepast voordat u "
 #~ "volledig aangemeld was. Uw afwezigheidsbericht is niet ingesteld. "
 #~ "Probeert u het nogmaals wanneer u volledig aangemeld bent."
-
 #~ msgid ""
 #~ "The user %s wants to add you to their buddy list for the following "
 #~ "reason:\n"
@@ -20772,22 +20329,16 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %s wil u toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
-
 #~ msgid "Display Currently Registered Address"
 #~ msgstr "Huidige geregistreerde adres weergeven"
-
 #~ msgid "Change Currently Registered Address..."
 #~ msgstr "Huidige geregistreerde adres veranderen..."
-
 #~ msgid "Search for Buddy by Email..."
 #~ msgstr "Contact zoeken door middel van email..."
-
 #~ msgid "Auth host"
 #~ msgstr "Host authoriseren"
-
 #~ msgid "Auth port"
 #~ msgstr "Auth-poort"
-
 #~ msgid "More..."
 #~ msgstr "Meer..."
 
@@ -20810,98 +20361,72 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Digitally sign all channel messages"
 #~ msgstr "Alle gesprekken _opslaan"
-
 #~ msgid "Verify all channel message signatures"
 #~ msgstr "Alle berichthandtekeningen in kanaal controleren"
-
 #~ msgid "Default SILC Key Pair"
 #~ msgstr "Standaard SILC Sleutelpaar"
-
 #~ msgid "SILC Public Key"
 #~ msgstr "SILC Publieke sleutel"
-
 #~ msgid "SILC Private Key"
 #~ msgstr "SILC Privésleutel"
-
 #~ msgid "EMail: \t\t%s\n"
 #~ msgstr "Email: \t\t%s\n"
-
 #~ msgid "TOC host"
 #~ msgstr "TOC host"
-
 #~ msgid "TOC port"
 #~ msgstr "TOC poort"
-
 #~ msgid "Basic Profile"
 #~ msgstr "Basisprofiel"
-
 #~ msgid "Instant Messagers"
 #~ msgstr "Instant Messagers"
-
 #~ msgid "AIM"
 #~ msgstr "AIM"
-
 #~ msgid "ICQ UIN"
 #~ msgstr "ICQ UIN"
-
 #~ msgid "Yahoo"
 #~ msgstr "Yahoo"
-
 #~ msgid "I'm From"
 #~ msgstr "Ik kom uit"
-
 #~ msgid "Set your Trepia profile data."
 #~ msgstr "Uw Trepia profielinfo instellen"
-
 #~ msgid "Visit Homepage"
 #~ msgstr "Homepage bezoeken"
-
 #~ msgid "Local Users"
 #~ msgstr "Lokale gebruikers"
-
 #~ msgid "Trepia Protocol Plugin"
 #~ msgstr "Trepia protocolplugin"
-
 #~ msgid ""
 #~ "You have been logged off as you have logged in on a different machine or "
 #~ "device."
 #~ msgstr ""
 #~ "De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
 #~ "computer."
-
 #~ msgid "Not At Home"
 #~ msgstr "Niet thuis"
-
 #~ msgid "Not At Desk"
 #~ msgstr "Niet op m'n plek"
-
 #~ msgid "Not In Office"
 #~ msgstr "Niet op kantoor"
-
 #~ msgid "Join user in chat..."
 #~ msgstr "Deelnemen aan chat van gebruiker..."
-
 #~ msgid "Pager host"
 #~ msgstr "semafoon host"
 
 #, fuzzy
 #~ msgid "Japan Pager host"
 #~ msgstr "semafoon host"
-
 #~ msgid "File transfer host"
 #~ msgstr "Bestandsoverdracht computer"
 
 #, fuzzy
 #~ msgid "Japan File transfer host"
 #~ msgstr "Bestandsoverdracht computer"
-
 #~ msgid "Chat Room List Url"
 #~ msgstr "URL voor lijst van ruimtes"
 
 #, fuzzy
 #~ msgid "YCHT Port"
 #~ msgstr "Poort"
-
 #~ msgid ""
 #~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 #~ "(1,048,576 bytes)."
@@ -20916,28 +20441,22 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "<b>Helaas worden niet-Engelse profielen op dit moment nog niet "
 #~ "ondersteund.</b><br><br>"
-
 #~ msgid "Maybe the room is full?"
 #~ msgstr "Misschien is de ruimte vol?"
 
 #, fuzzy
 #~ msgid "Unable send to chat %s,%s,%s"
 #~ msgstr "Kan gebruiker niet uitnodigen (%s)."
-
 #~ msgid "Access denied: proxy server forbids port %d tunnelling."
 #~ msgstr "Toegang geweigerd: proxy-server verbied tunnelen op poort %d."
-
 #~ msgid "Proxy connection error %d"
 #~ msgstr "Proxy verbindingsfout %d"
-
 #~ msgid "Please enter your password"
 #~ msgstr "Vul uw wachtwoord in"
-
 #~ msgid "(%d message)"
 #~ msgid_plural "(%d messages)"
 #~ msgstr[0] "(%d bericht)"
 #~ msgstr[1] "(%d berichten)"
-
 #~ msgid "(1 message)"
 #~ msgstr "(1 bericht)"
 
@@ -20948,79 +20467,60 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "De gebruiker '%s' nodigt %s uit in de chatruimte '%s'\n"
 #~ "%s"
-
 #~ msgid "%s went away"
 #~ msgstr "%s is afwezig"
-
 #~ msgid "second"
 #~ msgid_plural "seconds"
 #~ msgstr[0] "seconde"
 #~ msgstr[1] "seconden"
-
 #~ msgid "day"
 #~ msgid_plural "days"
 #~ msgstr[0] "dag"
 #~ msgstr[1] "dagen"
-
 #~ msgid "hour"
 #~ msgid_plural "hours"
 #~ msgstr[0] "uur"
 #~ msgstr[1] "uren"
-
 #~ msgid "minute"
 #~ msgid_plural "minutes"
 #~ msgstr[0] "minuut"
 #~ msgstr[1] "minuten"
-
 #~ msgid "DBus"
 #~ msgstr "DBus"
-
 #~ msgid "Buddy icon:"
-#~ msgstr "Contactplaatje:"
-
+#~ msgstr "pictogram:"
 #~ msgid "IM the user"
 #~ msgstr "Gebruiker IM sturen"
-
 #~ msgid "Ignore the user"
 #~ msgstr "Gebruiker negeren"
-
 #~ msgid "Get the user's information"
 #~ msgstr "Gebruikersinformatie opvragen"
-
 #~ msgid "Unable to read header from server"
 #~ msgstr "Kan header niet lezen van server"
-
 #~ msgid ""
 #~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
 #~ msgstr ""
 #~ "Kan bericht niet lezen van server: %s. Opdracht is %hd, lengte is %hd."
-
 #~ msgid "users: %s, files: %s, size: %sGB"
 #~ msgstr "gebruikers: %s, bestanden: %s, grootte: %s GB"
-
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "Kan \"%s\" niet toevoegen aan uw Napster hotlist"
-
 #~ msgid "%s requested a PING"
 #~ msgstr "%s vraagt om een PING"
-
 #~ msgid "NAPSTER Protocol Plugin"
 #~ msgstr "NAPSTER-protocol plugin"
-
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
 #~ msgstr ""
 #~ "Kan geluid niet afspelen omdat de Geluidsmethode 'Opdracht' is gekozen, "
 #~ "zonder een correcte opdracht te geven."
-
 #~ msgid ""
 #~ "Unable to play sound because the configured sound command could not be "
 #~ "launched: %s"
 #~ msgstr ""
 #~ "Kan geluid niet afspelen omdat de ingestelde opdracht niet gestart kan "
 #~ "worden: %s"
-
 #~ msgid ""
 #~ "An error was encountered parsing your buddy list.  It has not been "
 #~ "loaded, and the old file has moved to blist.xml~."
@@ -21065,61 +20565,44 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Auto Log In"
 #~ msgstr "Auto-aanmelden"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Extra/_Afwezig"
-
 #~ msgid "/Tools/Away"
 #~ msgstr "/Extra/Afwezig"
-
 #~ msgid "Done."
 #~ msgstr "Klaar."
 
 #, fuzzy
 #~ msgid "Logging in: "
 #~ msgstr "Aanmelden "
-
 #~ msgid "Cancel All"
 #~ msgstr "Alles annuleren"
-
 #~ msgid "/Options/Show Formatting _Toolbar"
 #~ msgstr "/Opties/_Opmaakwerkbalk weergeven"
-
 #~ msgid "/Options/Show Formatting Toolbar"
 #~ msgstr "/Opties/Opmaakwerkbalk weergeven"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Een bestand aan de gebruiker verzenden"
-
 #~ msgid "Remove the user from your buddy list"
 #~ msgstr "Gebruiker verwijderen van de contactenlijst"
 
 #, fuzzy
 #~ msgid "Send message"
 #~ msgstr "Verstuur bericht"
-
 #~ msgid "Invite a user"
 #~ msgstr "Gebruiker uitnodigen"
-
 #~ msgid "Add the chat to your buddy list"
 #~ msgstr "Chat toevoegen aan de lijst"
-
 #~ msgid "Remove the chat from your buddy list"
 #~ msgstr "Chat verwijderen van de contactenlijst"
-
 #~ msgid ""
 #~ "You are about to remove the contact containing %s and %d other buddies "
 #~ "from your buddy list.  Do you want to continue?"
 #~ msgstr ""
 #~ "U staat op het punt om het contact die %s bevat en %d andere contacten "
 #~ "van uw contactenlijst te verwijderen. Wilt u doorgaan?"
-
 #~ msgid "Please create an account."
 #~ msgstr "Maak een account aan."
-
 #~ msgid "Login"
 #~ msgstr "Aanmelden"
-
 #~ msgid "<b>_Account:</b>"
 #~ msgstr "<b>_Account:</b>"
 
@@ -21130,7 +20613,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "P_references"
 #~ msgstr "Voorkeuren"
-
 #~ msgid ""
 #~ "Gaim %s\n"
 #~ "Usage: %s [OPTION]...\n"
@@ -21164,245 +20646,168 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "  -d, --debug         debuginfo via stdout weergeven\n"
 #~ "  -v, --version       huidige versie weergeven en afsluiten\n"
 #~ "  -h, --help          deze hulptekst weergeven en afsluiten\n"
-
 #~ msgid "Interface Options"
 #~ msgstr "Interface-instellingen"
-
 #~ msgid "D_isplay remote nicknames if no alias is set"
 #~ msgstr "Bijnaam _weergeven als geen alias is ingesteld"
-
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "_Tijd weergeven bij berichten"
-
 #~ msgid "Show _warning levels"
 #~ msgstr "_Waarschuwingsniveau weergeven"
-
 #~ msgid "Show idle _times"
 #~ msgstr "Afwezigheidstijd _weergeven"
-
 #~ msgid "_Automatically expand contacts"
 #~ msgstr "Contacten _automatisch uitvouwen"
-
 #~ msgid "Show _buttons as:"
 #~ msgstr "_Knoppen weergeven als:"
-
 #~ msgid "Text"
 #~ msgstr "Tekst"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Tekst en afbeeldingen"
-
 #~ msgid "Enable \"_slash\" commands"
 #~ msgstr "\"slash\"-opdrachten (/) gebruiken"
-
 #~ msgid "Show _formatting toolbar"
 #~ msgstr "_Opmaakwerkbalk weergeven"
-
 #~ msgid "_Raise IM window on events"
 #~ msgstr "Berichtvenster _optillen bij gebeurtenissen"
-
 #~ msgid "Raise chat _window on events"
 #~ msgstr "Venster _optillen bij gebeurtenissen"
-
 #~ msgid "Signoff"
 #~ msgstr "Afmelden"
-
 #~ msgid "Local Addressbook"
 #~ msgstr "Lokaal adresboek"
-
 #~ msgid "Away!"
 #~ msgstr "Weg!"
 
 #, fuzzy
 #~ msgid "Edit This Message"
 #~ msgstr "Verstuur als bericht"
-
 #~ msgid "I'm Back!"
 #~ msgstr "Ik ben terug!"
-
 #~ msgid "Are you sure you want to remove the away message \"%s\"?"
 #~ msgstr "Wilt u het afwezigheidsbericht \"%s\" echt verwijderen?"
-
 #~ msgid "Remove Away Message"
 #~ msgstr "Afwezigheidsbericht verwijderen"
-
 #~ msgid "Set All Away"
 #~ msgstr "Zet alles op afwezig"
-
 #~ msgid "You cannot save an away message with a blank title"
 #~ msgstr "U kunt geen afwezigheidsbericht maken zonder titel"
-
 #~ msgid ""
 #~ "Please give the message a title, or choose \"Use\" to use without saving."
 #~ msgstr ""
 #~ "Geef het bericht een titel, of kies \"Gebruiken\" om te gebruiken zonder "
 #~ "op te slaan."
-
 #~ msgid "You cannot create an empty away message"
 #~ msgstr "U kunt geen leeg bericht maken"
-
 #~ msgid "Away title: "
 #~ msgstr "Afwezig titel: "
-
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Bericht sturen aan de geselecteerde persoon"
-
 #~ msgid "Get information on the selected buddy"
 #~ msgstr "Info over geselecteerde persoon"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
-
 #~ msgid "Join a chat room"
 #~ msgstr "Chatruimte binnengaan"
-
 #~ msgid "_Away"
 #~ msgstr "_Afwezig"
-
 #~ msgid "Set an away message"
 #~ msgstr "Afwezigheidsbericht instellen"
-
 #~ msgid "Signon: "
 #~ msgstr "Aanmelding: "
-
 #~ msgid "Signon"
 #~ msgstr "Aanmelden"
-
 #~ msgid "Get Away Msg"
 #~ msgstr "Haal afwezigheidsbericht op"
-
 #~ msgid "Warn the user"
 #~ msgstr "Gebruiker waarschuwen?"
-
 #~ msgid "Enter _sends message"
 #~ msgstr "Enter ver_stuurt bericht"
-
 #~ msgid "C_ontrol-Enter sends message"
 #~ msgstr "_CTRL-Enter verstuurt bericht"
-
 #~ msgid "Insertions"
 #~ msgstr "Invoegingen"
-
 #~ msgid "Control-{B/I/U} changes _formatting"
 #~ msgstr "CTRL-{B/I/U} verandert de _opmaak"
-
 #~ msgid "Control-(number) _inserts smileys"
 #~ msgstr "CTRL-(nummer) voegt _smileys in"
-
 #~ msgid "_Raise window on events"
 #~ msgstr "Venster _optillen bij gebeurtenissen"
-
 #~ msgid "Dim i_dle buddies"
 #~ msgstr "Afwezige contacten _uitgrijzen"
-
 #~ msgid "Use _multi-colored screen names in chats"
 #~ msgstr "Meerkleurige namen weergeven in chats"
-
 #~ msgid "_Edit"
 #~ msgstr "_Bewerken"
-
 #~ msgid "Away Messages"
 #~ msgstr "Afwezigheid"
-
-#~ msgid "_Accounts"
-#~ msgstr "_Accounts"
-
 #~ msgid "_Preferences"
 #~ msgstr "_Voorkeuren"
-
 #~ msgid "_Sign on"
 #~ msgstr "_Aanmelden"
-
 #~ msgid "Gaim encountered an error communicating with the ICQ server."
 #~ msgstr ""
 #~ "Gaim is een fout tegen gekomen bij de communicatie met de ICQ-server."
-
 #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 #~ msgstr "De gebruiker %s (%s%s%s%s%s) wil dat u hem/haar toestemming geeft."
-
 #~ msgid "Send message through server"
 #~ msgstr "Verzend bericht via server"
-
 #~ msgid "Nick:"
 #~ msgstr "Bijnaam:"
-
 #~ msgid "Roomlist Error"
 #~ msgstr "Fout in lijst avn ruimtes"
-
 #~ msgid "Update Buddy Icon"
-#~ msgstr "Contactplaatje bijwerken"
-
+#~ msgstr "pictogram bijwerken"
 #~ msgid "Syncing with server"
 #~ msgstr "Synchronisatie met server"
-
 #~ msgid "MSN error for account %s"
 #~ msgstr "MSN-fout voor account %s"
-
 #~ msgid "(There was an error receiving this message)"
 #~ msgstr "(Er is een fout opgetreden bij het ontvangen van dit bericht)"
-
 #~ msgid "Not specified"
 #~ msgstr "Niet gespecificeerd"
-
 #~ msgid "Visible"
 #~ msgstr "Zichtbaar"
-
 #~ msgid "Available Message:"
 #~ msgstr "Beschikbaar-bericht:"
-
 #~ msgid "I'm doing work and hoping for a distraction--IM me!"
 #~ msgstr "Ik ben aan het werk en hoop op een afleidend berichtje!"
-
 #~ msgid "Set Available Message..."
 #~ msgstr "Beschikbaar-bericht instellen..."
 
 #, fuzzy
 #~ msgid "Failed to leave channel"
 #~ msgstr "Kan niet deelnemen aan chat"
-
 #~ msgid "Custom"
 #~ msgstr "Aangepast"
-
 #~ msgid "%s logged in."
 #~ msgstr "%s heeft zich aangemeld."
-
 #~ msgid "%s signed on"
 #~ msgstr "%s heeft zich aangemeld"
-
 #~ msgid "%s logged out."
 #~ msgstr "%s heeft zich afgemeld."
-
 #~ msgid "%s signed off"
 #~ msgstr "%s heeft zich afgemeld"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
 #~ msgstr ""
 #~ "%s is zojuist gewaarschuwd door %s\n"
 #~ "Uw nieuwe waarschuwingsniveau is %d%%"
-
 #~ msgid "an anonymous person"
 #~ msgstr "een anoniem persoon"
-
 #~ msgid "Sorry, I ran out for a bit!"
 #~ msgstr "Sorry, ik ben d'r even niet!"
-
 #~ msgid "Moving Gaim Settings.."
 #~ msgstr "Verplaatsen van gaim-instellingen..."
-
 #~ msgid "Moving Gaim user settings to: "
 #~ msgstr "Verplaatsen van gaim instellingenmap naar: "
-
 #~ msgid "Notification"
 #~ msgstr "Melding"
-
 #~ msgid "That file does not exist."
 #~ msgstr "Dat bestand bestaat niet."
-
 #~ msgid "%s was not found.\n"
 #~ msgstr "%s niet gevonden.\n"
-
 #~ msgid ""
 #~ "No such command. If you didn't mean to type a command, you can turn "
 #~ "commands off from Tools->Preferences->Interface->Conversation->Enable "
@@ -21411,7 +20816,6 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Opdracht onbekend. Als u helemaal geen opdracht probeerde te typen, kunt "
 #~ "u deze functie uitschakelen via: Extra->Voorkeuren->Interface->Gesprekken-"
 #~ ">\"slash\"-opdrachten (/) gebruiken."
-
 #~ msgid ""
 #~ "Syntax Error:  You typed the wrong number of arguments to that command. "
 #~ "If you didn't mean to type a command, you can turn commands off from "
@@ -21425,31 +20829,24 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Your message did not get sent."
 #~ msgstr "Uw Yahoo! bericht is niet verzonden."
-
 #~ msgid "Your message to %s did not get sent:"
 #~ msgstr "Uw bericht aan %s is niet verzonden:"
-
 #~ msgid "sorry, i ran out for a while. bbl"
 #~ msgstr "sorry, ik ben d'r even niet."
-
 #~ msgid "help:  List available commands."
 #~ msgstr "help:  Beschikbare opdrachten opsommen."
-
 #~ msgid "_Ignore formatting on incoming messages"
 #~ msgstr "Opmaak van inkomende berichten _negeren"
-
 #~ msgid "_Send auto-response"
 #~ msgstr "Auto-antwoord _sturen"
-
 #~ msgid "_Only send auto-response when idle"
 #~ msgstr "_Alleen auto-antwoord sturen tijdens afwezigheid"
-
 #~ msgid "Already logged in with Zephyr"
 #~ msgstr "Reeds aangemeld met zephyr"
-
 #~ msgid ""
 #~ "Because Zephyr uses your system username, you are unable to have multiple "
 #~ "accounts on it when logged in as the same user."
 #~ msgstr ""
 #~ "Omdat zephyr uw gebruikersnaam van de computer gebruikt, kunt u zich "
 #~ "hiermee met maximaal 1 account aanmelden."
+
diff --git a/po/nn.po b/po/nn.po
index c79a26bbea..d5761fd6df 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 08:57-0400\n"
-"PO-Revision-Date: 2008-05-05 23:34+0100\n"
+"POT-Creation-Date: 2008-08-15 11:30-0400\n"
+"PO-Revision-Date: 2008-08-12 01:13+0100\n"
 "Last-Translator: YS Landro <nynorsk@strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -89,6 +89,10 @@ msgstr "Passord:"
 msgid "Alias:"
 msgstr "Kallenamn:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Opprett denne kontoen på tenaren"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -114,7 +118,7 @@ msgid "Accounts"
 msgstr "Kontoar"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "Du kan ta i bruk/slå av kontoar frå lista."
+msgstr "Du kan ta i bruk / slå av kontoar frå følgjande liste."
 
 #. Add button
 msgid "Add"
@@ -315,6 +319,7 @@ msgstr "Slå merke av/på"
 msgid "Nickname"
 msgstr "Kallenamn"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "Uverksam"
@@ -395,6 +400,9 @@ msgstr "Bli med i praterom…"
 msgid "View Log..."
 msgstr "Sjå på loggen…"
 
+msgid "View All Logs"
+msgstr "Vis alle loggane"
+
 msgid "Show"
 msgstr "Vis"
 
@@ -590,6 +598,19 @@ msgstr ""
 msgid "Send To"
 msgstr "Send til"
 
+msgid "Invite message"
+msgstr "Invitasjon"
+
+msgid "Invite"
+msgstr "Inviter"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Skriv inn namnet på brukaren du ønskjer å invitera.\n"
+"Du kan velja om du vil ha med ei velkomstmelding."
+
 msgid "Conversation"
 msgstr "Prat"
 
@@ -602,6 +623,9 @@ msgstr "Vis tidsstempel"
 msgid "Add Buddy Pounce..."
 msgstr "Legg til vennevarsling…"
 
+msgid "Invite..."
+msgstr "Inviter…"
+
 msgid "Enable Logging"
 msgstr "Bruk logging"
 
@@ -611,9 +635,11 @@ msgstr "Bruk lydar"
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "Brukarliste:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Liste av %d brukar:\n"
+msgstr[1] "Liste av %d brukarar:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "Støtta feilsøkingsval er:  versjon"
@@ -628,6 +654,18 @@ msgstr ""
 "Bruk \"/help &lt;kommando&gt;\" for å få hjelp med ein kommando.\n"
 "Dei følgjande kommandoane er tilgjengelege i denne samanhengen:\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s er ikkje ein gyldig meldingsklasse. Sjå '/help msgcolor' for gyldige "
+"meldingsklassar."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s er ikkje ein gyldig farge. Sjå '/help msgcolor' for gyldige fargar."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -674,6 +712,20 @@ msgstr "prefs: viser innstillingsvindauget."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: viser lagra status-vindauget."
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Bestemma "
+"fargen til dei forskjellige meldingsklassane i samtalevindauget.<br>    &lt;"
+"class&gt;:  ta i mot, send, marker, handling, tidsstempel<br>    &lt;"
+"foreground/background&gt;: svart, raud, grøn, blå, kvit, grå, mørkegrå, "
+"magentaraud, cyanblå, standard<br><br>DØME:<br>    msgcolor send cyanblå "
+"default"
+
 msgid "Unable to open file."
 msgstr "Klarte ikkje å opna fila."
 
@@ -694,8 +746,10 @@ msgid "Pause"
 msgstr "Pause"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Filoverføringar - %d%% av %d filer"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Filoverføringar - %d%% av %d fil"
+msgstr[1] "Filoverføringar - %d%% av %d filer"
 
 #. Create the window.
 msgid "File Transfers"
@@ -810,6 +864,9 @@ msgstr "Samtaler i %s"
 msgid "Conversations with %s"
 msgstr "Samtaler med %s"
 
+msgid "All Conversations"
+msgstr "Alle samtaler"
+
 msgid "System Log"
 msgstr "Systemlogg"
 
@@ -847,9 +904,6 @@ msgstr "Hald fram"
 msgid "IM"
 msgstr "Lynmeldingar"
 
-msgid "Invite"
-msgstr "Inviter"
-
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -903,7 +957,7 @@ msgid "Select plugin to install"
 msgstr "Vel kva for programtillegg som skal installerast"
 
 msgid "You can (un)load plugins from the following list."
-msgstr "Du kan lasta inn/ta vekk programtillegg frå lista."
+msgstr "Du kan lasta inn / ta vekk programtillegg frå følgjande liste."
 
 msgid "Install Plugin..."
 msgstr "Installer programtillegg…"
@@ -1053,6 +1107,7 @@ msgstr "%s har gått vekk . (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sendt deg ei melding. (%s)"
 
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjend varselhending. Rapportér feilen."
 
@@ -1421,6 +1476,7 @@ msgstr ""
 "Når ei ny samtale blir opna, vil dette tillegget setja inn den siste samtala "
 "i den noverande."
 
+#, c-format
 msgid "Online"
 msgstr "Tilkopla"
 
@@ -1756,6 +1812,7 @@ msgstr ""
 "Feil under lesing av oppslagsprosessen:\n"
 "%s"
 
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF under lesing frå oppslagsprosessen"
 
@@ -1845,6 +1902,7 @@ msgstr "Startar overføring av %s frå %s"
 msgid "Transfer of file %s complete"
 msgstr "Overføringa av fila %s er ferdig"
 
+#, c-format
 msgid "File transfer complete"
 msgstr "Filoverføringa er ferdig"
 
@@ -1852,6 +1910,7 @@ msgstr "Filoverføringa er ferdig"
 msgid "You canceled the transfer of %s"
 msgstr "Du avbraut overføringa av %s"
 
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Filoverføringa blei avbroten"
 
@@ -2058,6 +2117,7 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du nyttar %s, men dette tillegget krev %s."
 
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Dette tillegget har ikkje definert ein ID."
 
@@ -2069,8 +2129,11 @@ msgstr "Samsvarsfeil %d i det magiske nummeret til tillegget (treng %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Samsvarsfeil %d i ABI-versjonen.%d.x (treng %d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "Programtillegget nyttar ikkje alle nødvendige funksjonar"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Programtillegget nyttar ikkje alle nødvendige funksjonar ('list_icon',' "
+"login' og 'close')"
 
 #, c-format
 msgid ""
@@ -2152,6 +2215,9 @@ msgstr ""
 "ferdig\n"
 "(berre når det ikkje foregår ei samtale med sendaren)"
 
+msgid "Create a new directory for each user"
+msgstr "Lag ein ny katalog for kvar brukar"
+
 msgid "Notes"
 msgstr "Notat"
 
@@ -2320,20 +2386,20 @@ msgstr "Tidsgrense for uverksame brukarar (i minutt)"
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr "Skjul bli med/gå ut"
+msgstr "Skjul bli med / gå ut"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr "Skjuler unødvendige bli med/gå ut-meldingar."
+msgstr "Skjuler unødvendige bli med-/gå ut-meldingar."
 
 #. *  description
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"Dette tillegget skjuler bli med/gå ut-meldingar i store rom, med unntak for "
+"Dette tillegget skjuler bli med-/gå ut-meldingar i store rom, med unntak for "
 "brukarar som tek aktv del i ei samtale."
 
 #. This is used in the place of a timezone abbreviation if the
@@ -2452,7 +2518,7 @@ msgstr ""
 "Når ein les loggar, vil dette programtillegget ta med loggar frå andre "
 "klientar. For tida gjeld dette Adium, MSN Messenger og Trillian.\n"
 "\n"
-"ÅTVARING: Dette tillegget er framleis ein alfa-versjon og vil kanskje kræsja "
+"ÅTVARING: Dette tillegget er framleis ein alfa-versjon og vil kanskje krasja "
 "ofte. Bruk det på eigen risiko!"
 
 msgid "Mono Plugin Loader"
@@ -2707,7 +2773,7 @@ msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-"Varslar i samtalevindauget når ein venn går vekk/blir uverksam eller kjem "
+"Varslar i samtalevindauget når ein venn går vekk / blir uverksam eller kjem "
 "tilbake."
 
 msgid "Tcl Plugin Loader"
@@ -2724,13 +2790,11 @@ msgstr ""
 "tillegg må du installera ActiveTCL frå http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
 "Fann ikkje verktøysamlinga til Apple Bonjour for Windows. Du finn fleire "
-"opplysningar om du følgjer denne lenkja:http://developer.pidgin.im/wiki/Using"
-"%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging"
+"opplysningar på adressa http://d.pidgin.im/BonjourWindows."
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Klarer ikkje å lytta etter innkomande meldingstilkoplingar\n"
@@ -2753,7 +2817,7 @@ msgid "AIM Account"
 msgstr "AIM-konto"
 
 msgid "XMPP Account"
-msgstr "_XMPP-konto"
+msgstr "XMPP-konto"
 
 #. *< type
 #. *< ui_requirement
@@ -2784,9 +2848,6 @@ msgstr "Klarte ikkje å senda meldinga. Samtala kunne ikkje startast."
 msgid "Cannot open socket"
 msgstr "Klarte ikkje å opna endepunkt"
 
-msgid "Error setting socket options"
-msgstr "Klarte ikkje å lagra endepunktsval"
-
 msgid "Could not bind socket to port"
 msgstr "Klarte ikkje å binda endepunktet til port"
 
@@ -2836,6 +2897,9 @@ msgstr "Vennelista er henta inn."
 msgid "Save buddylist..."
 msgstr "Lagra venneliste…"
 
+msgid "Load buddylist from file..."
+msgstr "Hent vennelista frå fil…"
+
 msgid "Fill in the registration fields."
 msgstr "Fyll ut registreringsfelta."
 
@@ -2933,6 +2997,7 @@ msgstr "Tilgjengeleg"
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
+#, c-format
 msgid "Away"
 msgstr "Vekke"
 
@@ -3011,9 +3076,6 @@ msgstr "Slett vennelista frå tenaren"
 msgid "Save buddylist to file..."
 msgstr "Lagra vennelista til fil…"
 
-msgid "Load buddylist from file..."
-msgstr "Hent vennelista frå fil…"
-
 #. magic
 #. major_version
 #. minor_version
@@ -3129,6 +3191,9 @@ msgstr "Port"
 msgid "Encodings"
 msgstr "Teiknkodingar"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "Automatisk oppdaging av innkomande UTF-8"
+
 msgid "Real name"
 msgstr "Eigentleg namn"
 
@@ -3143,8 +3208,8 @@ msgid "Bad mode"
 msgstr "Ugyldig tilstand"
 
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "%s er utestengt av %s, utført for %ld sekund sia"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "%s er utestengt av %s, utført for %s sia"
 
 #, c-format
 msgid "Ban on %s"
@@ -3314,6 +3379,9 @@ msgstr ""
 "away [melding]:  Legg inn ei fråværsmelding, eller bruk inga melding for å "
 "visa at du er komen attende."
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <kallenamn> <melding>: sender ctcp-melding til kallenamnet."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: send ein kommando til kanaltenartenesta"
 
@@ -3569,6 +3637,8 @@ msgstr "Postnummer"
 msgid "Country"
 msgstr "Land"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -3758,12 +3828,12 @@ msgstr "Hoppkontroll"
 msgid "Capabilities"
 msgstr "Evner"
 
-msgid "Resource"
-msgstr "Ressurs"
-
 msgid "Priority"
 msgstr "Prioritet"
 
+msgid "Resource"
+msgstr "Ressurs"
+
 msgid "Middle Name"
 msgstr "Mellomnamn"
 
@@ -3810,6 +3880,7 @@ msgstr "Snakkesaleg"
 msgid "Extended Away"
 msgstr "Utvida vekke"
 
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -3988,7 +4059,7 @@ msgid "Already Registered"
 msgstr "Allereie registrert"
 
 msgid "State"
-msgstr "Fylke/Region/Stat"
+msgstr "Fylke/region/stat"
 
 msgid "Postal code"
 msgstr "Postnummer"
@@ -4051,7 +4122,7 @@ msgid "Both"
 msgstr "Begge"
 
 msgid "From (To pending)"
-msgstr "Frå (til ventar)"
+msgstr "Frå (til ventande)"
 
 msgid "From"
 msgstr "Frå"
@@ -4451,8 +4522,8 @@ msgid "XMPP Message Error"
 msgstr "Jabber meldingsfeil"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (Kode %s)"
+msgid "(Code %s)"
+msgstr "(Kode %s)"
 
 msgid "XML Parse error"
 msgstr "Feil i XML-tolkinga"
@@ -4477,14 +4548,14 @@ msgid "_Accept Defaults"
 msgstr "_Godta standardinnstillingane"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Feil i praterommet %s"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "Klarte ikkje å kopla til praterommet %s"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "Feil i praterommet %s"
+
+#, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Klarte ikkje å senda fila til %s fordi brukaren ikkje støttar filoverføringar"
@@ -4568,162 +4639,215 @@ msgstr ""
 "%s er i den lokale lista, men ikkje på tenarlista. Ønskjer du å leggja ho/"
 "han til?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "Klarte ikkje å tyda meldinga"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksfeil (truleg feil i klienten)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "Ugyldig e-postadresse"
 
+#, c-format
 msgid "User does not exist"
 msgstr "Brukaren finst ikkje"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manglar fullstendig domenenamn"
 
+#, c-format
 msgid "Already logged in"
 msgstr "Allereie logga inn"
 
+#, c-format
 msgid "Invalid username"
 msgstr "Ugyldig rukarnamn"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Ugyldig visingsnamn"
 
+#, c-format
 msgid "List full"
 msgstr "Lista er full"
 
+#, c-format
 msgid "Already there"
 msgstr "Allereie der"
 
+#, c-format
 msgid "Not on list"
 msgstr "Ikkje på lista"
 
+#, c-format
 msgid "User is offline"
 msgstr "Brukaren er fråkopla"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "Allereie i den tilstanden"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "Allereie i motsett liste"
 
+#, c-format
 msgid "Too many groups"
 msgstr "For mange grupper"
 
+#, c-format
 msgid "Invalid group"
 msgstr "Ugyldig gruppe"
 
+#, c-format
 msgid "User not in group"
 msgstr "Brukaren er ikkje med i gruppa"
 
+#, c-format
 msgid "Group name too long"
 msgstr "Gruppenamnet er for langt"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan ikkje fjerna gruppe null"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Prøvde å leggja ein kontakt til ei gruppe som ikkje finst"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Sentralbordet feila"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Varselsoverføringa feila"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "Manglar påkravde felt"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Alt for mange treff på ein FND"
 
+#, c-format
 msgid "Not logged in"
 msgstr "Ikkje innlogga"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tenesta er mellombels utilgjengeleg"
 
+#, c-format
 msgid "Database server error"
 msgstr "Databasetenarfeil"
 
+#, c-format
 msgid "Command disabled"
 msgstr "Kommandoen er ikkje i bruk"
 
+#, c-format
 msgid "File operation error"
 msgstr "Filhandteringsfeil"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "Minnetildelingsfeil"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sende til tenaren"
 
+#, c-format
 msgid "Server busy"
 msgstr "Tenaren er oppteken"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "Tenaren er utilgjengeleg"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "Varslingstenaren er nede"
 
+#, c-format
 msgid "Database connect error"
 msgstr "Tilkoplinga til databasen feila"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Tenaren er på veg ned (forlat skipet)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "Tilkoplingsfeil"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrane er anten ukjende eller ikkje tilletne"
 
+#, c-format
 msgid "Unable to write"
 msgstr "Klarte ikkje å skriva"
 
+#, c-format
 msgid "Session overload"
 msgstr "Øktoverbelastning"
 
+#, c-format
 msgid "User is too active"
 msgstr "Brukaren er for aktiv"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "For mange økter"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport-kontoen er ikkje stadfesta"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "Ugyldig vennefil"
 
+#, c-format
 msgid "Not expected"
 msgstr "Uventa"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Endrar visingsnamnet for ofte"
 
+#, c-format
 msgid "Server too busy"
 msgstr "Tenaren er for oppteken"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "Autentiseringa feila"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Ikkje tillate når du er fråkopla"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "Tek ikkje i mot nye brukarar"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn utan foreldregodkjennig"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-kontoen er enno ikkje stadfesta"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "Ugyldig autentiseringsmelding"
 
@@ -4746,6 +4870,9 @@ msgstr "%s har gjeve deg ein dytt!"
 msgid "Nudging %s..."
 msgstr "Dyttar %s…"
 
+msgid "Email Address..."
+msgstr "E-postadresse…"
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-visingsnamnet ditt er for langt."
 
@@ -4780,8 +4907,20 @@ msgstr "Tillat"
 msgid "Disallow"
 msgstr "Nekt"
 
-msgid "This Hotmail account may not be active."
-msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Blokkert tekst for %s"
+
+msgid "No text is blocked for this account."
+msgstr "Ingen tekst er blokkert for denne kontoen."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN-tenarane blokkerer no desse regulære uttrykka:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Denne kontoen har ikkje teke i bruk e-postfunksjonen."
 
 msgid "Send a mobile message."
 msgstr "Send ei mobilmelding."
@@ -4835,11 +4974,14 @@ msgid "Set Mobile Phone Number..."
 msgstr "Skriv inn mobiltelefonnummer…"
 
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Ta i bruk/ta vekk mobile einingar…"
+msgstr "Ta i bruk / ta vekk mobile einingar…"
 
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillat/avslå mobilsider…"
 
+msgid "View Blocked Text..."
+msgstr "Vis blokkert tekst…"
+
 msgid "Open Hotmail Inbox"
 msgstr "Opna Hotmail-innkorga"
 
@@ -4931,7 +5073,7 @@ msgid "Home Fax"
 msgstr "Heimefaks"
 
 msgid "Personal Email"
-msgstr "Personleg e-postadresse"
+msgstr "E-postadresse privat"
 
 msgid "Personal IM"
 msgstr "Personleg pratenett"
@@ -4974,7 +5116,7 @@ msgid "Work Fax"
 msgstr "Telefaks arbeid"
 
 msgid "Work Email"
-msgstr "E-postadresse jobb"
+msgstr "E-postadresse arbeid"
 
 msgid "Work IM"
 msgstr "Pratenett arbeid"
@@ -5040,16 +5182,8 @@ msgstr "nudge: dytta til ein brukar for å få merksemda hans/hennar"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID-autentisering: klarer ikkje å kopla til"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Windows Live ID-autentisering: finn ikkje autentiseringsmarkøren i svaret "
-"frå tenaren"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID-autentiseringa feila"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID-autentisering: ugyldig svar"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5096,6 +5230,9 @@ msgstr "%s er ikkje ein gyldig Passport-konto."
 msgid "Service Temporarily Unavailable."
 msgstr "Tenesta er mellombels utilgjengeleg."
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "Mobilmeldinga blei ikkje sendt sia ho var for lang."
+
 msgid "Unable to rename group"
 msgstr "Klarte ikkje å endra namnet til gruppa"
 
@@ -5128,6 +5265,22 @@ msgstr[1] ""
 "\n"
 "Du vil kunna logga på att straks vedlikehaldsarbeidet er ferdig."
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Meldinga blei ikkje sendt sia systemet ikkje er tilgjengeleg. Dette skjer "
+"vanlegvis når brukaren er blokkert eller ikkje finst."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Meldinga blei ikkje sendt sia dei blir sende for raskt."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Meldinga blei ikkje sendt sia det oppstod ein ukjend teiknkodingsfeil."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Meldinga blei ikkje sendt sia det oppstod ein ukjend feil."
+
 msgid "Unable to connect"
 msgstr "Klarte ikkje å kopla til"
 
@@ -5244,6 +5397,9 @@ msgstr "Klarte ikkje å leggja til \"%s\"."
 msgid "The username specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ugyldig."
 
+msgid "This Hotmail account may not be active."
+msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
+
 msgid "Has you"
 msgstr "Har deg"
 
@@ -5283,8 +5439,10 @@ msgid "Logging in"
 msgstr "Loggar på"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
+msgstr[1] "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5381,9 +5539,15 @@ msgstr "Lynmeldingsvennar"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"%d venn blei lagt til eller oppdatert frå tenaren (inkludert vennar som "
+"allereie var på tenarsidelista)"
+msgstr[1] ""
 "%d vennar blei lagde til eller oppdaterte frå tenaren (inkludert vennar som "
 "allereie var på tenarsidelista)"
 
@@ -5851,6 +6015,7 @@ msgstr ""
 msgid "Error. SSL support is not installed."
 msgstr "Feil. SSL-støtte er ikkje installert."
 
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denne konferanse er blitt lukka. Kan ikkje senda fleire meldingar."
 
@@ -6001,11 +6166,11 @@ msgstr "Ikkje nok rettar"
 msgid "In local permit/deny"
 msgstr "I lokal tilgangs-/forbodsliste"
 
-msgid "Too evil (sender)"
-msgstr "For vond (sendar)"
+msgid "Warning level too high (sender)"
+msgstr "For høgt åtvaringsnivå (sendar)"
 
-msgid "Too evil (receiver)"
-msgstr "For vond (mottakar)"
+msgid "Warning level too high (receiver)"
+msgstr "For høgt åtvaringsnivå (mottakar)"
 
 msgid "User temporarily unavailable"
 msgstr "Brukaren er mellombels utilgjengeleg"
@@ -6107,18 +6272,26 @@ msgstr "Sanntidsvideo"
 msgid "Camera"
 msgstr "Kamera"
 
+msgid "Screen Sharing"
+msgstr "Skjermdeling"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Ledig for prat"
 
+#, c-format
 msgid "Not Available"
 msgstr "Ikkje tilgjengeleg"
 
+#, c-format
 msgid "Occupied"
 msgstr "Oppteken"
 
+#, c-format
 msgid "Web Aware"
 msgstr "Nettmedviten"
 
+#, c-format
 msgid "Invisible"
 msgstr "Usynleg"
 
@@ -6192,7 +6365,6 @@ msgstr ""
 "Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. "
 "Held du fram med å prøva, vil du måtta venta endå lenger."
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Klientversjonen du bruker er for gammal. Oppgrader på %s"
@@ -6236,6 +6408,7 @@ msgstr "Du kan bli fråkopla snart. Sjå etter oppdateringar på %s."
 msgid "Unable to get a valid login hash."
 msgstr "Klarer ikkje å henta ein gyldig påloggingsnøkkel."
 
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Passordet er sendt"
 
@@ -6345,16 +6518,24 @@ msgstr[0] "Du fekk ikkje %hu melding frå %s sia mengdegrensa er overskriden."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia mengdegrensa er overskriden."
 
 #, 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] "Du fekk ikkje %hu melding frå %s sia han/ho er for vond."
-msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia han/ho er for vond."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Du fekk ikkje %hu melding frå %s sia åtvaringsnivået hans/hennar er for høgt."
+msgstr[1] ""
+"Du fekk ikkje %hu meldingar frå %s sia åtvaringsnivået hans/hennar er for "
+"høgt."
 
 #, 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] "Du fekk ikkje %hu melding frå %s sia du er for vond."
-msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia du er for vond."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Du fekk ikkje %hu melding frå %s sia åtvaringsnivået ditt er for høgt."
+msgstr[1] ""
+"Du fekk ikkje %hu meldingar frå %s sia åtvaringsnivået ditt er for høgt."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6384,9 +6565,6 @@ msgstr "Tilkopla sia"
 msgid "Member Since"
 msgstr "Medlem sia"
 
-msgid "Available Message"
-msgstr "Tilgjengeleg melding"
-
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
@@ -6415,12 +6593,17 @@ msgstr "Mobiltelefon"
 msgid "Personal Web Page"
 msgstr "Personelg nettside"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
 msgid "Zip Code"
 msgstr "Postnummer"
 
+msgid "Work Information"
+msgstr "Arbeidsinformasjon"
+
 msgid "Division"
 msgstr "Avdeling"
 
@@ -6430,9 +6613,6 @@ msgstr "Stilling"
 msgid "Web Page"
 msgstr "Nettside"
 
-msgid "Work Information"
-msgstr "Arbeidsinformasjon"
-
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
@@ -6444,11 +6624,11 @@ msgstr[1] "Desse brukarnamna er knytte til %s"
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Ingen resultat funnen for e-postadressa %s"
+msgstr "Ikkje noko resultat funne for e-postadressa %s"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Du vil få ei e-postmelding der du blir spurt om å stadfesta %s."
+msgstr "Du bør få ei e-postmelding der du blir spurt om å stadfesta %s."
 
 msgid "Account Confirmation Requested"
 msgstr "Bede om kontostadfesting"
@@ -6644,12 +6824,6 @@ msgstr ""
 "Biletet blei ikkje sendt. Du kan ikkje senda lynmeldingsbilete i AIM-"
 "praterom."
 
-msgid "Away Message"
-msgstr "Fråværsmelding"
-
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(hentar)</i>"
-
 msgid "iTunes Music Store Link"
 msgstr "Lenkje til iTunes Music Store"
 
@@ -6723,10 +6897,10 @@ msgstr ""
 "velja \"Spør om ny godkjenning.\""
 
 msgid "Find Buddy by Email"
-msgstr "Finn venn utfrå e-postadessa"
+msgstr "Finn venn utfrå e-postadressa"
 
 msgid "Search for a buddy by email address"
-msgstr "Bruk e-postadressa til å søkja etter ein venn"
+msgstr "Søk etter ein venn utfrå e-postadressa"
 
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Skriv inn e-postadressa til vennen du leiter etter."
@@ -6761,7 +6935,7 @@ msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis vennar som ventar på godkjenning"
 
 msgid "Search for Buddy by Email Address..."
-msgstr "Bruk e-postadressa til å søkja etter ein venn…"
+msgstr "Finn venn utfrå e-postadressa…"
 
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
@@ -6775,6 +6949,9 @@ msgstr ""
 "filoverføringar og direktelynmeldingar\n"
 "(er seinare, men viser ikkje IP-adressa di)"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "Tillat fleire samstundes påloggingar"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Ber %s om å kopla seg til oss på %s:%hu for direkteprat."
@@ -6783,6 +6960,7 @@ msgstr "Ber %s om å kopla seg til oss på %s:%hu for direkteprat."
 msgid "Attempting to connect to %s:%hu."
 msgstr "Prøver å kopla til %s:%hu."
 
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Prøver å kopla til via mellomtenar."
 
@@ -7078,13 +7256,6 @@ msgstr ""
 "Ver merksam på at om du har laga denne Qun-en, \n"
 "vil denne handlinga fjerna han."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Kode [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "Gruppehandlingsfeil"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Godtek du førespurnaden?"
@@ -7113,34 +7284,40 @@ msgstr "Systemmelding"
 msgid "Failed to send IM."
 msgstr "Klarte ikkje å senda lynmeldinga."
 
-msgid "Keep alive error"
-msgstr "Oppetidsfeil"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Ukjend-%d"
 
-msgid "Error requesting login token"
-msgstr "Feil ved førespurnad om påloggingsmarkør"
+msgid "Level"
+msgstr "Nivå"
 
-msgid "Unable to login. Check debug log."
-msgstr "Får ikkje logga på - sjå i feilsøkingsloggen."
+msgid "Member"
+msgstr "Medlem"
 
-msgid "Unable to login"
-msgstr "Får ikkje logga på"
+msgid " VIP"
+msgstr " VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Klarte ikkje å kopla til."
+msgid " TCP"
+msgstr " TCP"
 
-#, c-format
-msgid "Unknown-%d"
-msgstr "Ukjend-%d"
+msgid " FromMobile"
+msgstr "Mobil"
 
-msgid "TCP Address"
-msgstr "TCP-adresse"
+msgid " BindMobile"
+msgstr "Mobil"
 
-msgid "UDP Address"
-msgstr "UDP-adresse"
+msgid " Video"
+msgstr "Video"
 
-msgid "Level"
-msgstr "Nivå"
+msgid " Space"
+msgstr "Mellomrom"
+
+# Er indikator betre?
+msgid "Flag"
+msgstr "Flagg"
+
+msgid "Ver"
+msgstr "Ver"
 
 msgid "Invalid name"
 msgstr "Ugyldig brukarnamn"
@@ -7154,12 +7331,16 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Siste oppfrisking</b>: %s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Tenar</b>: %s: %d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Tilkoplingstilstand</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>Tenar-IP-adresse</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Verkeleg vertsnamn</b>: %s: %d<br>\n"
 
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
@@ -7211,12 +7392,94 @@ msgstr "QQ-protokoll\tTillegg"
 msgid "Connect using TCP"
 msgstr "Kopla til ved hjelp av TCP"
 
+msgid "resend interval(s)"
+msgstr "omattsendingsintervall"
+
+msgid "Keep alive interval(s)"
+msgstr "Intervall vedlikehaldstilkopling"
+
+msgid "Update interval(s)"
+msgstr "Oppdateringsintervall"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Ugyldig markørlengd, %d"
+
+msgid "Keep alive error"
+msgstr "Feil på vedlikehaldssambandet"
+
+msgid "Failed to connect server"
+msgstr "Klarte ikkje å kopla til tenaren"
+
 msgid "Socket error"
 msgstr "Endepunktsfeil"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Tapt samband med tenaren:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "Klarte ikkje å lesa frå endepunktet"
 
+msgid "Write Error"
+msgstr "Skrivefeil"
+
+msgid "Connection lost"
+msgstr "Tapt tilkopling"
+
+msgid "Couldn't resolve host"
+msgstr "Vertsoppslaget feila"
+
+msgid "hostname is NULL or port is 0"
+msgstr "vertsnamnet er NULL eller porten er 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Koplar til tenaren %s, prøver %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Klarte ikkje å kopla til."
+
+msgid "Could not resolve hostname"
+msgstr "Vertsnamnoppslaget feila"
+
+msgid "Unable to login. Check debug log."
+msgstr "Får ikkje logga på - sjå i feilsøkingsloggen."
+
+msgid "Unable to login"
+msgstr "Får ikkje logga på"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+"Svar %s(0x%02X )\n"
+"Send %s(0x%02X )\n"
+"Rom-id %d, svar [0x%02X]: \n"
+"%s"
+
+msgid "Failed room reply"
+msgstr "Rom-svaret feila"
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Du er ikkje medlem i gruppa \"%s\"\n"
+
+msgid "Can not decrypt login reply"
+msgstr "Klarer ikkje å dekryptera påloggingssvaret"
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Ugyldig markørsvarkode, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d har nekta fila %s"
@@ -7228,12 +7491,6 @@ msgstr "Filsending"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbraut overføringa av %s"
 
-msgid "Connection lost"
-msgstr "Tapt tilkopling"
-
-msgid "Login failed, no reply"
-msgstr "Klarte ikkje å logga på: ikkje noko svar"
-
 msgid "Do you want to add this buddy?"
 msgstr "Vil du leggja til denne vennen?"
 
@@ -7270,6 +7527,14 @@ msgstr "Melding: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s er ikkje på vennelista di"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "Melding frå: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Tilkoplinga er lukka (skrivande)"
 
@@ -7863,6 +8128,7 @@ msgstr "<br><b>Kanal-HMAC:</b> %s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanalemne:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanaltilstandar:</b> "
 
@@ -7887,6 +8153,7 @@ msgstr "Kanaltilgangsfrase"
 msgid "Channel Public Keys List"
 msgstr "Liste over kanalen sine offentleg nøklar"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -7904,7 +8171,7 @@ msgid "Channel Authentication"
 msgstr "Kanalautentisering"
 
 msgid "Add / Remove"
-msgstr "Legg til/fjern"
+msgstr "Legg til / fjern"
 
 msgid "Group Name"
 msgstr "Gruppenamn"
@@ -8275,9 +8542,14 @@ msgstr "Klarer ikkje å kjøra SILC-protokollen"
 msgid "Error loading SILC key pair"
 msgstr "Feil under lasting av SILC nøkkelpar"
 
+#, c-format
+msgid "Download %s: %s"
+msgstr "Last ned %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Sinnsstemninga di no"
 
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -8658,41 +8930,51 @@ msgstr "Tavle"
 msgid "No server statistics available"
 msgstr "Ingen tilgjengelege tenarstatistikkar"
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil: versjonsfeil - oppgrader klienten din"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
-"Feil: den andre sida stoler ikkje på/støttar ikkje den offentlege nøkkelen "
+"Feil: den andre sida stoler ikkje på / støttar ikkje den offentlege nøkkelen "
 "din"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne nøkkelutvekslingsgruppa"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Feil: den andre sida støttar ikkje den føreslegne krypteringsmetoden"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne krypteringsstandarden for "
 "den offentlege nøkkelen (PKCS)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne nøkkelfunksjonen (hash)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne meldingsstadfestingskoden "
 "(HMAC)"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Feil: ugyldig signatur"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Feil: ugyldig informasjonskapsel"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Feil: autentiseringa feila"
 
@@ -8718,12 +9000,6 @@ msgstr "Ukjent tenarsvar."
 msgid "Could not create listen socket"
 msgstr "Klarte ikkje å laga lytte-endepunkt"
 
-msgid "Couldn't resolve host"
-msgstr "Vertsoppslaget feila"
-
-msgid "Could not resolve hostname"
-msgstr "Vertsnamnoppslaget feila"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brukarnamn kan ikkje innehalda mellomrom eller @-teikn"
 
@@ -8792,6 +9068,7 @@ msgstr "%s er ikkje pålogga no."
 msgid "Warning of %s not allowed."
 msgstr "Det er ikkje tillate å åtvara mot %s."
 
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ei melding er blitt vraka - du går ut over tenaren si fartsgrense."
 
@@ -8811,30 +9088,39 @@ msgstr "%s sendte deg ei melding som ikkje kom fram: ho var for stor."
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s sendte deg ei melding som ikkje kom fram: ho var sendt for fort."
 
+#, c-format
 msgid "Failure."
 msgstr "Svikt."
 
+#, c-format
 msgid "Too many matches."
 msgstr "For mange treff."
 
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Treng fleire parametrar."
 
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtenesta er mellombels utilgjengeleg."
 
+#, c-format
 msgid "Email lookup restricted."
 msgstr "E-postoppslag er avgrensa."
 
+#, c-format
 msgid "Keyword ignored."
 msgstr "Nøkkelord er ignorert."
 
+#, c-format
 msgid "No keywords."
 msgstr "Ingen nøkkelord."
 
+#, c-format
 msgid "User has no directory information."
 msgstr "Brukaren har ingen katalogopplysningar."
 
+#, c-format
 msgid "Country not supported."
 msgstr "Land er ikkje støtta."
 
@@ -8842,15 +9128,19 @@ msgstr "Land er ikkje støtta."
 msgid "Failure unknown: %s."
 msgstr "Ukjent svikt: %s."
 
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord."
 
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Tenesta er mellombels utilgjengeleg."
 
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Åtvaringsnivået ditt er for tida for høgt til at du kan logga på."
 
+#, c-format
 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."
@@ -9160,9 +9450,6 @@ msgstr "Klarer ikkje å laga filskildring."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s prøver å senda deg ei gruppe med %d-filer.\n"
 
-msgid "Write Error"
-msgstr "Skrivefeil"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9456,6 +9743,14 @@ msgstr "Klarte ikkje å slå opp %s"
 msgid "Could not resolve host name"
 msgstr "Klarte ikkje å slå opp vertsnamnet"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Ber om merksemda til %s…"
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s har bede om merksemda di!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9485,14 +9780,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s er no kjend som %s. \n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "Ber om merksemda til %s…"
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s har bede om merksemda di!"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9507,6 +9794,20 @@ msgstr "%s har invitert %s til praterommet %s\n"
 msgid "Accept chat invitation?"
 msgstr "Tek du i mot invitasjonen?"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "Snarveg"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Tekstsnarvegen til smilefjeset"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Lagra bilete"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Lagra bilete (det får halda no)."
+
 msgid "SSL Connection Failed"
 msgstr "SSL_sambandet feila"
 
@@ -9562,6 +9863,12 @@ msgstr "+++ %s blei uverksam"
 msgid "+++ %s became unidle"
 msgstr "%s vart verksam igjen"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9657,21 +9964,30 @@ msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Sambandet avbrote av annan programvare på datamaskina di."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "Fjerntenaren kopla ned sambandet."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "Tidsavbrot på sambandet."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "Tilkoplinga blei avvist."
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Adressa er allereie i bruk."
+
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
 
@@ -9779,8 +10095,8 @@ msgstr "Legg til konto"
 msgid "_Basic"
 msgstr "_Grunnleggjande"
 
-msgid "Create this new account on the server"
-msgstr "Opprett denne nye kontoen på tenaren"
+msgid "Create _this new account on the server"
+msgstr "Opprett denne _nye kontoen på tenaren"
 
 msgid "_Advanced"
 msgstr "A_vansert"
@@ -9881,6 +10197,12 @@ msgstr "Ka_llenamn…"
 msgid "_Remove"
 msgstr "_Fjern"
 
+msgid "Set Custom Icon"
+msgstr "Tilpassa ikon"
+
+msgid "Remove Custom Icon"
+msgstr "Fjern eige ikon"
+
 msgid "Add _Buddy..."
 msgstr "Legg til _venn…"
 
@@ -9978,8 +10300,8 @@ msgstr "/Vennar/Avsl_utt"
 msgid "/_Accounts"
 msgstr "/K_ontoar"
 
-msgid "/Accounts/Manage"
-msgstr "/Kontoar/Behandla"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Kontoar/Kontobehandling"
 
 #. Tools
 msgid "/_Tools"
@@ -10000,6 +10322,9 @@ msgstr "/Verktøy/_Innstillingar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
+msgid "/Tools/Smile_y"
+msgstr "/Verktøy/Smile_fjes"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
@@ -10163,15 +10488,15 @@ 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
-"<span weight='bold' size='larger'>Velkomen til %s!</span>\n"
+"<span weight='bold' size='larger'>Velkomen til %s.</span>\n"
 "\n"
 "Ingen av kontoane dine er i bruk. Ta lynmeldingskontoane dine i bruk frå "
-"<b>konto</b>-vindauget: <b>Kontoar->Legg til/endra</b>. Når kontoane er "
-"tekne i bruk, vil du vera i stand til å logga på, velja tilstand, og tala "
-"med vennane dine."
+"<b>konto</b>-vindauget: <b>Kontoar->Behandla</b>. Når kontoane er tekne i "
+"bruk, vil du vera i stand til å logga på, velja tilstand, og tala med "
+"vennane dine."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10230,6 +10555,12 @@ msgstr "L_ukk praten når vindauget blir lukka."
 msgid "Please enter the name of the group to be added."
 msgstr "Skriv inn namnet på gruppa du ønskjer å leggja til."
 
+msgid "Enable Account"
+msgstr "Ta konto i bruk"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoar/"
 
@@ -10242,12 +10573,6 @@ msgstr "Ingen tilgjengelege handlingar"
 msgid "_Disable"
 msgstr "_Slå av"
 
-msgid "Enable Account"
-msgstr "Ta konto i bruk"
-
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
-
 msgid "/Tools"
 msgstr "/V_erktøy"
 
@@ -10332,9 +10657,6 @@ msgstr "Bruk eige ikon…"
 msgid "Change Size"
 msgstr "Endra storleiken"
 
-msgid "Remove Custom Icon"
-msgstr "Fjern eige ikon"
-
 msgid "Show All"
 msgstr "Vis alt"
 
@@ -10601,12 +10923,13 @@ msgstr "Feil"
 msgid "Fatal Error"
 msgstr "Alvorleg feil"
 
-msgid "lead developer"
-msgstr "sjefsutviklar"
-
 msgid "developer"
 msgstr "utviklar"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "brukarstøtte"
 
@@ -10638,6 +10961,9 @@ msgstr "XMPP-utviklar"
 msgid "original author"
 msgstr "opprinneleg laga av"
 
+msgid "lead developer"
+msgstr "sjefsutviklar"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -10774,6 +11100,9 @@ msgstr "Nederlandsk, flamsk"
 msgid "Norwegian Nynorsk"
 msgstr "Norsk (nynorsk)"
 
+msgid "Occitan"
+msgstr "Oksitansk"
+
 msgid "Punjabi"
 msgstr "Panjabi"
 
@@ -10872,6 +11201,7 @@ msgstr ""
 "fullstendig liste over bidragsytarar. Programmet kjem utan nokon som helst "
 "form for garanti.<BR><BR>"
 
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin på irc.freenode.net<BR><BR>"
 
@@ -11011,23 +11341,35 @@ msgstr "_Fjern praterom"
 msgid "Right-click for more unread messages...\n"
 msgstr "Høgreklikk for fleire ulesne meldingar…\n"
 
-msgid "Change Status"
-msgstr "Endra tilstand"
+msgid "_Change Status"
+msgstr "_Endra status"
+
+msgid "Show Buddy _List"
+msgstr "Vis venne_liste"
+
+msgid "_Unread Messages"
+msgstr "_Ulesne meldingar"
 
-msgid "Show Buddy List"
-msgstr "Vis vennelista"
+msgid "New _Message..."
+msgstr "N_y melding…"
 
-msgid "New Message..."
-msgstr "Ny melding…"
+msgid "_Accounts"
+msgstr "_Kontoar"
 
-msgid "Mute Sounds"
-msgstr "Demp lydar"
+msgid "Plu_gins"
+msgstr "Program_tillegg"
 
-msgid "Blink on New Message"
-msgstr "Blink ved ny melding"
+msgid "Pr_eferences"
+msgstr "_Innstillingar "
 
-msgid "Quit"
-msgstr "Avslutt"
+msgid "Mute _Sounds"
+msgstr "_Demp lydar"
+
+msgid "_Blink on New Message"
+msgstr "_Blink ved ny melding"
+
+msgid "_Quit"
+msgstr "Avsl_utt"
 
 msgid "Not started"
 msgstr "Ikkje begynt"
@@ -11087,6 +11429,14 @@ msgstr "_Fjern ferdige overføringar"
 msgid "File transfer _details"
 msgstr "Filoverføringsdetaljar"
 
+#. Pause button
+msgid "_Pause"
+msgstr "_Pause"
+
+#. Resume button
+msgid "_Resume"
+msgstr "_Hald fram"
+
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
@@ -11133,6 +11483,12 @@ msgstr "Handlingsmelding"
 msgid "Color to draw the name of an action message."
 msgstr "Farge for å teikna namnet til ei handlingsmelding."
 
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Handlingsmeldingsfarge for kviskra melding"
+
+msgid "Whisper Message Name Color"
+msgstr "Fargenamn kviskremelding"
+
 msgid "Typing notification color"
 msgstr "Skrivevarselfarge"
 
@@ -11149,7 +11505,7 @@ msgid "Enable typing notification"
 msgstr "Slå på skrivevarsel"
 
 msgid "_Copy Email Address"
-msgstr "_Kopier e-postadresse"
+msgstr "_Kopier e-postadressa"
 
 msgid "_Open Link in Browser"
 msgstr "_Opna lenkja i nettlesar"
@@ -11198,9 +11554,14 @@ msgstr ""
 msgid "Save Image"
 msgstr "Lagra bilete"
 
+#, c-format
 msgid "_Save Image..."
 msgstr "_Lagra bilete…"
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Legg til eige smilefjes…"
+
 msgid "Select Font"
 msgstr "Vel skrifttype"
 
@@ -11239,9 +11600,21 @@ msgstr "Klarte ikkje å lagra bilete: %s\n"
 msgid "Insert Image"
 msgstr "Legg til bilete"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Smilefjeset er ikkje i bruk sia det allereie finst eit tilpassa smilefjes "
+"til denne snarvegen:\n"
+"%s"
+
 msgid "Smile!"
 msgstr "Smil!"
 
+msgid "_Manage custom smileys"
+msgstr "_Smilefjesbehandling"
+
 msgid "This theme has no available smileys."
 msgstr "Temaet har ingen tilgjengelege smilefjes."
 
@@ -11907,21 +12280,27 @@ msgstr "Loggfør alle _statusendringar i systemloggen"
 msgid "Sound Selection"
 msgstr "Lydval"
 
+#, c-format
 msgid "Quietest"
 msgstr "Stillaste"
 
+#, c-format
 msgid "Quieter"
 msgstr "Stillare"
 
+#, c-format
 msgid "Quiet"
 msgstr "Stille"
 
+#, c-format
 msgid "Loud"
 msgstr "Høg"
 
+#, c-format
 msgid "Louder"
 msgstr "Høgare"
 
+#, c-format
 msgid "Loudest"
 msgstr "Høgast"
 
@@ -11954,6 +12333,12 @@ msgstr "Volum:"
 msgid "Play"
 msgstr "Spel"
 
+msgid "_Browse..."
+msgstr "Bla &gjennom…"
+
+msgid "_Reset"
+msgstr "_Nullstill"
+
 msgid "_Report idle time:"
 msgstr "Vis kor lenge _uverksam:"
 
@@ -12123,6 +12508,47 @@ msgstr "L_agra og bruk"
 msgid "Status for %s"
 msgstr "Status for %s"
 
+msgid "Custom Smiley"
+msgstr "Tilpassa smilefjes"
+
+msgid "Duplicate Shortcut"
+msgstr "Duplisert snarveg"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Det finst allereie eit tilpassa smilefjes til denne snarvegen. Vel ein annan "
+"snarveg."
+
+msgid "More Data needed"
+msgstr "Treng fleire opplysningar"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Før opp ein snarveg knytt til smilefjeset."
+
+msgid "Please select an image for the smiley."
+msgstr "Vel eit bilete til smilefjeset."
+
+msgid "Edit Smiley"
+msgstr "Endra smilefjes"
+
+msgid "Add Smiley"
+msgstr "Legg til smilefjes"
+
+msgid "Smiley _Image"
+msgstr "Smilefjesbilete"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "_Smilefjessnarveg"
+
+msgid "Smiley"
+msgstr "Smilefjes"
+
+msgid "Custom Smiley Manager"
+msgstr "Tilpassa smilefjesbehandling"
+
 msgid "Waiting for network connection"
 msgstr "Ventar på nettverkssamband"
 
@@ -12262,9 +12688,6 @@ msgstr "_Endra"
 msgid "_Open Mail"
 msgstr "_Opna e-post"
 
-msgid "_Pause"
-msgstr "_Pause"
-
 msgid "Pidgin Tooltip"
 msgstr "Pidgin-verktøyhint"
 
@@ -12280,9 +12703,6 @@ msgstr "Å velja dette tek vekk bruk av grafiske smilefjes."
 msgid "none"
 msgstr "ingen"
 
-msgid "Display Statistics"
-msgstr "Vis statistikk"
-
 msgid "Response Probability:"
 msgstr "Sannsynleg svar:"
 
@@ -12533,7 +12953,7 @@ msgid "_Associate Buddy"
 msgstr "_Knyt til venn"
 
 msgid "Unable to send email"
-msgstr "Klarte ikkje å senda e-postmeldinga"
+msgstr "Klarer ikkje å senda e-posten"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr "Evolution si programfil blei ikkje funnen i filbana (PATH)."
@@ -12545,7 +12965,7 @@ msgid "Add to Address Book"
 msgstr "Legg til i adresseboka"
 
 msgid "Send Email"
-msgstr "Send e-post"
+msgstr "Send melding"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -12591,7 +13011,7 @@ msgid "Last name:"
 msgstr "Etternamn:"
 
 msgid "Email:"
-msgstr "E-post:"
+msgstr "E-postadresse:"
 
 #. *< type
 #. *< ui_requirement
@@ -12846,6 +13266,7 @@ msgstr "Varslingsvindauge"
 msgid "Select Color"
 msgstr "Vel farge"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "Vel grensesnittskrift"
 
@@ -13070,6 +13491,7 @@ msgstr "Vis  iChat-liknande tidsstempel kvart N. minutt."
 msgid "Timestamp Format Options"
 msgstr "Formateringsval for tidsstempel"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Tving 24h tidsformat"
 
@@ -13244,8 +13666,57 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
-#~ msgid "_Resume"
-#~ msgstr "_Hald fram"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Kode [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Gruppehandlingsfeil"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "Klarte ikkje å lagra endepunktsval"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Feil ved førespurnad om påloggingsmarkør"
+
+#~ msgid "TCP Address"
+#~ msgstr "TCP-adresse"
+
+#~ msgid "UDP Address"
+#~ msgstr "UDP-adresse"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Windows Live ID-autentisering: finn ikkje autentiseringsmarkøren i svaret "
+#~ "frå tenaren"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Windows Live ID-autentiseringa feila"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "For vond (sendar)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "For vond (mottakar)"
+
+#~ msgid "/Accounts/Manage"
+#~ msgstr "/Kontoar/Behandla"
+
+#~ msgid "Available Message"
+#~ msgstr "Tilgjengeleg melding"
+
+#~ msgid "Away Message"
+#~ msgstr "Fråværsmelding"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(hentar)</i>"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-post"
+
+#~ msgid "E-mail"
+#~ msgstr "E-post"
 
 #~ msgid "IT'S A LION! GET IN THE CAR!"
 #~ msgstr "IT'S A LION! GET IN THE CAR!"
@@ -13253,9 +13724,6 @@ msgstr ""
 #~ msgid "Screen name:"
 #~ msgstr "Brukarnamn:"
 
-#~ msgid "Screen Name"
-#~ msgstr "Brukarnamn"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Nokon seier brukarnamnet ditt i praterommet"
 
@@ -13362,6 +13830,9 @@ msgstr ""
 #~ "\n"
 #~ "%s har skrive noko og stoppa"
 
+#~ msgid "Display Statistics"
+#~ msgstr "Vis statistikk"
+
 #~ msgid "S_mile!"
 #~ msgstr "S_mil!"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5fa951fcec..e84a54c6d1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,6 +1,6 @@
 # Pidgin Portuguese (Brazilian) translation
 # Copyright (C) 2003-2007, Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail.com>
-# Copyright (C) 2008, Rodrigo Luiz Marques Flores <rodrigomarquesflores@gmail.com>
+# Copyright (C) 2008, Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -8,12 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-07 03:21-0400\n"
-"PO-Revision-Date: 2008-05-08 14:58-0300\n"
-"Last-Translator: Rodrigo Luiz Marques Flores <rodrigomarquesflores@gmail."
-"com>\n"
-"Language-Team: Rodrigo Luiz Marques Flores <rodrigomarquesflores@gmail."
-"com>\n"
+"POT-Creation-Date: 2008-08-15 11:59-0400\n"
+"PO-Revision-Date: 2008-08-13 13:55-0300\n"
+"Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
+"Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,17 +19,13 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Tente `%s -h' para mais informações.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -52,7 +46,6 @@ msgstr ""
 "  -n, --nologin       não conecte automaticamente\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:738
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -63,253 +56,104 @@ msgstr ""
 "investigar e completar a migração manualmente. Pedimos também que você "
 "relate este erro em http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:595
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772 ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244 ../finch/gntrequest.c:380 ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310 ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121 ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2079
-#: ../libpurple/protocols/jabber/chat.c:682
-#: ../libpurple/protocols/jabber/chat.c:693
-#: ../libpurple/protocols/jabber/jabber.c:1594
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erro"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "A conta não foi adicionada"
 
-#: ../finch/gntaccount.c:125
 msgid "Username of an account must be non-empty."
 msgstr "O nome de usuário de uma conta não pode ser vazio."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notificar ao receber novos emails"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Lembrar senha"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Não há nenhum plug-in de protocolo instalado."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Provavelmente você esqueceu de digitar 'make install')"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1449 ../pidgin/gtkblist.c:4671
 msgid "Modify Account"
 msgstr "Modificar conta"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Username:"
 msgstr "Nome de usuário:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Apelido:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Criar esta conta no servidor"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:641 ../finch/gntblist.c:747
-#: ../finch/gntblist.c:782 ../finch/gntblist.c:1134 ../finch/gntblist.c:1360
-#: ../finch/gntblist.c:1494 ../finch/gntblist.c:2661 ../finch/gntblist.c:2712
-#: ../finch/gntblist.c:2776 ../finch/gntblist.c:2838 ../finch/gntcertmgr.c:90
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:471 ../finch/gntpounce.c:679
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1064 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:178 ../libpurple/account.c:1118
-#: ../libpurple/account.c:1437 ../libpurple/account.c:1472
-#: ../libpurple/conversation.c:1235 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:758
-#: ../libpurple/protocols/jabber/buddy.c:2473
-#: ../libpurple/protocols/jabber/buddy.c:2509
-#: ../libpurple/protocols/jabber/chat.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#: ../libpurple/protocols/jabber/jabber.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/jabber/si.c:1118
-#: ../libpurple/protocols/jabber/usermood.c:199
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:403
-#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
-#: ../libpurple/protocols/msn/msn.c:373 ../libpurple/protocols/msnp9/msn.c:284
-#: ../libpurple/protocols/msnp9/msn.c:301
-#: ../libpurple/protocols/msnp9/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:356
-#: ../libpurple/protocols/myspace/user.c:582
-#: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6207
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:120
-#: ../libpurple/protocols/qq/group_opt.c:375
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3440
-#: ../libpurple/protocols/sametime/sametime.c:3526
-#: ../libpurple/protocols/sametime/sametime.c:3700
-#: ../libpurple/protocols/sametime/sametime.c:5453
-#: ../libpurple/protocols/sametime/sametime.c:5543
-#: ../libpurple/protocols/sametime/sametime.c:5668
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc/chat.c:753
-#: ../libpurple/protocols/silc/ops.c:1833
-#: ../libpurple/protocols/silc/silc.c:1039
-#: ../libpurple/protocols/silc/silc.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:742
-#: ../libpurple/protocols/silc10/silc.c:948
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
-#: ../libpurple/protocols/yahoo/yahoo.c:3575 ../pidgin/gtkaccount.c:1843
-#: ../pidgin/gtkaccount.c:2404 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkblist.c:6879 ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:767 ../pidgin/gtkdialogs.c:906
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1042 ../pidgin/gtkdialogs.c:1064
-#: ../pidgin/gtkdialogs.c:1112 ../pidgin/gtkdialogs.c:1153
-#: ../pidgin/gtkdialogs.c:1209 ../pidgin/gtkdialogs.c:1248
-#: ../pidgin/gtkdialogs.c:1275 ../pidgin/gtkimhtmltoolbar.c:438
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:302 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1619
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1471 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:757 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkdebug.c:746 ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Salvar"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1834
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1613
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Você tem certeza de que deseja remover %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Remover conta"
 
 #. Delete button
-#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1842 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1618
 msgid "Delete"
 msgstr "Remover"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2528 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2263 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Você pode ativar/desativar as contas a partir da lista abaixo."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:640
-#: ../finch/gntblist.c:747 ../finch/gntblist.c:782 ../finch/gntblist.c:2947
-#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5542
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2403
-#: ../pidgin/gtkblist.c:6878 ../pidgin/gtkconv.c:1699
-#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Adicionar"
 
 #. Modify button
-#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2350
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fez de %s seu amigo(a)%s%s"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2402
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo à sua lista?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quer adicionar %s a lista de amigos dele(a)%s%s"
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2483
-#: ../pidgin/gtkaccount.c:2490
 msgid "Authorize buddy?"
 msgstr "Autorizar amigo?"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2484 ../pidgin/gtkaccount.c:2491
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkaccount.c:2492
 msgid "Deny"
 msgstr "Negar"
 
-#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -318,12 +162,10 @@ msgstr ""
 "Conectados: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Conta: %s (%s)"
 
-#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
@@ -332,424 +174,219 @@ msgstr ""
 "\n"
 "Visto pela última vez: %s atrás"
 
-#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Padrão"
 
-#: ../finch/gntblist.c:584
 msgid "You must provide a username for the buddy."
 msgstr "Você precisa digitar um nome de usuário para o amigo."
 
-#: ../finch/gntblist.c:586
 msgid "You must provide a group."
 msgstr "Você precisa digitar um grupo."
 
-#: ../finch/gntblist.c:588
 msgid "You must select an account."
 msgstr "Você precisa selecionar uma conta."
 
-#: ../finch/gntblist.c:590
 msgid "The selected account is not online."
 msgstr "A conta selecionada não está conectada."
 
-#: ../finch/gntblist.c:595
 msgid "Error adding buddy"
 msgstr "Erro ao adicionar amigo"
 
-#: ../finch/gntblist.c:622 ../libpurple/protocols/irc/irc.c:974
-#: ../libpurple/protocols/irc/msgs.c:364
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:976
-#: ../libpurple/protocols/oscar/oscar.c:2942
-#: ../libpurple/protocols/oscar/oscar.c:3959
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1210
-#: ../libpurple/protocols/silc/ops.c:1213
-#: ../libpurple/protocols/silc/ops.c:1349
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc/silc.c:1221
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtksavedstatuses.c:971
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: ../finch/gntblist.c:625
 msgid "Alias (optional)"
 msgstr "Apelidar contato (opcional)"
 
-#: ../finch/gntblist.c:628
 msgid "Add in group"
 msgstr "Adicionar no grupo"
 
-#: ../finch/gntblist.c:632 ../finch/gntblist.c:726 ../finch/gntblist.c:1705
-#: ../finch/gntblist.c:2642 ../finch/gntblist.c:2698 ../finch/gntblist.c:2763
-#: ../finch/gntblist.c:2823 ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3319 ../pidgin/gtknotify.c:526
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Conta"
 
-#: ../finch/gntblist.c:638 ../finch/gntblist.c:1183
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6427
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
 
-#: ../finch/gntblist.c:638
 msgid "Please enter buddy information."
 msgstr "Favor digitar as informações do amigo."
 
-#: ../finch/gntblist.c:694 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Bate-papos"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:732 ../finch/gntblist.c:2637 ../finch/gntblist.c:2693
-#: ../finch/gntblist.c:2818 ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/jabber/jabber.c:994
-#: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1595
-#: ../libpurple/protocols/msnp9/msn.c:1660
-#: ../libpurple/protocols/msnp9/msn.c:1687
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:766
-#: ../pidgin/gtkroomlist.c:749
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:735 ../finch/gntblist.c:1646
-#: ../libpurple/protocols/msn/msn.c:1573
-#: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:609
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1017
-#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
-#: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Apelido"
 
-#: ../finch/gntblist.c:738 ../finch/gntblist.c:2963
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:742 ../finch/gntblist.c:1150
 msgid "Auto-join"
 msgstr "Entrar automaticamente"
 
-#: ../finch/gntblist.c:745 ../finch/gntblist.c:1185 ../pidgin/gtkblist.c:6792
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
-#: ../finch/gntblist.c:746
 msgid "You can edit more information from the context menu later."
 msgstr ""
 "Você poderá editar outras informações a partir do menu de contexto mais "
 "tarde."
 
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "Erro ao adicionar grupo."
 
-#: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
 msgstr "Você precisa dar um nome para o grupo a ser adicionado."
 
-#: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
 msgstr "Um grupo com este nome já existe."
 
-#: ../finch/gntblist.c:780 ../finch/gntblist.c:1187
-#: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5540 ../pidgin/gtkblist.c:6875
 msgid "Add Group"
 msgstr "Criar grupo"
 
-#: ../finch/gntblist.c:780
 msgid "Enter the name of the group"
 msgstr "Digite o nome do grupo"
 
-#: ../finch/gntblist.c:1133 ../pidgin/gtkblist.c:683
 msgid "Edit Chat"
 msgstr "Modificar bate-papo"
 
-#: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "Favor atualizar os campos necessários."
 
-#: ../finch/gntblist.c:1134 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:1159
 msgid "Edit Settings"
 msgstr "Modificar configurações"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Informações"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "Obtendo..."
 
-#: ../finch/gntblist.c:1249 ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:906
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Ver info"
 
-#: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
 msgstr "Adicionar ação de usuário"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1260 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1118
-#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1647
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: ../finch/gntblist.c:1267 ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../finch/gntblist.c:1273 ../finch/gntblist.c:1662 ../finch/gntblist.c:2832
 msgid "View Log"
 msgstr "Ver histórico"
 
-#: ../finch/gntblist.c:1355
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Favor digitar o novo nome para %s"
 
-#: ../finch/gntblist.c:1357 ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../finch/gntblist.c:1357
 msgid "Set Alias"
 msgstr "Definir apelido"
 
-#: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
 msgstr "Para redefinir o nome, deixe o campo em branco."
 
-#: ../finch/gntblist.c:1472
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Remover este contato também removerá todos os amigos associados a ele"
 
-#: ../finch/gntblist.c:1480
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Remover este grupo também removerá todos os amigos associados a ele"
 
-#: ../finch/gntblist.c:1485
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Você tem certeza de que deseja remover %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "Confirmar remoção"
 
-#: ../finch/gntblist.c:1493 ../finch/gntblist.c:1648 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1696 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:268
 msgid "Remove"
 msgstr "Remover"
 
 #. Buddy List
-#: ../finch/gntblist.c:1622 ../finch/gntblist.c:3004 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5166
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1653
 msgid "Place tagged"
 msgstr "Local marcado"
 
-#: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
 msgstr "(Des)ativar marca"
 
 #. General
-#: ../finch/gntblist.c:1698 ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1284
-#: ../libpurple/protocols/jabber/buddy.c:2264
-#: ../libpurple/protocols/jabber/buddy.c:2456
-#: ../libpurple/protocols/jabber/jabber.c:1002
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/jabber.c:1656
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1598
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1016
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3343
 msgid "Nickname"
 msgstr "Apelido"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1720 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:981
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:541
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2966
-#: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3371
-#: ../pidgin/gtkblist.c:3831 ../pidgin/gtkprefs.c:2056
 msgid "Idle"
 msgstr "Inativo"
 
-#: ../finch/gntblist.c:1734
 msgid "On Mobile"
 msgstr "No celular"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:2042 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Salvo..."
 
-#: ../finch/gntblist.c:2496 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:715
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../finch/gntblist.c:2650 ../finch/gntblist.c:2655
 msgid "Block/Unblock"
 msgstr "Bloquear/Desbloquear"
 
-#: ../finch/gntblist.c:2651 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../finch/gntblist.c:2652 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../finch/gntblist.c:2657
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Por favor digite o nome de usuário ou o apelido da pessoa para quem você deseja Bloquear/ "
-"Desbloquear."
+"Por favor digite o nome de usuário ou o apelido da pessoa para quem você "
+"deseja Bloquear/ Desbloquear."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2660 ../finch/gntblist.c:2711 ../finch/gntblist.c:2837
-#: ../finch/gntcertmgr.c:89 ../finch/gntconn.c:137 ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
-#: ../libpurple/account.c:1436 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1786
-#: ../libpurple/protocols/jabber/xdata.c:402
-#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
-#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
-#: ../libpurple/protocols/msnp9/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:300
-#: ../libpurple/protocols/msnp9/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:334
-#: ../libpurple/protocols/myspace/user.c:581
-#: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6206
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc/chat.c:752
-#: ../libpurple/protocols/silc/ops.c:1306
-#: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1038
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1909
-#: ../libpurple/protocols/silc10/silc.c:741
-#: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3563
-#: ../libpurple/protocols/yahoo/yahoo.c:3574 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:766 ../pidgin/gtkdialogs.c:905
-#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2706 ../pidgin/gtkdialogs.c:761
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: ../finch/gntblist.c:2708 ../pidgin/gtkdialogs.c:763
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa para quem você deseja mandar "
 "mensagens instantâneas."
 
-#: ../finch/gntblist.c:2759
 msgid "Channel"
 msgstr "Canal"
 
-#: ../finch/gntblist.c:2771 ../pidgin/gtkblist.c:1036
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../finch/gntblist.c:2773
 msgid "Please enter the name of the chat you want to join."
 msgstr ""
 "Por favor digite a URL do bate-papo no qual você gostaria de ingressar."
 
-#: ../finch/gntblist.c:2775 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Entrar"
 
-#: ../finch/gntblist.c:2834 ../pidgin/gtkdialogs.c:994
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -757,83 +394,63 @@ msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2882 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Opções"
 
-#: ../finch/gntblist.c:2888
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2893
 msgid "Block/Unblock..."
 msgstr "Bloquear/Desbloquear..."
 
-#: ../finch/gntblist.c:2898
 msgid "Join Chat..."
 msgstr "Entrar em um bate-papo..."
 
-#: ../finch/gntblist.c:2903 ../finch/gntconv.c:611
 msgid "View Log..."
 msgstr "Ver Log..."
 
-#: ../finch/gntblist.c:2908
+msgid "View All Logs"
+msgstr "Ver Todos os Logs"
+
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../finch/gntblist.c:2913
 msgid "Empty groups"
 msgstr "Grupos vazios"
 
-#: ../finch/gntblist.c:2920
 msgid "Offline buddies"
 msgstr "Amigos desconectados"
 
-#: ../finch/gntblist.c:2927
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../finch/gntblist.c:2932
 msgid "By Status"
 msgstr "Por status"
 
-#: ../finch/gntblist.c:2937 ../pidgin/gtkblist.c:4322
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../finch/gntblist.c:2942
 msgid "By Log Size"
 msgstr "Por tamanho do histórico"
 
-#: ../finch/gntblist.c:2953
 msgid "Buddy"
 msgstr "Amigo"
 
-#: ../finch/gntblist.c:2958 ../libpurple/protocols/oscar/oscar.c:649
-#: ../libpurple/protocols/silc/silc.c:984
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: ../finch/gntblist.c:2968 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Agrupamento"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Importação de certificado"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Especifique um nome de host"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Digite o nome de host para o qual este certificado será gerado."
 
-#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -842,19 +459,15 @@ msgstr ""
 "O arquivo %s não pôde ser importado.\n"
 "Verifique que este arquivo pode ser acessado e que ele está no formato PEM.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Erro ao importar certificado"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Falha ao importar certificado X.509"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Selecione um certificado PEM"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -863,24 +476,19 @@ msgstr ""
 "Falha ao exportar para o arquivo %s.\n"
 "Verifique se você tem permissão de escrita na pasta de destino\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Erro ao exportar certificado"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Falha ao exportar certificado X.509"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "Exportar certificado PEM X.509"
 
-#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificado de %s"
 
-#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -893,57 +501,38 @@ msgstr ""
 "Impressão digital SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "Certificado SSL do host"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Tem certeza de que deseja deletar o certificado de %s?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Confirmação de remoção de certificado"
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Gerenciador de certificados"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
-#: ../libpurple/protocols/silc/silc.c:1223
-#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Nome do host"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1675
-#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:417 ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2377
-#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Fechar"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -956,58 +545,47 @@ msgstr ""
 "O Finch não tentará reconectar esta conta até que você corrija o erro e "
 "reative a mesma."
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Re-ativar conta"
 
-#: ../finch/gntconn.c:156
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
-msgstr "A conta desconectou-se e você não está mais neste bate-papo. Você "
-"entrará automaticamente no bate-papo quando a conta reconectar-se. "
+msgstr ""
+"A conta desconectou-se e você não está mais neste bate-papo. Você entrará "
+"automaticamente no bate-papo quando a conta reconectar-se. "
 
-#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "Comando inexistente."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:495
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Erro de sintaxe:  Você digitou um número incorreto de argumentos para este "
 "comando."
 
-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:501
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:508
 msgid "That command only works in chats, not IMs."
 msgstr "Este comando só funciona em bate-papos, não em conversas."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:511
 msgid "That command only works in IMs, not chats."
 msgstr "Este comando só funciona em conversas, não em bate-papos."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:516
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando não funciona neste protocolo."
 
-#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "A mensagem não pôde ser enviada porque você não está conectado."
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3540
 #, c-format
 msgid ""
 "\n"
@@ -1016,69 +594,72 @@ msgstr ""
 "\n"
 "%s está digitando..."
 
-#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Você saiu deste bate-papo."
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1381
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Gravação de histórico iniciada. A partir de agora, as mensagens desta "
 "conversa serão gravadas."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1389
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Gravação de histórico parada. A partir de agora, as mensagens dessa conversa "
 "não serão gravadas."
 
-#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Enviar para"
 
-#: ../finch/gntconv.c:568
+msgid "Invite message"
+msgstr "Mensagem de convite"
+
+msgid "Invite"
+msgstr "Convidar"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Por favor, digite o nome do usuário que você gostaria de\n"
+" convidar, junto com uma mensagem de convite opcional."
+
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Limpar tela"
 
-#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Exibir marcações de tempo"
 
-#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Adicionar ação de usuário..."
 
-#: ../finch/gntconv.c:615
+msgid "Invite..."
+msgstr "Convidar..."
+
 msgid "Enable Logging"
 msgstr "Ativar histórico"
 
-#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Ativar sons"
 
-#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-RESPOSTA> "
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:970
-msgid "List of users:\n"
-msgstr "Lista de usuários:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lista de %d usuário:\n"
+msgstr[1] "Lista de %d usuários:\n"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:340
 msgid "Supported debug options are:  version"
 msgstr "As opções de depuração suportadas são:  version"
 
-#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:392
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:395
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1086,7 +667,18 @@ msgstr ""
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando específico.\n"
 "Os seguintes comandos estão disponíveis neste contexto:\n"
 
-#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7942
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s não é uma classe de mensagem válida. Veja '/help msgcolor' para mensagens "
+"de classes válidas."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s não é uma cor válida. Veja '/help msgcolor' para cores válidas."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1094,12 +686,10 @@ msgstr ""
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se você não "
 "estivesse usando um comando."
 
-#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7945
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ação&gt;:  Envia uma ação do tipo do IRC para um amigo ou bate-papo."
 
-#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7948
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1107,48 +697,50 @@ msgstr ""
 "debug &lt;opção&gt;:  Envia várias informações de depuração para a conversa "
 "atual."
 
-#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7951
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa a janela de conversa."
 
-#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7957
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando específico."
 
-#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Exibe a lista dos usuários que estão no bate-papo."
 
-#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plug-ins: Mostra a janela de plug-ins."
 
-#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de amigos."
 
-#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Mostra a janela de contas."
 
-#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Mostra a janela de depuração."
 
-#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: Mostra a janela de preferências"
 
-#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Mostra a janela de status salvos."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:945 ../pidgin/gtkconv.c:2681
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Define a cor "
+"para diferentes casses de mensagens na janela de conversação.<br>    &lt;"
+"class&gt;: recebimento, envio, destaque, ação, marcador de tempo<br>    &lt;"
+"foreground/background&gt;: preto, vermelho, verde, azul, branco, cinza, "
+"cinza escuro, magenta, ciano, padrão<br><br>EXEMPLO:<br>    msgcolor send "
+"cyan default"
+
 msgid "Unable to open file."
 msgstr "Não foi possível abrir arquivo."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
@@ -1156,144 +748,96 @@ msgstr "Janela de depuração"
 #. * 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:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filtrar:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Transferências de arquivo - %d%% de %d arquivos"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Transferências de arquivo - %d%% de %d arquivo"
+msgstr[1] "Transferências de arquivo - %d%% de %d arquivos"
 
 #. Create the window.
-#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferências de arquivos"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:380
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/jabber/buddy.c:812
-#: ../libpurple/protocols/jabber/buddy.c:971
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msnp9/msn.c:540
-#: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:822
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:2754
-#: ../libpurple/protocols/oscar/oscar.c:3817
-#: ../libpurple/protocols/sametime/sametime.c:3315
-#: ../libpurple/protocols/sametime/sametime.c:4206
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3415
-#: ../pidgin/gtkblist.c:3429 ../pidgin/gtkblist.c:3431
-#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Feche esta janela quando todas as transferências terminarem"
 
-#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Limpar transferências concluídas"
 
-#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Parar"
 
-#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Esperando o começo da transferência"
 
-#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Cancelada"
 
-#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Falhou"
 
-#: ../finch/gntft.c:436 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:447
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../finch/gntft.c:447
 msgid "Received"
 msgstr "Recebido"
 
-#: ../finch/gntft.c:448 ../pidgin/gtkft.c:160 ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "Concluída"
 
-#: ../finch/gntft.c:450
 #, c-format
 msgid "The file was saved as %s."
 msgstr "O arquivo foi salvo como %s."
 
-#: ../finch/gntft.c:457
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../finch/gntft.c:457
 msgid "Receiving"
 msgstr "Recebendo"
 
-#: ../finch/gntlog.c:184
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Conversas em %s no %s"
 
-#: ../finch/gntlog.c:187
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Conversas com %s no %s"
 
-#: ../finch/gntlog.c:230 ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:270 ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -1301,7 +845,6 @@ msgstr ""
 "Eventos do sistema só serão gravados se a preferência \"Gravar todas as "
 "mudanças de estados no log do sistema\" estiver ativada."
 
-#: ../finch/gntlog.c:274 ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -1309,111 +852,85 @@ msgstr ""
 "As mensagens instantâneas somente serão gravadas se a preferência \"Gravar "
 "todas as mensagens instantâneas\" estiver ativada."
 
-#: ../finch/gntlog.c:277 ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Os bate-papos só serão gravadas se a preferência \"Gravar todos os bate-papos"
 "\" estiver ativada."
 
-#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "Nenhum histórico foi encontrado"
 
-#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Tamanho total do histórico:"
 
 #. Search box *********
-#: ../finch/gntlog.c:338
 msgid "Scroll/Search: "
 msgstr "Rolagem/Pesquisa"
 
-#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversas no %s"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:724
-#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversas com %s"
 
-#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "All Conversations"
+msgstr "Todas as Conversas"
+
 msgid "System Log"
 msgstr "Histórico do sistema"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Você tem email!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:533
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:540
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) tem %d nova mensagem."
 msgstr[1] "%s (%s) tem %d novas mensagens."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
 msgstr "Novo email"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:972
 #, c-format
 msgid "Info for %s"
 msgstr "Informações de %s:"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:973
 msgid "Buddy Information"
 msgstr "Informações do amigo"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1636
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3525
-msgid "Invite"
-msgstr "Convidar"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(nome)"
 
-#: ../finch/gntnotify.c:426
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "ERRO"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "falha ao carregar o plug-in"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "falha ao descarregar o plug-in"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1430,42 +947,33 @@ msgstr ""
 "Site da web: %s\n"
 "Nome do arquivo: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "O plug-in precisa estar carregado antes que você possa configurá-lo."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Não há nenhuma opção de configuração para este plug-in"
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Erro ao carregar o plug-in"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "O arquivo selecionado não é um plug-in válido."
 
-#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "Favor abrir a janela de depuração e tentar novamente para ver a mensagem de "
 "erro exata."
 
-#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Selecione um plug-in para instalar"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Você pode (des)ativar plug-ins a partir da lista abaixo."
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Instalar plug-in..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Configurar Plug-in"
 
@@ -1474,387 +982,290 @@ msgstr "Configurar Plug-in"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2180
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Favor digitar o amigo que terá a ação."
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Nova ação de usuário"
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Editar ação de usuário"
 
-#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Quem terá a ação"
 
 #. Account:
-#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Nome do amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Executar quando o amigo..."
 
-#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Conectar"
 
-#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "Desconectar"
 
-#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "Ficar ausente"
 
-#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "Voltar da ausência"
 
-#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "Tornar-se inativo"
 
-#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "Não estiver mais inativo"
 
-#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "Começar a digitar"
 
-#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Pausar ao digitar"
 
-#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "Parar de digitar"
 
-#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "Enviar uma mensagem"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Ação"
 
-#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Abrir uma janela de MI"
 
-#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Exibir notificação popup"
 
-#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Enviar uma mensagem"
 
-#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Executar um comando"
 
-#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Tocar um som"
 
-#: ../finch/gntpounce.c:460
 msgid "Pounce only when my status is not Available"
 msgstr "Executar apenas quando meu status não for Disponível"
 
-#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Não foi possível criar ação de usuário"
 
-#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Você não tem nenhuma conta."
 
-#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Você precisa criar uma conta antes de poder criar uma ação de usuário."
 
-#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Você tem certeza de que deseja remover a ação sobre %s de %s?"
 
-#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Ações de usuário"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s começou a digitar para você (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s pausou ao digitar para você (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectou (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s voltou do estado 'Inativo' (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s voltou do estado 'Ausente' (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para você (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectou (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se tornou inativo (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se tornou ausente. (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s te enviou uma mensagem. (%s)"
 
-#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de ação desconhecido. Por favor reporte isso!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "A partir do uso do teclado"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2061
 msgid "From last sent message"
 msgstr "A partir da última mensagem enviada"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:948 ../pidgin/gtkprefs.c:956
-#: ../pidgin/gtkprefs.c:2060 ../pidgin/gtkprefs.c:2074
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Exibir tempo de inatividade"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Exibir amigos desconectados"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notificar amigos de que você está digitando"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Formato do histórico:"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Gravar MIs"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Gravar bate-papos"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Gravar mudanças de status no histórico do sistema"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Mostrar tempo de inatividade"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Mudar status após inatividade"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minutos antes de alterar o status"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Mudar status para"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1046 ../pidgin/gtkprefs.c:2147
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1617 ../pidgin/gtkprefs.c:2158
 msgid "Logging"
 msgstr "Históricos"
 
-#: ../finch/gntrequest.c:381
 msgid "You must fill all the required fields."
 msgstr "Você deve preencher todos os campos necessários."
 
-#: ../finch/gntrequest.c:382
 msgid "The required fields are underlined."
 msgstr "Os campos necessários estão sublinhados."
 
-#: ../finch/gntrequest.c:640
 msgid "Not implemented yet."
 msgstr "Ainda não implementado."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1554
-#: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
-#: ../finch/gntrequest.c:762
 msgid "Choose Location..."
 msgstr "Escolher Localização..."
 
-#: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Aperte 'Enter' para pesquisar mais salas desta categoria."
 
-#: ../finch/gntroomlist.c:273
 msgid "Get"
 msgstr "Obter"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Amigo conecta"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Amigo desconecta"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Mensagem recebida inicia conversa"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Pessoa entra no bate-papo"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Pessoa sai do bate-papo"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Você fala no bate-papo"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Outros falam no bate-papo"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your username in chat"
 msgstr "Alguém diz seu nome num bate-papo"
 
-#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "Falha no GStreamer"
 
-#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "O GStreamer não pôde ser inicializado."
 
-#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1741
-#: ../pidgin/gtkprefs.c:1830 ../pidgin/gtkprefs.c:2003
 msgid "(default)"
 msgstr "(padrão)"
 
-#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "Selecionar arquivo de som..."
 
-#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "Preferências de som"
 
-#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "Perfis"
 
-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1868
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "Bipe do console"
 
-#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1872
 msgid "Command"
 msgstr "Comando"
 
-#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "Sem sons"
 
-#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1863
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "Método:"
 
-#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1864,82 +1275,56 @@ msgstr ""
 "(%s para nome do arquivo)"
 
 #. Sound options
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1894
 msgid "Sound Options"
 msgstr "Opções de som"
 
-#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "Emitir sons quando a janela da conversa ganhar foco"
 
-#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:946 ../pidgin/gtkprefs.c:958
-#: ../pidgin/gtkprefs.c:1901 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1899
 msgid "Only when available"
 msgstr "Somente quando disponível"
 
-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1900
 msgid "Only when not available"
 msgstr "Somente quando não disponível"
 
-#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1929
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1988
 msgid "Event"
 msgstr "Evento"
 
-#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "Arquivo"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:2007
 msgid "Test"
 msgstr "Testar"
 
-#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:2011
 msgid "Reset"
 msgstr "Redefinir"
 
-#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:2015
 msgid "Choose..."
 msgstr "Escolher..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Você tem certeza de que deseja remover \"%s\""
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Remover status"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Status salvos"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1396
-#: ../libpurple/protocols/msn/msn.c:747
-#: ../libpurple/protocols/myspace/myspace.c:171
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Título"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipo"
 
@@ -1951,134 +1336,73 @@ msgstr "Tipo"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:292
-#: ../libpurple/protocols/bonjour/bonjour.c:299
-#: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/jabber/jabber.c:1667
-#: ../libpurple/protocols/jabber/jabber.c:1683
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
-#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2856
-#: ../libpurple/protocols/novell/novell.c:2959
-#: ../libpurple/protocols/novell/novell.c:2965
-#: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5667
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:5899
-#: ../libpurple/protocols/oscar/oscar.c:5915
-#: ../libpurple/protocols/oscar/oscar.c:5922
-#: ../libpurple/protocols/oscar/oscar.c:5929
-#: ../libpurple/protocols/sametime/sametime.c:3338
-#: ../libpurple/protocols/sametime/sametime.c:3344
-#: ../libpurple/protocols/sametime/sametime.c:3350
-#: ../libpurple/protocols/sametime/sametime.c:3429
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3817
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
-#: ../libpurple/protocols/zephyr/zephyr.c:2352
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Mensagem:"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Usar"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Título inválido"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Favor digitar um título não-vazio para o status."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Título duplicado duplicada"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Favor digitar um título diferente para o status."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Mensagem:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Editar status"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Usar status diferente para as seguintes contas"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Salvar e usar"
 
-#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2149
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Status"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Erro ao carregar o plug-in."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Não foi possível encontrar o servidor X"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Não foi possível encontrar a janela"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
-"O plug-in não pôde ser carregado porque este não foi compilado com suporte ao "
-"X11."
+"O plug-in não pôde ser carregado porque este não foi compilado com suporte "
+"ao X11."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Plug-in da área de transferência"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -2086,77 +1410,60 @@ msgstr ""
 "Quando o conteúdo da área de transferência mudar, estes serão "
 "disponbilizados ao X, caso possível."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s conectou"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s desconectou"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s te enviou uma mensagem"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s mencionou seu apelido em %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s enviou uma mensagem em %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Amigo conecta/desconecta"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Você recebeu uma MI"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Alguém fala num bate-papo"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Alguém diz seu nome num bate-papo"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notificação com mensagem do tipo \"torradeira\" quando"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Também emitir som!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Definir URGENT na janela de terminal."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Plug-in para notificações do tipo \"torradeira\""
 
-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversas com %s em %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "O plug-in mensagens recentes requer que os históricos estejam ativados"
 
-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2169,15 +1476,12 @@ msgstr ""
 "Ativar históricos para mensagens instantâneas e/ou bate-papos irá ativar as "
 "mensagens recentes para os mesmos tipos de conversa."
 
-#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntMensagens recentes"
 
-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Mostra conversas gravadas recentemente em novas conversas."
 
-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2185,168 +1489,113 @@ msgstr ""
 "Quando uma nova conversa é aberta este plug-in irá inserir a última conversa "
 "na conversa atual."
 
-#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+#, c-format
 msgid "Online"
 msgstr "Conectado"
 
-#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2081
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:5717
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:155
-#: ../pidgin/gtkblist.c:3415 ../pidgin/gtkblist.c:3807
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1090
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3451
 msgid "Online Buddies"
 msgstr "Amigos Conectados"
 
-#: ../finch/plugins/grouping.c:117
 msgid "Offline Buddies"
 msgstr "Amigos Desconectados"
 
-#: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
 msgstr "Conectados/Desconectado"
 
-#: ../finch/plugins/grouping.c:168
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr "Sem Agrupamento"
 
-#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "Fornece opções alternativas de agrupamento da lista de amigos."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Última menção"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Pesquisa uma determinada frase nas mensagens recebidas."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastLog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Plug-in de busca de mensagens"
 
-#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "contas"
 
-#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:204
-#: ../libpurple/protocols/silc/silc.c:473
 msgid "Password is required to sign on."
 msgstr "Uma senha é necessária para conectar-se."
 
-#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Digite a senha para %s (%s)"
 
-#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "Digite a senha"
 
-#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../libpurple/account.c:1144 ../libpurple/connection.c:118
-#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plug-in de protocolo faltando para %s"
 
-#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Erro de conexão"
 
-#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1739
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
-#: ../libpurple/account.c:1370
 msgid "Fill out all fields completely."
 msgstr "Preencha todos os campos completamente."
 
-#: ../libpurple/account.c:1402
 msgid "Original password"
 msgstr "Senha original"
 
-#: ../libpurple/account.c:1410
 msgid "New password"
 msgstr "Nova senha"
 
-#: ../libpurple/account.c:1418
 msgid "New password (again)"
 msgstr "Nova senha (novamente)"
 
-#: ../libpurple/account.c:1425
 #, c-format
 msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
-#: ../libpurple/account.c:1433
 msgid "Please enter your current password and your new password."
 msgstr "Favor digitar sua senha atual e sua nova senha."
 
-#: ../libpurple/account.c:1464
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificar informações do usuário para %s"
 
-#: ../libpurple/account.c:1467 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Definir informações de usuário"
 
-#: ../libpurple/account.c:1938 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:812
-#: ../libpurple/protocols/jabber/buddy.c:2077
-#: ../libpurple/protocols/jabber/buddy.c:2094
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3442 ../pidgin/gtkblist.c:6317
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Amigos"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(NÃO COINCIDE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s enviou este certificado de uso único:"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2356,53 +1605,40 @@ msgstr ""
 "Impressão digital (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Verificação de certificado de uso único"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Autoridades de certificação"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "Cache dos pares SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Aceitar certificado de %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "Verificação do certificado SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2411,7 +1647,6 @@ msgstr ""
 "O certificado enviado por \"%s\" é auto-assinado. Ele não pode ser "
 "verificado automaticamente."
 
-#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "A cadeia de certificados enviada para %s não é válida."
@@ -2421,16 +1656,13 @@ msgstr "A cadeia de certificados enviada para %s não é válida."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "Erro no certificado SSL"
 
-#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Cadeia de certificado inválida"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2439,13 +1671,11 @@ msgstr ""
 "não pode ser validado."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 "O certificado raiz que expediu este certificado não é conhecido pelo Pidgin."
 
-#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2456,7 +1686,6 @@ msgstr ""
 "válida vinda da Autoridade de Certificação do qual ele diz ter uma "
 "assinatura."
 
-#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "Assinatura de autoridade de certificação inválida"
 
@@ -2464,7 +1693,6 @@ msgstr "Assinatura de autoridade de certificação inválida"
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1434
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2474,7 +1702,6 @@ msgstr ""
 "pode não estar conectando ao serviço que pensa estar."
 
 #. Make messages
-#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2492,126 +1719,93 @@ msgstr ""
 "Data de expiração: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Informações do certificado"
 
-#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Erro ao registrar"
 
-#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Erro ao desregistrar"
 
-#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s conectou"
 
-#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectou"
 
-#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2397
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:329
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Não foi possível enviar mensagem: A mensagem é muito extensa."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Não foi possível enviar mensagem para %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "A mensagem é muito extensa."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:294
-#: ../libpurple/protocols/bonjour/jabber.c:337
 msgid "Unable to send message."
 msgstr "Não foi possível enviar mensagem."
 
-#: ../libpurple/conversation.c:1231
 msgid "Send Message"
 msgstr "Enviar mensagem"
 
-#: ../libpurple/conversation.c:1234
 msgid "_Send Message"
 msgstr "Envia_r mensagem"
 
-#: ../libpurple/conversation.c:1640
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1643
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
 msgstr "Você mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1773
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1848
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: ../libpurple/conversation.c:1851
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
 
-#: ../libpurple/dbus-server.c:586
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Falha ao obter conexão: %s"
 
-#: ../libpurple/dbus-server.c:598
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Falha ao obter nome: %s"
 
-#: ../libpurple/dbus-server.c:612
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Não foi possível obter nome do serv: %s"
 
-#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "O servidor D-BUS do Purple não está rodando pelo motivo listado abaixo"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Sem nome"
 
-#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "Não foi possível criar novo processo de resolução\n"
 
-#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "Não foi possível enviar pedido para o processo de resolução\n"
 
-#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2620,13 +1814,10 @@ msgstr ""
 "Erro ao resolver %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
-#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Erro ao resolver %s: %d"
 
-#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2635,20 +1826,17 @@ msgstr ""
 "Erro ao ler do processo de resolução:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:599
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Fim de arquivo ao ler resposta do processo de resolução"
 
-#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Falha ao criar thread: %s"
 
-#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Motivo desconhecido"
 
-#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2657,7 +1845,6 @@ msgstr ""
 "Erro ao ler %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2666,7 +1853,6 @@ msgstr ""
 "Erro ao gravar em %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2675,39 +1861,31 @@ msgstr ""
 "Erro ao acessar %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "O diretório não permite gravações."
 
-#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Não é possível enviar um arquivo de 0 bytes."
 
-#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Não foi possível enviar um diretório."
 
-#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s não é um arquivo regular. Recusando covardemente sobrescrevê-lo.\n"
 
-#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s deseja lhe enviar %s (%s)"
 
-#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s deseja lhe enviar um arquivo"
 
-#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aceitar pedido de transferência de arquivo de %s?"
 
-#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2718,133 +1896,105 @@ msgstr ""
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s está pedindo para enviar %s"
 
-#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s não é um nome de arquivo válido.\n"
 
-#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Oferecendo o envio de %s para %s"
 
-#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Iniciar transferência de %s a partir de %s"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferência de %s completa"
 
-#: ../libpurple/ft.c:703
+#, c-format
 msgid "File transfer complete"
 msgstr "Transferência de arquivo completa"
 
-#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Você cancelou a transferência de %s"
 
-#: ../libpurple/ft.c:1143
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivo cancelada"
 
-#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transferência de %s"
 
-#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transferência de arquivo"
 
-#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Transferência de arquivo para %s falhou."
 
-#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Transferência de arquivo de %s falhou."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Execute o comando num terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"aim\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"gg\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"icq\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"irc\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"msnim\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"sip\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"xmpp\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "O comando usado para lidar com URLs \"ymsgr\", se ativado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Associar URLs \"aim\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Associar URLs \"gg\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Associar URLs \"icq\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Associar URLs \"irc\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Associar URLs \"msnim\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Associar URLs \"sip\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Associar URLs \"xmpp\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Associar URLs \"ymsgr\" a"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -2852,7 +2002,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -2860,7 +2009,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -2868,7 +2016,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -2876,7 +2023,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -2884,7 +2030,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -2892,7 +2037,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -2900,7 +2044,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -2908,7 +2051,6 @@ msgstr ""
 "Verdadeiro se o comando especificado na chave \"comando\" deve ser associado "
 "a URLs \"ymsgr\""
 
-#: ../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."
@@ -2916,65 +2058,50 @@ msgstr ""
 "Verdadeiro se o comando usado para lidar com este tipo de URL deve ser "
 "executado num terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Diz se o comando especificado deve ser associado a URLs \"ymsgr\""
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">O gerador de histórico não tem funções de leitura</"
 "font></b>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Texto puro"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Antigo formato linear"
 
-#: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
 msgstr "A gravação desta conversa falhou."
 
-#: ../libpurple/log.c:1293
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1377
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2983,7 +2110,6 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1379
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2992,46 +2118,41 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "RESPOSTA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Não foi possível encontrar o caminho do histórico!</"
 "b></font>"
 
-#: ../libpurple/log.c:1449 ../libpurple/log.c:1579
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Não foi possível ler o arquivo: %s</b></font>"
 
-#: ../libpurple/log.c:1511
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Você está usando %s, mas este plug-in requer %s."
 
-#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Este plug-in não definiu um ID."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Versão incompatível do plug-in %d (era esperado %d)"
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Versão errada da interface binária %d.%d.x (era esperado %d.%d.x)"
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
-msgstr "O plug-in não implementa todas as funções requeridas"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"O plug-in não implementa todas as funções necessárias (l_ista de ícones, "
+"login e fechamento)"
 
-#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -3040,89 +2161,63 @@ msgstr ""
 "O plug-in requerido %s não foi encontrado. Por favor instale esse plug-in e "
 "tente novamente."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Não foi possível carregar o plug-in."
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "O plug-in requerido %s não pôde ser carregado."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Não foi possível carregar seu plug-in."
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s requer %s, mas este não foi descarregado com sucesso."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Aceitar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 "Aceita pedidos de transferência de arquivo de usuários selecionados "
 "automaticamente."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 "A transferência de arquivo aceita automaticamente \"%s\" (de \"%s\") está "
 "concluída."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Auto-aceitar concluído"
 
-#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Ao receber um pedido de transferência de arquivo de %s"
 
-#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Definir configurações do auto-aceitar"
 
-#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:2336
-#: ../libpurple/protocols/oscar/oscar.c:5999
-#: ../libpurple/protocols/oscar/oscar.c:6054
-#: ../libpurple/protocols/oscar/oscar.c:6281
-#: ../libpurple/protocols/oscar/oscar.c:6351 ../libpurple/request.h:1401
-#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Perguntar"
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Aceitar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Rejeitar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Auto-aceitar transferências de arquivos..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3130,13 +2225,11 @@ msgstr ""
 "Caminho para salvar os arquivos\n"
 "(Favor digitar o caminho completo)"
 
-#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Rejeitar automaticamente transferências de usuários fora da minha lista de "
 "amigos"
 
-#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3145,18 +2238,15 @@ msgstr ""
 "automaticamente for concluída\n"
 "(apenas quando não há conversa com o remetente)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msn/msn.c:1860
-#: ../libpurple/protocols/msnp9/msn.c:1671
-#: ../libpurple/protocols/msnp9/msn.c:1701
+msgid "Create a new directory for each user"
+msgstr "Criar um novo diretório para cada usuário"
+
 msgid "Notes"
 msgstr "Anotações"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Digite suas anotações abaixo..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Alterar anotações..."
 
@@ -3168,18 +2258,15 @@ msgstr "Alterar anotações..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Anotações em amigos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Guarda anotações em amigos específicos."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Adiciona a opção de guardar anotações em amigos na sua lista de amigos."
@@ -3190,7 +2277,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Teste da cifra"
 
@@ -3198,7 +2284,6 @@ msgstr "Teste da cifra"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Testa as cifras que vêm com a libpurple."
 
@@ -3208,7 +2293,6 @@ msgstr "Testa as cifras que vêm com a libpurple."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Exemplo do DBus"
 
@@ -3216,8 +2300,6 @@ msgstr "Exemplo do DBus"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Plug-in de exemplo do DBus"
 
@@ -3227,7 +2309,6 @@ msgstr "Plug-in de exemplo do DBus"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Controle por arquivo"
 
@@ -3235,50 +2316,38 @@ msgstr "Controle por arquivo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Permite controlar ações inserindo comandos em um arquivo."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "minutos"
 
 #. 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
 msgid "I'dle Mak'er"
 msgstr "C'riador de ina'tividade"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Definir tempo inativo da conta"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Definir"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Nenhuma de suas contas está inativa."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Redefinir tempo de inatividade da conta"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Redefinir"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Definir tempo de inatividade de todas as contas"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Redefinir tempo de inatividade de todas as contas inativas"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 "Permite que você configure manualmente por quanto tempo você está inativo"
@@ -3289,19 +2358,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Cliente de teste do IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Testa o suporte IPC dos plug-ins, como um cliente."
 
 #. *  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."
@@ -3315,33 +2381,27 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Servidor de teste do IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Testa o suporte IPC dos plug-ins, como um servidor."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Testa o suporte IPC dos plug-ins, como um servidor. Isto registra os comandos "
-"IPC."
+"Testa o suporte IPC dos plug-ins, como um servidor. Isto registra os "
+"comandos IPC."
 
-#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "Configuração da ocultação de mensagens de entrada/saída"
 
-#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "Tamanho mínimo da sala"
 
-#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Limite de inatividade de usuário (em minutos)"
 
@@ -3351,58 +2411,46 @@ msgstr "Limite de inatividade de usuário (em minutos)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "Ocultador de entrada/saída"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "Esconde mensagens supérfluas de entrada/saída."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"Este plug-in esconde mensagens de entrada/saída em grandes salas, exceto para "
-"aqueles usuários que estão participando ativamente de uma conversa."
+"Este plug-in esconde mensagens de entrada/saída em grandes salas, exceto "
+"para aqueles usuários que estão participando ativamente de uma conversa."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(Greenwich)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "O usuário está desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Auto-resposta enviada:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:84
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectou."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Uma ou mais mensagens pode(m) não ter sido enviada(s)."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Você foi desconectado do servidor."
 
-#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3410,86 +2458,66 @@ msgstr ""
 "Atualmente, você está desconectado. Nenhuma mensagem será recebida até que "
 "você conecte-se."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "A mensagem não pôde ser enviada porque o limite de tamanho foi excedido."
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "A mensagem não pôde ser enviada."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2855
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2860
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2864
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2869
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2873
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2877
 msgid "Trillian"
 msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2881
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2837
 msgid "General Log Reading Configuration"
 msgstr "Configuração geral da leitura de históricos"
 
-#: ../libpurple/plugins/log_reader.c:2841
 msgid "Fast size calculations"
 msgstr "Cálculos rápidos de tamanho"
 
-#: ../libpurple/plugins/log_reader.c:2845
 msgid "Use name heuristics"
 msgstr "Utilizar heurística de nome"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2851
 msgid "Log Directory"
 msgstr "Diretório dos históricos"
 
@@ -3499,21 +2527,18 @@ msgstr "Diretório dos históricos"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2910
 msgid "Log Reader"
 msgstr "Leitor de históricos"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2914
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Inclui o histórico de outros clientes de mensagem instantânea no leitor de "
 "históricos."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2918
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3528,20 +2553,15 @@ msgstr ""
 "AVISO: Este plug-in ainda está em testes e pode travar freqüentemente. Use-o "
 "por sua conta e risco!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Carregador de plug-ins do Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Carrega plug-ins do .NET com o Mono."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "Adicionar quebra de linha nos Mensageiros Instantâneos"
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr "Adicionar quebra de linha em bate-papos"
 
@@ -3554,18 +2574,15 @@ msgstr "Adicionar quebra de linha em bate-papos"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Nova linha"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Adiciona uma linha vazia no começo das mensagens exibidas."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
@@ -3573,15 +2590,12 @@ msgstr ""
 "Adiciona uma linha vazia no começo de cada mensagem, de modo que o resto da "
 "mensagem apareça abaixo do nome do usuário na janela de conversa."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Emulação de mensagens desconectadas"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salva mensagens enviadas para um usuário desconectado numa ação."
 
-#: ../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."
@@ -3589,7 +2603,6 @@ msgstr ""
 "O resto das mensagens será salvo como ações. Você pode alterar/remover as "
 "ações a partir da caixa de diálogo `Ações de usuário'"
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -3598,51 +2611,23 @@ msgstr ""
 "\"%s\" está desconectado. Você deseja salvar o resto das mensagens como uma "
 "ação e enviá-las automaticamente quando \"%s\" conectar-se novamente?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mensagem desconectada"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Você pode alterar/excluir a ação a partir da caixa de diálogo `Ações de "
 "usuário'"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Sim"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1930
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Não"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Salvar mensagens offline como ações"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Não perguntar. Sempre salvar como ações."
 
@@ -3652,26 +2637,21 @@ msgstr "Não perguntar. Sempre salvar como ações."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Carregador de plug-ins Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Fornece suporte ao carregamento de plug-ins Perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Modo psíquico"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Modo psíquico para mensagens recebidas"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -3680,23 +2660,18 @@ msgstr ""
 "começarem a redigir uma mensagem para você. Isto funciona com o AIM, ICQ, "
 "XMPP, Sametime e com o Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Você sente uma perturbação na Força..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Permitir apenas os usuários da minha lista de amigos"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Desativar quando ausente"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Exibir mensagens de notificação nas conversas"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Focar conversas quando o usuário digitar algo"
 
@@ -3706,7 +2681,6 @@ msgstr "Focar conversas quando o usuário digitar algo"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Teste dos sinais"
 
@@ -3714,8 +2688,6 @@ msgstr "Teste dos sinais"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Teste para ver se todos os sinais estão funcionando corretamente."
 
@@ -3725,7 +2697,6 @@ msgstr "Teste para ver se todos os sinais estão funcionando corretamente."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Plug-in trivial"
 
@@ -3733,13 +2704,10 @@ msgstr "Plug-in trivial"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Verifica se a maioria das coisas estão funcionando."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Certificados X.509"
 
@@ -3749,7 +2717,6 @@ msgstr "Certificados X.509"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3757,8 +2724,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fornece suporte a SSL através do GNUTLS."
 
@@ -3768,7 +2733,6 @@ msgstr "Fornece suporte a SSL através do GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3776,8 +2740,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornece suporte a SSL através do Mozilla NSS."
 
@@ -3787,7 +2749,6 @@ msgstr "Fornece suporte a SSL através do Mozilla NSS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3795,48 +2756,38 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fornece um envoltório para as bibliotecas de suporte à SSL."
 
-#: ../libpurple/plugins/statenotify.c:54
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s não está mais ausente."
 
-#: ../libpurple/plugins/statenotify.c:56
 #, c-format
 msgid "%s has gone away."
 msgstr "%s está ausente."
 
-#: ../libpurple/plugins/statenotify.c:66
 #, c-format
 msgid "%s has become idle."
 msgstr "%s se tornou inativo."
 
-#: ../libpurple/plugins/statenotify.c:68
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s não está mais inativo."
 
-#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s has signed on."
 msgstr "%s conectou."
 
-#: ../libpurple/plugins/statenotify.c:95
 msgid "Notify When"
 msgstr "Notificar quando"
 
-#: ../libpurple/plugins/statenotify.c:98
 msgid "Buddy Goes _Away"
 msgstr "O amigo ficar _ausente"
 
-#: ../libpurple/plugins/statenotify.c:101
 msgid "Buddy Goes _Idle"
 msgstr "O amigo ficar _inativo"
 
-#: ../libpurple/plugins/statenotify.c:104
 msgid "Buddy _Signs On/Off"
 msgstr "Amigo conecta/de_sconecta"
 
@@ -3846,7 +2797,6 @@ msgstr "Amigo conecta/de_sconecta"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:152
 msgid "Buddy State Notification"
 msgstr "Notificação do status do amigo"
 
@@ -3854,8 +2804,6 @@ msgstr "Notificação do status do amigo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:155
-#: ../libpurple/plugins/statenotify.c:158
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -3863,15 +2811,12 @@ msgstr ""
 "Notifica na janela de conversa quando um amigo sai ou entra do status de "
 "ausente ou inativo."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Carregador de plug-ins Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fornece suporte ao carregamento de plug-ins Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3879,21 +2824,16 @@ msgstr ""
 "Não foi possível detectar uma instalação do ActiveTCL. Se você deseja usar "
 "plug-ins TCL, instale o ActiveTCL de http://www.activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:101
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
-"A biblioteca do Apple Bonjour para Windows não foi encontrada. Veja o FAQ em "
-"http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging para maiores informações."
+"O Kit de Ferramentas do Apple Bonjour para Windows não foi encontrado, veja "
+"o FAQ no: http://d.pidgin.im/BonjourWindows para mais informações."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Não foi possível escutar por conexões de mensagens instantâneas\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:147
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -3901,40 +2841,18 @@ msgstr ""
 "rodando?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:392
-#: ../libpurple/protocols/bonjour/bonjour.c:698
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:701
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1362
-#: ../libpurple/protocols/jabber/buddy.c:1372
-#: ../libpurple/protocols/jabber/buddy.c:2266
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "Email"
 msgstr "Email"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:401
-#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "Conta do AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "Conta do XMPP"
 
@@ -3948,57 +2866,37 @@ msgstr "Conta do XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:508
-#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Plug-in do protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr "Pessoa púrpura"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:429
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:479
-#: ../libpurple/protocols/bonjour/jabber.c:544
-#: ../libpurple/protocols/bonjour/jabber.c:589
-#: ../libpurple/protocols/bonjour/jabber.c:766
-#: ../libpurple/protocols/bonjour/jabber.c:784
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
 
-#: ../libpurple/protocols/bonjour/jabber.c:683
 msgid "Cannot open socket"
 msgstr "Não foi possível abrir socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:693
-msgid "Error setting socket options"
-msgstr "Erro ao definir as opções do socket"
-
-#: ../libpurple/protocols/bonjour/jabber.c:719
 msgid "Could not bind socket to port"
 msgstr "Não foi possível vincular socket à porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:729
 msgid "Could not listen on socket"
 msgstr "Não foi possível escutar no socket"
 
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Erro comunicando com o mDNSResponder local."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "Configurações de proxy inválidas"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1908
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -4006,338 +2904,216 @@ msgstr ""
 "O nome do host ou o número da porta especificado para o tipo de proxy "
 "fornecido é inválido."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Erro de token"
 
-#: ../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 "Não foi possível obter o token.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Salvar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Sua lista de amigos está vazia, nada foi escrito no arquivo."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Lista de amigos salva com sucesso"
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "Não foi possível gravar lista de amigos de %s em %s"
 
-#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Não foi possível carregar lista de amigos"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Carregar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Lista de amigos carregada com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Salvar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:382
+msgid "Load buddylist from file..."
+msgstr "Carregar lista de amigos do arquivo.."
+
 msgid "Fill in the registration fields."
 msgstr "Preencha os campos de registro."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "As senhas não conferem."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Não foi possível registrar uma nova conta. Ocorreu um erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta do Gadu-Gadu registrada"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "O registro foi concluído com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "Senha"
 
-#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Senha (redigitar)"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Digite o token atual"
 
-#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Token atual"
 
-#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrar nova conta do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Por favor, preencha os seguintes campos"
 
-#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/oscar/oscar.c:3826
-#: ../libpurple/protocols/oscar/oscar.c:3839
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msnp9/msn.c:1600
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Homem ou mulher"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Masculino"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Feminino"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Apenas conectado"
 
-#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Favor digitar seu critério de busca abaixo"
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Preencha os campos."
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Sua senha atual é diferente da senha que você especificou."
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Não foi possível alterar a senha. Ocorreu um erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Mudar senha da conta do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Senha alterada com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Senha atual"
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Favor digitar sua senha atual e sua nova senha do UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Alterar a senha do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Selecione o bate-papo para o amigo: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Adicionar ao bate-papo..."
 
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2083
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1086
 msgid "Available"
 msgstr "Disponível"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:358
-#: ../libpurple/protocols/jabber/buddy.c:2087
-#: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:734
-#: ../libpurple/protocols/oscar/oscar.c:5745
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3719
-#: ../libpurple/protocols/yahoo/yahoo.c:3793 ../libpurple/status.c:159
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2070
-#: ../pidgin/gtkstatusbox.c:1087
+#, c-format
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2753
-#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2260
-#: ../libpurple/protocols/jabber/buddy.c:2446
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/silc/ops.c:1004
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3948
 msgid "Unable to display the search results."
 msgstr "Não foi possível exibir os resultados da busca."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Páginas amarelas do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Resultados da pesquisa"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Nenhum usuário compatível encontrado"
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Não existem usuários que satisfaçam seu critério de busca"
 
-#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Não foi possível ler do socket"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos transferida"
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Sua lista de amigos foi transferida do servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos enviada"
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Sua lista de amigos foi guardada no servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Falha na conexão."
 
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Adicionar ao bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Este nome de bate-papo já está sendo utilizado"
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Não conectado ao servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Encontrar amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Alterar senha..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Enviar lista de amigos para o servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Transferir lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Remover lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Salvar lista de amigos para um arquivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr "Carregar lista de amigos do arquivo.."
-
 #. magic
 #. major_version
 #. minor_version
@@ -4349,152 +3125,81 @@ msgstr "Carregar lista de amigos do arquivo.."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plug-in do protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Cliente de mensagens instantâneas popular na Polônia"
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Usuário do Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1853
-#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:509
-#: ../libpurple/protocols/jabber/chat.c:596
-#: ../libpurple/protocols/silc/silc.c:1561
-#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "O tópico atual é: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:513
-#: ../libpurple/protocols/jabber/chat.c:600
-#: ../libpurple/protocols/silc/silc.c:1565
-#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "Nenhum tópico foi definido"
 
-#: ../libpurple/protocols/irc/dcc_send.c:298
-#: ../libpurple/protocols/irc/dcc_send.c:339
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 msgid "File Transfer Failed"
 msgstr "Transferência de arquivo falhou"
 
-#: ../libpurple/protocols/irc/dcc_send.c:299
-#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Não foi possível abrir uma porta para escuta."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Erro ao exibir mensagem do dia (MOTD)"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Não há mensagem do dia (MOTD) disponível"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Não há mensagem do dia (MOTD) associada com esta conexão."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "Mensagem do dia (MOTD) para %s"
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Server has disconnected"
 msgstr "O servidor desconectou"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Ver mensagem do dia (MOTD)"
 
-#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "Apelidos do IRC não podem conter espaços"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1346
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:354
-#: ../libpurple/protocols/myspace/myspace.c:295
-#: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1335
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3778
-#: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:686
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:674
-#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:313
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "Não foi possível conectar ao host"
 
-#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2533
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Usuários"
 
-#: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3426
-#: ../libpurple/protocols/silc/chat.c:1404
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Tópico"
 
@@ -4506,50 +3211,27 @@ msgstr "Tópico"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "Plug-in do protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plug-in do protocolo IRC que é menos ruim"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:371
-#: ../libpurple/protocols/msn/msn.c:2357
-#: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6747
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5783
-#: ../libpurple/protocols/silc/ops.c:1262
-#: ../libpurple/protocols/silc/ops.c:1356
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2099
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6750
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5788
-#: ../libpurple/protocols/silc/silc.c:2143
-#: ../libpurple/protocols/silc10/silc.c:1867
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
 
-#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Codificações"
 
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:365
-#: ../libpurple/protocols/silc/silc.c:1225
-#: ../libpurple/protocols/silc10/silc.c:926
+msgid "Auto-detect incoming UTF-8"
+msgstr "Auto-detectar recebimento de UTF-8 "
+
 msgid "Real name"
 msgstr "Nome real"
 
@@ -4557,172 +3239,129 @@ msgstr "Nome real"
 #. 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:985
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Bad mode"
 msgstr "Modo inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:214
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "Banir no %s por %s, definido %ld segundos atrás"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Banir no %s por %s, definido %s atrás"
 
-#: ../libpurple/protocols/irc/msgs.c:217
 #, c-format
 msgid "Ban on %s"
 msgstr "Banir em %s"
 
-#: ../libpurple/protocols/irc/msgs.c:232
 msgid "End of ban list"
 msgstr "Fim da lista de banidos"
 
-#: ../libpurple/protocols/irc/msgs.c:246
 #, c-format
 msgid "You are banned from %s."
 msgstr "Você foi banido do %s."
 
-#: ../libpurple/protocols/irc/msgs.c:247
 msgid "Banned"
 msgstr "Banido"
 
-#: ../libpurple/protocols/irc/msgs.c:264
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Não foi possível banir %s: a lista de usuários banidos está cheia"
 
-#: ../libpurple/protocols/irc/msgs.c:349
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:350
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:351
-#: ../libpurple/protocols/oscar/oscar.c:3737
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:377
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Atualmente em"
 
-#: ../libpurple/protocols/irc/msgs.c:382
 msgid "Idle for"
 msgstr "Inativo por"
 
-#: ../libpurple/protocols/irc/msgs.c:385
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Adjetivo definidor:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:473
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:475
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s apagou o tópico."
 
-#: ../libpurple/protocols/irc/msgs.c:483
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O tópico do %s é: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:501
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensagem desconhecida '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "Unknown message"
 msgstr "Mensagem desconhecida"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "The IRC server received a message it did not understand."
 msgstr "O servidor IRC recebeu uma mensagem que não foi entendida."
 
-#: ../libpurple/protocols/irc/msgs.c:523
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuários em %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Time Response"
 msgstr "Resposta do comando Time"
 
-#: ../libpurple/protocols/irc/msgs.c:631
 msgid "The IRC server's local time is:"
 msgstr "O horário local do servidor IRC é:"
 
-#: ../libpurple/protocols/irc/msgs.c:642
 msgid "No such channel"
 msgstr "Canal inexistente"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:653
 msgid "no such channel"
 msgstr "Canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:656
 msgid "User is not logged in"
 msgstr "O usuário está desconectado"
 
-#: ../libpurple/protocols/irc/msgs.c:661
 msgid "No such nick or channel"
 msgstr "Apelido ou canal inexistente"
 
-#: ../libpurple/protocols/irc/msgs.c:681
 msgid "Could not send"
 msgstr "Não foi possível enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:737
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "É necessário um convite para entrar em %s."
 
-#: ../libpurple/protocols/irc/msgs.c:738
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: ../libpurple/protocols/irc/msgs.c:854
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Você foi expulso por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:859 ../libpurple/protocols/silc/ops.c:714
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Chutado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:882
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:970 ../libpurple/protocols/irc/msgs.c:971
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:972
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4730,7 +3369,6 @@ msgstr ""
 "O apelido selecionado foi rejeitado pelo servidor. Provavelmente, ele contém "
 "caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:977
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4738,53 +3376,40 @@ msgstr ""
 "O nome de conta selecionado foi rejeitado pelo servidor. Provavelmente, ele "
 "contém caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Cannot change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Could not change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:1041
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Você saiu do canal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1085
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1087
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Latência: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1178
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Não foi possível entrar em %s: Registro requerido"
 
-#: ../libpurple/protocols/irc/msgs.c:1179
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Não foi possível entrar no canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1213
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Este usuário ou canal está temporariamente indisponível."
 
-#: ../libpurple/protocols/irc/msgs.c:1225
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;ação a realizar&gt;:  Realiza uma ação."
 
-#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4792,11 +3417,12 @@ msgstr ""
 "away [mensagem]:  Define uma mensagem de ausência. Não use uma mensagem caso "
 "queira retornar do estado de ausência."
 
-#: ../libpurple/protocols/irc/parse.c:126
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <apelido> <msg>: mandar msg ctcp para o apelido."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Envia um comando para o chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4804,7 +3430,6 @@ msgstr ""
 "deop &lt;usuário1&gt; [usuário2] ...:  Remove o status de operador do canal "
 "de alguém. Você precisa ser um operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -4814,7 +3439,6 @@ msgstr ""
 "de alguém, impedindo esta pessoa de falar caso o canal esteja moderado (+m). "
 "Você precisa ser um operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -4822,7 +3446,6 @@ msgstr ""
 "invite &lt;usuário&gt; [sala]:  Convida alguém para entrar no canal "
 "especificado, ou no canal atual."
 
-#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4831,7 +3454,6 @@ msgstr ""
 "canais, e opcionalmente forneça a chave do canal para cada um deles, se "
 "necessário."
 
-#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4840,7 +3462,6 @@ msgstr ""
 "canais, e opcionalmente forneça a chave do canal para cada um deles, se "
 "necessário."
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -4848,7 +3469,6 @@ msgstr ""
 "kick &lt;usuário&gt; [mensagem]:  Remove alguém de um canal. Você precisa "
 "ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -4856,15 +3476,12 @@ msgstr ""
 "list:  Exibe uma lista das salas de bate-papo da rede. <i>Cuidado, alguns "
 "servidores podem te desconectar caso você faça isso.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:134
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;ação a realizar&gt;:  Realiza uma ação."
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Envia um comando para o memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4872,7 +3489,6 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;usuário|canal&gt;: Define ou remove um "
 "modo de usuário ou canal."
 
-#: ../libpurple/protocols/irc/parse.c:137
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4880,25 +3496,18 @@ msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para um "
 "usuário (ao contrário de um canal)."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canal]:  Lista os usuários que estão no canal atualmente."
 
-#: ../libpurple/protocols/irc/parse.c:139
-#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
-#: ../libpurple/protocols/irc/parse.c:140
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Envia um comando para o nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr ""
-"me &lt;ação&gt;:  Envia uma notícia para um usuário ou canal."
+msgstr "me &lt;ação&gt;:  Envia uma notícia para um usuário ou canal."
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4906,7 +3515,6 @@ msgstr ""
 "op &lt;usuário1&gt; [usuário2] ...:  Dá o status de operador do canal para "
 "alguém. Você precisa ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4914,11 +3522,9 @@ msgstr ""
 "operwall &lt;mensagem&gt;:  Se você não sabe o que é isto, provavelmente não "
 "pode usar tal comando."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Envia um comando para o operserv"
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4926,7 +3532,6 @@ msgstr ""
 "part [sala] [mensagem]:  Sai do canal atual, ou de um canal especificado, "
 "com uma mensagem opcional."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4934,7 +3539,6 @@ msgstr ""
 "ping [usuário]: Verifica qual a latência do usuário (ou do servidor, caso "
 "nenhum usuário tenha sido especificado)."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4942,15 +3546,12 @@ msgstr ""
 "query &lt;usuário&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para "
 "um usuário (ao contrário de um canal)."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Manda um comando puro para o servidor."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4958,23 +3559,18 @@ msgstr ""
 "remove &lt;usuário&gt; [mensagem]:  Remove alguém de um canal. Você precisa "
 "ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Exibe a hora local atual do servidor de IRC."
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [novo tópico]:  Vê ou altera o tópico do canal."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Define ou remove um modo de usuário."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [apelido]: envia um pedido CTCP VERSION para um usuário"
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4982,7 +3578,6 @@ msgstr ""
 "voice &lt;usuário1&gt; [usuário2] ...:  Dá o status de voice do canal para "
 "alguém. Você precisa ser operador do canal para isso."
 
-#: ../libpurple/protocols/irc/parse.c:156
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4990,71 +3585,48 @@ msgstr ""
 "wallops &lt;mensagem&gt;: Se você não sabe o que é isto, provavelmente não "
 "pode usar tal comando."
 
-#: ../libpurple/protocols/irc/parse.c:157
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [servidor] &lt;usuário&gt;:  Exibe informações do usuário."
 
-#: ../libpurple/protocols/irc/parse.c:158
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;apelido&gt;:  Exibe informações de um usuário que está "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:523
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:636
-#: ../libpurple/protocols/irc/parse.c:643 ../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 "Desconectado."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:735
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "Erro desconhecido"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Comando ad-hoc falhou"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "execute"
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "O servidor requer TLS/SSL para conexão. Nenhum suporte a TLS/SSL foi "
 "encontrado."
 
-#: ../libpurple/protocols/jabber/auth.c:60
 msgid "You require encryption, but no TLS/SSL support found."
-msgstr ""
-"Você requer TLS/SSL, mas nenhum suporte a TLS/SSL foi encontrado. "
+msgstr "Você requer TLS/SSL, mas nenhum suporte a TLS/SSL foi encontrado. "
 
-#: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "O servidor requer autenticação em texto puro sobre um fluxo não-criptografado"
 
-#: ../libpurple/protocols/jabber/auth.c:328
-#: ../libpurple/protocols/jabber/auth.c:535
-#: ../libpurple/protocols/jabber/auth.c:729
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -5063,139 +3635,74 @@ msgstr ""
 "%s requer autenticação via texto puro sobre uma conexão não criptografada. "
 "Deseja permitir isso e continuar a autenticação?"
 
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:331
-#: ../libpurple/protocols/jabber/auth.c:537
-#: ../libpurple/protocols/jabber/auth.c:538
-#: ../libpurple/protocols/jabber/auth.c:731
-#: ../libpurple/protocols/jabber/auth.c:732
 msgid "Plaintext Authentication"
 msgstr "Autenticação via texto puro"
 
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:662
-#: ../libpurple/protocols/jabber/auth.c:913
-#: ../libpurple/protocols/jabber/auth.c:1064
-#: ../libpurple/protocols/jabber/auth.c:1091
-#: ../libpurple/protocols/jabber/auth.c:1137
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "O servidor retornou uma resposta inválida."
 
-#: ../libpurple/protocols/jabber/auth.c:551
-#: ../libpurple/protocols/jabber/auth.c:745
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor não utiliza nenhum método de autenticação suportado"
 
-#: ../libpurple/protocols/jabber/auth.c:936
-#: ../libpurple/protocols/jabber/auth.c:961
 msgid "Invalid challenge from server"
 msgstr "O servidor retornou uma identificação inválida"
 
-#: ../libpurple/protocols/jabber/auth.c:1037
 msgid "SASL error"
 msgstr "Erro de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:306
-#: ../libpurple/protocols/jabber/buddy.c:1256
-#: ../libpurple/protocols/sametime/sametime.c:4184
-#: ../libpurple/protocols/silc/ops.c:1000
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/jabber/buddy.c:307
-#: ../libpurple/protocols/jabber/buddy.c:1268
-#: ../libpurple/protocols/silc/ops.c:1012
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/jabber/buddy.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1271
 msgid "Given Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/jabber/buddy.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1319
 msgid "Street Address"
 msgstr "Endereço (Rua)"
 
-#: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1316
 msgid "Extended Address"
 msgstr "Endereço (Complemento)"
 
-#: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1322
 msgid "Locality"
 msgstr "Localidade"
 
-#: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1325
 msgid "Region"
 msgstr "Região"
 
-#: ../libpurple/protocols/jabber/buddy.c:315
-#: ../libpurple/protocols/jabber/buddy.c:1328
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1332
-#: ../libpurple/protocols/silc/silc.c:1231
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "País"
 
-#: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1343
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1387
 msgid "Organization Name"
 msgstr "Nome da organização"
 
-#: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
-#: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Role"
 msgstr "Função"
 
-#: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1287
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1669
-#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Birthday"
 msgstr "Data de nascimento"
 
-#: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1402
-#: ../libpurple/protocols/jabber/chat.c:780
-#: ../libpurple/protocols/jabber/usermood.c:190 ../pidgin/gtkblist.c:3427
-#: ../pidgin/gtkplugin.c:582 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Descrição"
 
-#: ../libpurple/protocols/jabber/buddy.c:752
-#: ../libpurple/protocols/jabber/buddy.c:753
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard do XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:754
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5203,385 +3710,231 @@ msgstr ""
 "Todos os itens a seguir são opcionais. Preencha apenas as informações que "
 "quiser."
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:990
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:994
 msgid "Operating System"
 msgstr "Sistema operacional"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "Last Activity"
 msgstr "Última atividade"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Service Discovery Info"
 msgstr "Informações da localização de serviços"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Service Discovery Items"
 msgstr "Itens da localização de serviços"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
 msgid "Extended Stanza Addressing"
 msgstr "Endereçamento de Stanza estendido"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
 msgid "Multi-User Chat"
 msgstr "Bate-papo multiusuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Informações estendidas de presença em bate-papos multiusuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "In-Band Bytestreams"
 msgstr "Bytestreams In-Band"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Ad-Hoc Commands"
 msgstr "Comandos ad-hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "PubSub Service"
 msgstr "Serviço PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "SOCKS5 Bytestreams"
 msgstr "Bytestreams via SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Out of Band Data"
 msgstr "Suporte a dados 'out of band'"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "In-Band Registration"
 msgstr "Registro 'In-Band'"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "User Location"
 msgstr "Localização do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "User Avatar"
 msgstr "Imagem de exibição do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Chat State Notifications"
 msgstr "Notificações do status do bate-papo"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Software Version"
 msgstr "Versão do software"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Stream Initiation"
 msgstr "Inicialização de fluxoOrientação"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
-#: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "Transferência de arquivo"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "User Mood"
 msgstr "Humor do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "User Activity"
 msgstr "Atividade do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Entity Capabilities"
 msgstr "Recursos do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "Encrypted Session Negotiations"
 msgstr "Negociação de sessão criptografada"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Tune"
 msgstr "Música do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "Roster Item Exchange"
 msgstr "Troca de itens da lista de amigos"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "Reachability Address"
 msgstr "Endereço de contato"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "User Profile"
 msgstr "Perfil do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Jingle Audio"
 msgstr "Áudio do Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "User Nickname"
 msgstr "Apelido do usuário"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Jingle ICE UDP"
 msgstr "ECI UDP do Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Jingle ICE TCP"
 msgstr "ECI TCP do Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "Jingle Raw UDP"
 msgstr "UDP puro do Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Jingle Video"
 msgstr "Vídeo do Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Jingle DTMF"
 msgstr "Discagem a tom do Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Message Receipts"
 msgstr "Recibos de mensagem"
 
-#: ../libpurple/protocols/jabber/buddy.c:917
-#: ../libpurple/protocols/jabber/buddy.c:1077
 msgid "Public Key Publishing"
 msgstr "Publicação de chave pública"
 
-#: ../libpurple/protocols/jabber/buddy.c:919
-#: ../libpurple/protocols/jabber/buddy.c:1079
 msgid "User Chatting"
 msgstr "Notificação de bate-papos"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
 msgid "User Browsing"
 msgstr "Notificação de onde está navegando"
 
-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1083
 msgid "User Gaming"
 msgstr "Notificação do que está jogando"
 
-#: ../libpurple/protocols/jabber/buddy.c:925
-#: ../libpurple/protocols/jabber/buddy.c:1085
 msgid "User Viewing"
 msgstr "Notificação do que está assistindo"
 
-#: ../libpurple/protocols/jabber/buddy.c:927
-#: ../libpurple/protocols/jabber/buddy.c:1087
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:929
-#: ../libpurple/protocols/jabber/buddy.c:1089
 msgid "Stanza Encryption"
 msgstr "Criptografia de Stanza"
 
-#: ../libpurple/protocols/jabber/buddy.c:931
-#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Entity Time"
 msgstr "Informações de horário"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Delayed Delivery"
 msgstr "Entrega atrasada"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Collaborative Data Objects"
 msgstr "Objetos de dados colaborativos"
 
-#: ../libpurple/protocols/jabber/buddy.c:937
-#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "File Repository and Sharing"
 msgstr "Compartilhamento e repositório de arquivos"
 
-#: ../libpurple/protocols/jabber/buddy.c:939
-#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "STUN Service Discovery for Jingle"
 msgstr "Serviço de descoberta STUN para o Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Negociação de sessão criptografada simplificada"
 
-#: ../libpurple/protocols/jabber/buddy.c:943
-#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "Hop Check"
 msgstr "Verificação de saltos"
 
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/jabber/buddy.c:1111
-#: ../libpurple/protocols/oscar/oscar.c:2960
 msgid "Capabilities"
 msgstr "Recursos"
 
-#: ../libpurple/protocols/jabber/buddy.c:963
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1103
-msgid "Resource"
-msgstr "Recurso"
-
-#: ../libpurple/protocols/jabber/buddy.c:965
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1638
-#: ../libpurple/protocols/jabber/jabber.c:1652
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../libpurple/protocols/jabber/buddy.c:1274
-#: ../libpurple/protocols/silc/ops.c:1008
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Recurso"
+
 msgid "Middle Name"
 msgstr "Nome do meio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1307
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/oscar/oscar.c:3825
-#: ../libpurple/protocols/oscar/oscar.c:3838
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1044
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Endereço"
 
-#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "P.O. Box"
 msgstr "Caixa postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:2004
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:2011
 msgid "(Re-)Request authorization"
 msgstr "(Re-)requisitar autorização"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:2020
 msgid "Unsubscribe"
 msgstr "Parar de monitorar a presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
 msgid "Log In"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Log Out"
 msgstr "Desconectar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2085
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "Disponível para bate-papo"
 
-#: ../libpurple/protocols/jabber/buddy.c:2089
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2091
-#: ../libpurple/protocols/jabber/jabber.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5921
-#: ../libpurple/protocols/sametime/sametime.c:3349
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Não perturbe"
 
-#: ../libpurple/protocols/jabber/buddy.c:2258
 msgid "JID"
 msgstr "ID Jabber"
 
-#: ../libpurple/protocols/jabber/buddy.c:2262
-#: ../libpurple/protocols/jabber/buddy.c:2451
-#: ../libpurple/protocols/oscar/oscar.c:3748
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/jabber/buddy.c:2294
 msgid "The following are the results of your search"
 msgstr "Os seguintes são os resultados da sua busca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2379
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5589,183 +3942,120 @@ msgstr ""
 "Encontre um contato digitando critérios de busca nos campos abaixo. Nota: "
 "Todos os campos suportam caracteres coringa (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2399
 msgid "Directory Query Failed"
 msgstr "A consulta ao serviço de diretório falhou"
 
-#: ../libpurple/protocols/jabber/buddy.c:2400
 msgid "Could not query the directory server."
 msgstr "Não foi possível consultar o servidor do serviço de diretório."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2434
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruções do servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2441
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Preencha um ou mais campos para procurar um usuário XMPP que satisfaça este "
 "critério."
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3751
-#: ../libpurple/protocols/oscar/oscar.c:3760
 msgid "Email Address"
 msgstr "Endereço de email"
 
-#: ../libpurple/protocols/jabber/buddy.c:2470
-#: ../libpurple/protocols/jabber/buddy.c:2471
 msgid "Search for XMPP users"
 msgstr "Pesquisar por usuários XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2472
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:177
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5667
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2487
 msgid "Invalid Directory"
 msgstr "Diretório inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:2504
 msgid "Enter a User Directory"
 msgstr "Digite um diretório de usuários"
 
-#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Select a user directory to search"
 msgstr "Selecione um diretório de usuários para procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2508
 msgid "Search Directory"
 msgstr "Diretório de Pesquisa"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5401
-#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Apelido:"
 
-#: ../libpurple/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s não é um nome de sala válido"
 
-#: ../libpurple/protocols/jabber/chat.c:227
 msgid "Invalid Room Name"
 msgstr "Nome de sala inválido"
 
-#: ../libpurple/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s não é um nome de servidor válido"
 
-#: ../libpurple/protocols/jabber/chat.c:233
-#: ../libpurple/protocols/jabber/chat.c:234
 msgid "Invalid Server Name"
 msgstr "Nome de servidor inválido"
 
-#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s não é um apelido de sala válido"
 
-#: ../libpurple/protocols/jabber/chat.c:239
-#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Room Handle"
 msgstr "Apelido de sala inválido"
 
-#: ../libpurple/protocols/jabber/chat.c:401
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
-#: ../libpurple/protocols/jabber/chat.c:410
-#: ../libpurple/protocols/jabber/chat.c:553
 msgid "Unable to configure"
 msgstr "Não foi possível configurar"
 
-#: ../libpurple/protocols/jabber/chat.c:425
 msgid "Room Configuration Error"
 msgstr "Erro de configuração de sala"
 
-#: ../libpurple/protocols/jabber/chat.c:426
 msgid "This room is not capable of being configured"
 msgstr "Esta sala não é capaz de ser configurada"
 
-#: ../libpurple/protocols/jabber/chat.c:475
-#: ../libpurple/protocols/jabber/chat.c:544
 msgid "Registration error"
 msgstr "Erro ao registrar"
 
-#: ../libpurple/protocols/jabber/chat.c:632
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Não é possível mudar o apelido em salas de bate-papo não-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:683
-#: ../libpurple/protocols/jabber/chat.c:694
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Erro ao obter lista de salas"
 
-#: ../libpurple/protocols/jabber/chat.c:742
 msgid "Invalid Server"
 msgstr "Servidor inválido"
 
-#: ../libpurple/protocols/jabber/chat.c:786
 msgid "Enter a Conference Server"
 msgstr "Entrar num servidor de conferência"
 
-#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Select a conference server to query"
 msgstr "Selecione um servidor de conferência a ser consultado"
 
-#: ../libpurple/protocols/jabber/chat.c:790
 msgid "Find Rooms"
 msgstr "Encontrar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Você requereu criptografia, mas este servidor não a suporta."
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Erro ao enviar"
 
-#: ../libpurple/protocols/jabber/jabber.c:401
 msgid "Ping timeout"
 msgstr "Tempo limite de ping excedido"
 
-#: ../libpurple/protocols/jabber/jabber.c:451
-#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/jabber/jabber.c:528
-#: ../libpurple/protocols/oscar/flap_connection.c:403
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
-#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5774,556 +4064,379 @@ msgstr ""
 "Não foi possível estabelecer conexão com o servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:635
-#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "ID do XMPP inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
 
-#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s foi efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registro em %s efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "Registro efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:737
-#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "Registro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Remoção do registro de %s efetuada com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:758
-#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "Desregistro efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "Desregistro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:934
-#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "Já está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1022
-#: ../libpurple/protocols/oscar/oscar.c:3827
-#: ../libpurple/protocols/oscar/oscar.c:3840
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1030
-#: ../libpurple/protocols/silc/ops.c:1049
-#: ../libpurple/protocols/silc/silc.c:988
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "Desregistrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Por favor preencha as informações abaixo para mudar seu registro de conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha as informações abaixo para registrar sua nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "Registrar nova conta do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Modificar registro de conta em %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registrar nova conta em %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "Mudar registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:1180
-#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "Erro ao desregistrar conta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1186
-#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "Conta desregistrada com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "Inicializando SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1359
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1462
-#: ../libpurple/protocols/jabber/jabber.c:1920
-#: ../libpurple/protocols/jabber/jabber.c:1963
-#: ../libpurple/protocols/jabber/jabber.c:2001
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5715
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "Ambas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "Inscrição"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
-#: ../libpurple/protocols/jabber/jabber.c:1654
-#: ../libpurple/protocols/jabber/jabber.c:1668
-#: ../libpurple/protocols/jabber/usermood.c:181
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1225
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Humor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/msn/msn.c:656
 msgid "Now Listening"
 msgstr "Ouvindo agora"
 
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/jabber.c:1641
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/jabber/jabber.c:1669
 msgid "Mood Text"
 msgstr "Humor (texto)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Allow Buzz"
 msgstr "Permitir que chamem sua atenção"
 
-#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "Artista da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "Título da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "Álbum da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "Gênero da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "Comentário da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "Faixa da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "Duração da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "Ano da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "URL da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "Senha alterada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
-#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1784
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:6502
-#: ../libpurple/protocols/silc/silc.c:1309
-#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Definir informações de usuário..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:6513
-#: ../libpurple/protocols/silc/silc.c:1305
-#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "Pesquisar por Usuários..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "Recurso não implementado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "Saiu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1910
-#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "Item não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "ID do XMPP em formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "Não aceitável"
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "Não permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "Pagamento requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "Destinatário indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "Registro requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "Servidor remoto não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "Servidor sobrecarregado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "Serviço indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "Inscrição requerida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "Autorização abortada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação da autorização incorreta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorização inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autenticação fraco demais"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "Falha temporária na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "Falha na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "Formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo de namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "Host fora do ar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "Host desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "Endereçamento impróprio"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "ID inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "Namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "Hosts não compatíveis"
 
-#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "Violação de normas"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "Limitação de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "XML restrito"
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "Ver outro host"
 
-#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "Desligamento do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "Condição indefinida"
 
-#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "Codificação não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de comando (Stanza) não suportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "Versão não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML mal-formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "Erro no fluxo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Não foi possível banir usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Filiação desconhecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Não foi possível filiar usuário %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Cargo desconhecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2159
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Não foi possível verificar presença de usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2261
-#: ../libpurple/protocols/jabber/jabber.c:2272
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 "Não foi possível chamar a atenção de %s, pois nada é conhecido sobre ele(a)."
 
-#: ../libpurple/protocols/jabber/jabber.c:2267
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 "Não foi possível chamar a atenção de %s, pois este(a) pode estar "
 "desconectado."
 
-#: ../libpurple/protocols/jabber/jabber.c:2298
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
@@ -6331,49 +4444,35 @@ msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2318
-#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "Buzz"
 msgstr "Chamar a atenção"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s chamou sua atenção!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Chamando a atenção de %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra com uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou mudar o tópico."
 
-#: ../libpurple/protocols/jabber/jabber.c:2380
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuário&gt; [sala]: Bane o usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6381,7 +4480,6 @@ msgstr ""
 "affiliate &lt;usuário&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
 "filiação do usuário com a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2392
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6389,32 +4487,25 @@ msgstr ""
 "role &lt;usuário&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "cargo do usuário na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2398
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2404
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr "join:  &lt;sala&gt; [senha]: Entra num bate-papo neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2410
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;usuário&gt; [motivo]:  Expulsa um usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2415
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para "
 "outro usuário."
 
-#: ../libpurple/protocols/jabber/jabber.c:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 "ping &lt;jid&gt;:       Verifica conexão com usuário/componente/servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2426
-#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 "buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
@@ -6429,96 +4520,70 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Plug-in do protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Requerer SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Forçar SSL antigo (porta 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3475
-#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Porta de conexão"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3472
-#: ../libpurple/protocols/silc/silc.c:2139
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:811
 msgid "Connect server"
 msgstr "Servidor de conexão"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "Proxy de transferência de arquivo"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s saiu da conversa."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Mensagem de %s"
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "O tópico é: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "A entrega de mensagens para %s falhou: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Erro de mensagem do XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
-msgid " (Code %s)"
+msgid "(Code %s)"
 msgstr " (Código %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: ../libpurple/protocols/jabber/presence.c:453
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
-#: ../libpurple/protocols/jabber/presence.c:534
-#: ../libpurple/protocols/jabber/presence.c:535
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:536
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6526,93 +4591,71 @@ msgstr ""
 "Você está criando uma nova sala. Você deseja configurá-la, ou aceitar as "
 "configurações padrão?"
 
-#: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:543
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
-#: ../libpurple/protocols/jabber/presence.c:585
-#, c-format
-msgid "Error in chat %s"
-msgstr "Erro no bate-papo %s"
-
-#: ../libpurple/protocols/jabber/presence.c:589
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/si.c:1018
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro no bate-papo %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois o usuário não suporta "
 "transferência de arquivos."
 
-#: ../libpurple/protocols/jabber/si.c:1019
-#: ../libpurple/protocols/jabber/si.c:1020
-#: ../libpurple/protocols/jabber/si.c:1089
 msgid "File Send Failed"
 msgstr "Falha no envio de arquivo"
 
-#: ../libpurple/protocols/jabber/si.c:1082
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Não foi possível enviar o arquivo para %s, ID do Jabber inválido"
 
-#: ../libpurple/protocols/jabber/si.c:1084
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois o usuário não está conectado"
 
-#: ../libpurple/protocols/jabber/si.c:1086
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois você não está recebendo "
 "informações de presença deste usuário"
 
-#: ../libpurple/protocols/jabber/si.c:1101
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Favor selecionar o recurso de %s para o qual você gostaria de mandar um "
 "arquivo"
 
-#: ../libpurple/protocols/jabber/si.c:1117
 msgid "Select a Resource"
 msgstr "Selecione um recurso"
 
-#: ../libpurple/protocols/jabber/usermood.c:194
-#: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
 msgstr "Editar humor do usuário"
 
-#: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
 msgstr "Favor selecionar seu humor na lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:198
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Definir"
 
-#: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
 msgstr "Definir humor..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Definir apelido do usuário"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Favor digitar seu novo apelido."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -6620,30 +4663,22 @@ msgstr ""
 "Como estas informações são visíveis para todos os contatos da sua lista de "
 "contatos, é recomendável escolher algo apropriado."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Definir apelido..."
 
-#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Actions"
 msgstr "Ações"
 
-#: ../libpurple/protocols/jabber/xdata.c:383
 msgid "Select an action"
 msgstr "Selecione uma ação"
 
-#: ../libpurple/protocols/msn/contact.c:782
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Falha ao obter catálogo de endereços do MSN"
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronização da lista de amigos em %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6652,8 +4687,6 @@ msgstr ""
 "%s na lista local está dentro do grupo \"%s\", mas não está na lista do "
 "servidor. Você deseja adicionar este amigo?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6662,336 +4695,261 @@ msgstr ""
 "%s está na lista local, mas não está na lista do servidor. Você deseja "
 "adicionar este amigo?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Não foi possível processar mensagem"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Erro de sintaxe (provavelmente um bug do cliente)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr "Endereço de email inválido"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Usuário inexistente"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Faltando nome de domínio totalmente qualificado"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Você já está conectado"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
+#, c-format
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Apelido inválido"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Lista cheia"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Já está lá"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Não está na lista"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:760
+#, c-format
 msgid "User is offline"
 msgstr "Usuário está desconectado"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Você já está nesse modo"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Usuário já está na lista oposta"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Excesso de grupos"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "O usuário não está no grupo"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Nome do grupo muito extenso."
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Não foi possível remover o grupo zero"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Você tentou adicionar um usuário a um grupo que não existe"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "O quadro de comunicações falhou"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "A notificação de transferência falhou"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Campos requeridos não foram preenchidos"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Acessos demais a um FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:121
+#, c-format
 msgid "Not logged in"
 msgstr "Desconectado"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Serviço temporariamente indisponível"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Erro do servidor de banco de dados"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Comando desativado"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Erro ao executar operação de arquivo"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Erro de alocação de memória"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL incorreto enviado para o servidor"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Servidor indisponível"
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "O servidor de notificação de pares está fora do ar"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Erro ao conectar ao banco de dados"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "O servidor vai sair do ar (abandonar navio)"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Erro ao criar a conexão"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parâmetros CVR desconhecidos ou não permitidos"
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Não foi possível enviar"
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Sessão sobrecarregada"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "O usuário está muito ativo"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Excesso de sessões"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Conta do Passport não verificada"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Arquivo de amigos mal formado"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Inesperado"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "O apelido foi mudado rapidamente demais"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Servidor ocupado demais"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1422
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
+#, c-format
 msgid "Authentication failed"
 msgstr "Autenticação mal sucedida"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Não permitido enquanto desconectado"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Usuários novos não estão sendo aceitos"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport para crianças sem consentimento dos pais"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Conta do Passport ainda não foi verificada"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Bilhete inválido"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Código de erro desconhecido: %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Erro MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Chamar a atenção"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s chamou sua atenção!"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Chamando a atenção de %s..."
 
-#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
+msgid "Email Address..."
+msgstr "Endereço de email..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Seu novo apelido é longo demais."
 
-#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Defina seu apelido."
 
-#: ../libpurple/protocols/msn/msn.c:297 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Esse é o nome que será visto como seu pelos outros amigos MSN."
 
-#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Defina seu número de telefone de casa."
 
-#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Defina seu número de telefone do trabalho."
 
-#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Defina seu número de telefone móvel."
 
-#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "Permitir pages MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:365 ../libpurple/protocols/msnp9/msn.c:348
 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?"
@@ -6999,69 +4957,53 @@ msgstr ""
 "Você deseja permitir ou não permitir que pessoas na sua lista de amigos "
 "enviem pages MSN Mobile para seu celular ou outro dispositivo móvel?"
 
-#: ../libpurple/protocols/msn/msn.c:371 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Não permitir"
 
-#: ../libpurple/protocols/msn/msn.c:388 ../libpurple/protocols/msnp9/msn.c:371
-msgid "This Hotmail account may not be active."
-msgstr "Esta conta do Hotmail pode não estar ativa."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Texto bloqueado para %s"
+
+msgid "No text is blocked for this account."
+msgstr "Nenhum texto está bloqueado para esta conta."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"Os servidores do MSN estão atualmente bloqueando as seguintes expressões "
+"regulares:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Esta conta não possui e-mail disponível."
 
-#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Enviar uma mensagem para dispositivo móvel."
 
-#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "Número de Telefone Residencial"
 
-#: ../libpurple/protocols/msn/msn.c:683 ../libpurple/protocols/msnp9/msn.c:571
 msgid "Work Phone Number"
 msgstr "Número de Telefone do Trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msnp9/msn.c:575
 msgid "Mobile Phone Number"
 msgstr "Número de Telefone Celular"
 
-#: ../libpurple/protocols/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:594
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Be Right Back"
 msgstr "Volto já"
 
-#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:598
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../libpurple/protocols/yahoo/yahoo.c:3842
 msgid "On the Phone"
 msgstr "Ao telefone"
 
-#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3148
-#: ../libpurple/protocols/yahoo/yahoo.c:3848
 msgid "Out to Lunch"
 msgstr "Em horário de almoço"
 
@@ -7071,339 +5013,189 @@ msgstr "Em horário de almoço"
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:745
-#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Artista"
 
-#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "Álbum"
 
-#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Definir apelido..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Definir número de telefone de casa..."
 
-#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Definir número de telefone do trabalho..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Definir número de telefone móvel..."
 
-#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ativar/Desativar dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Não permitir pages para dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
+msgid "View Blocked Text..."
+msgstr "Ver Texto Bloqueado..."
+
 msgid "Open Hotmail Inbox"
 msgstr "Abrir caixa de entrada do Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Enviar para dispositivo móvel"
 
-#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
-#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Iniciar _bate-papo"
 
-#: ../libpurple/protocols/msn/msn.c:871 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "O suporte ao SSL é necessário para o MSN. Por favor instale uma biblioteca "
 "SSL suportada."
 
-#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
-#: ../libpurple/protocols/msnp9/msn.c:1526
-#: ../libpurple/protocols/msnp9/msn.c:1869
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1751
-#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Geral"
 
-#: ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msnp9/msn.c:1599
-#: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1601
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: ../libpurple/protocols/msn/msn.c:1761
-#: ../libpurple/protocols/msnp9/msn.c:1602
-#: ../libpurple/protocols/myspace/user.c:133
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
-#: ../libpurple/protocols/zephyr/zephyr.c:802
-#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Localização"
 
-#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
-#: ../libpurple/protocols/msnp9/msn.c:1607
-#: ../libpurple/protocols/msnp9/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1812
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
-#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
-#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msnp9/msn.c:1613
-#: ../libpurple/protocols/msnp9/msn.c:1733
-#: ../libpurple/protocols/msnp9/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1754
-#: ../libpurple/protocols/msnp9/msn.c:1761
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1791
-#: ../libpurple/protocols/msnp9/msn.c:1632
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1792
-#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "Animais de estimação"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "Cidade natal"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "Locais em que viveu"
 
-#: ../libpurple/protocols/msn/msn.c:1796
-#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msn/msn.c:1986
-#: ../libpurple/protocols/msnp9/msn.c:1640
-#: ../libpurple/protocols/msnp9/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Contact Info"
 msgstr "Informações do contato"
 
-#: ../libpurple/protocols/msn/msn.c:1817
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1820
-#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "Parceiro(a)"
 
-#: ../libpurple/protocols/msn/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "Telefone doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "Telefone doméstico 2"
 
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1664
-#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Home Address"
 msgstr "Endereço de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "Celular pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "Fax doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal Email"
 msgstr "Email pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "MI Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "Aniversário de casamento"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "Negócios"
 
-#: ../libpurple/protocols/msn/msn.c:1847
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/silc/ops.c:1024
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Título de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1848
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1849
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1850
-#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "Profissão"
 
-#: ../libpurple/protocols/msn/msn.c:1851
-#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "Telefone do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1852
-#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "Telefone 2 do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1853
-#: ../libpurple/protocols/msnp9/msn.c:1694
-#: ../libpurple/protocols/oscar/oscar.c:3843
 msgid "Work Address"
 msgstr "Endereço de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1854
-#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "Celular de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1855
-#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "Pager de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1856
-#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "Fax de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1857
-#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Email"
 msgstr "Email de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "MI de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1859
-#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "Data de início"
 
-#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: ../libpurple/protocols/msn/msn.c:1994
-#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "Última atualização"
 
-#: ../libpurple/protocols/msn/msn.c:2005
-#: ../libpurple/protocols/msnp9/msn.c:1846
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1040
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/msn/msn.c:2029
-#: ../libpurple/protocols/msnp9/msn.c:1870
 msgid "The user has not created a public profile."
 msgstr "O usuário não criou um perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:2030
-#: ../libpurple/protocols/msnp9/msn.c:1871
 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 "
@@ -7413,8 +5205,6 @@ msgstr ""
 "que o usuário não existe, ou que o usuário existe mas não criou um perfil "
 "público."
 
-#: ../libpurple/protocols/msn/msn.c:2034
-#: ../libpurple/protocols/msnp9/msn.c:1875
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7422,9 +5212,6 @@ msgstr ""
 "Não foi possível encontrar nenhuma informação no perfil do usuário. "
 "Provavelmente o usuário não existe."
 
-#: ../libpurple/protocols/msn/msn.c:2042
-#: ../libpurple/protocols/msnp9/msn.c:1883
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "URL do Perfil"
 
@@ -7438,130 +5225,81 @@ msgstr "URL do Perfil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Plug-in de protocolo do Windows Live Messanger"
 
-#: ../libpurple/protocols/msn/msn.c:2366
-#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2371
-#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "Servidor do método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2376
-#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Exibir emoticons personalizados"
 
-#: ../libpurple/protocols/msn/msn.c:2384
-#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: chama a atenção do usuário"
 
-#: ../libpurple/protocols/msn/nexus.c:71
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Autenticação do Windows Live ID: Falha ao conectar"
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:124
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Autenticação do Windows Live ID: Não foi possível encontrar token de "
-"autenticação na resposta do servidor"
-
-#: ../libpurple/protocols/msn/nexus.c:171
-msgid "Windows Live ID authentication Failed"
-msgstr "A autenticação do Windows Live ID falhou"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Autenticação do Windows Live ID:Resposta inválida"
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s não é um grupo válido."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:935
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s em %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:513
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s chamou sua atenção!"
 
-#: ../libpurple/protocols/msn/notification.c:840
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Erro desconhecido (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:841
-#: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "Não foi possível adicionar usuário"
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Não foi possível adicionar usuário em %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Não foi possível bloquear usuário em %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:909
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Não foi possível permitir usuário em %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:917
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s não pôde ser adicionado porque a sua lista de amigos está cheia."
 
-#: ../libpurple/protocols/msn/notification.c:926
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s não é uma conta do Passport válida."
 
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Serviço temporariamente indisponível."
 
-#: ../libpurple/protocols/msn/notification.c:1336
-#: ../libpurple/protocols/msnp9/notification.c:898
+msgid "Mobile message was not sent because it was too long."
+msgstr "A mensagem móvel não pôde ser enviada porque era muito longa."
+
 msgid "Unable to rename group"
 msgstr "Não foi possível renomear grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1391
-#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "Não foi possível remover grupo"
 
-#: ../libpurple/protocols/msn/notification.c:2008
-#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7590,40 +5328,34 @@ msgstr[1] ""
 "\n"
 "Depois que a manutenção terminar, você poderá conectar com sucesso."
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"A mensagem não foi enviada por que o sistema está indisponível. Isso "
+"normalmente acontece quando o usuário é bloqueado ou não existe."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+"A mensagem não pôde ser enviada porque está sendo enviada muito rapidamente:"
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"A mensagem não pôde ter sido enviada devido a um erro desconhecido de "
+"codificação."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
+
 msgid "Unable to connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Erro de escrita"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7632,125 +5364,77 @@ msgstr ""
 "Erro de conexão do servidor %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "Nosso protocolo não é suportado pelo servidor."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Erro ao processar HTTP."
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Você conectou de outro local."
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Os servidores do MSN estão temporariamente indisponíveis. Favor esperar e "
 "tentar novamente."
 
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN vão sair do ar temporariamente."
 
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Não foi possível autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Sua lista de amigos do MSN está temporariamente indisponível. Favor aguardar "
 "e tentar novamente."
 
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Negociando"
 
-#: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Iniciando autenticação"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Recebendo o cookie"
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Enviando o cookie"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Ao telefone"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Em horário de almoço"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "A mensagem pode não ter sido enviada porque o tempo limite foi atingido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "A mensagem não foi enviada (isso não é permitido enquanto invisível):"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:423
 msgid "Message could not be sent because the user is offline:"
 msgstr "A mensagem não pôde ser enviada porque o usuário está desconectado:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:427
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "A mensagem não pôde ser enviada porque um erro de conexão ocorreu:"
 
-#: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "A mensagem não pôde ser enviada porque estamos enviando muito rapidamente:"
 
-#: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:435
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7759,25 +5443,17 @@ msgstr ""
 "com o servidor. Isto é provavelmente um problema do mesmo, tente novamente "
 "em alguns minutos:"
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:442
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "A mensagem não pôde ser enviada porque um erro ocorreu no switchboard:"
 
-#: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:450
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s te adicionou à sua lista de contatos."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s te removeu da sua lista de contatos."
@@ -7785,18 +5461,16 @@ msgstr "%s te removeu da sua lista de contatos."
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:713
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Não foi possível adicionar \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:716
-#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The username specified is invalid."
 msgstr "O nome de usuário especificado é inválido."
 
-#: ../libpurple/protocols/msnp9/msn.c:546
+msgid "This Hotmail account may not be active."
+msgstr "Esta conta do Hotmail pode não estar ativa."
+
 msgid "Has you"
 msgstr "Tem você"
 
@@ -7810,20 +5484,15 @@ msgstr "Tem você"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2170
-#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "Plug-in do protocolo MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Cifra não encontrada"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "A cifra RC4 não pôde ser encontrada"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -7831,76 +5500,64 @@ msgstr ""
 "Atualize sua versão do libpurple para uma que tenha suporte a RC4 (>= "
 "2.0.1). O plug-in do MySpace não será carregado."
 
-#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "Lendo negociação de criptografia"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "Tamanho inesperado de challenge criptográfico vindo do servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+"Conexão com o servidor perdida (não houve recepção de dados no último %d "
+"segundo)"
+msgstr[1] ""
 "Conexão com o servidor perdida (não houve recepção de dados nos últimos %d "
 "segundos)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1374
 msgid "New mail messages"
 msgstr "Novas mensagens de email"
 
-#: ../libpurple/protocols/myspace/myspace.c:1375
 msgid "New blog comments"
 msgstr "Novos comentários no blog"
 
-#: ../libpurple/protocols/myspace/myspace.c:1376
 msgid "New profile comments"
 msgstr "Novos comentários no perfil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New friend requests!"
 msgstr "Novos pedidos de amizade!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New picture comments"
 msgstr "Novos comentários nas fotos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1408
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1594
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - Sem nome de usuário definido"
 
-#: ../libpurple/protocols/myspace/myspace.c:1595
 msgid "You appear to have no MySpace username."
 msgstr "Parece que você não tem um nome de usuário do MySpace."
 
-#: ../libpurple/protocols/myspace/myspace.c:1596
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "Você gostaria de definir um agora? (Nota: ISTO NÃO PODERÀ SER MODIFICADO!)"
+msgstr ""
+"Você gostaria de definir um agora? (Nota: ISTO NÃO PODERÀ SER MODIFICADO!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1620
-#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/myspace/myspace.c:1855
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, código %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1877
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7909,195 +5566,149 @@ msgid ""
 "again."
 msgstr ""
 "%s Sua senha é %d caracteres, maior que o tamanho máximo esperado de %d para "
-"o MySpaceIM. Por favor, encurte sua senha no http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"e tente novamente."
+"o MySpaceIM. Por favor, encurte sua senha no http://profileedit.myspace.com/"
+"index.cfm?fuseaction=accountSettings.changePassword e tente novamente."
 
-#: ../libpurple/protocols/myspace/myspace.c:1900
 msgid "MySpaceIM Error"
 msgstr "Erro do MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
-#: ../libpurple/protocols/myspace/myspace.c:2112
 msgid "Failed to add buddy"
 msgstr "Falha ao adicionar amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
 msgid "'addbuddy' command failed."
 msgstr "O comando 'addbuddy' falhou."
 
-#: ../libpurple/protocols/myspace/myspace.c:2112
-#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "persist command failed"
 msgstr "O comando 'persist' falhou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2217
 #, c-format
 msgid "No such user: %s"
 msgstr "Usuário não existe: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2219
 msgid "User lookup"
 msgstr "Procurar usuário"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2357
-#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "Failed to remove buddy"
 msgstr "Falha ao remover amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
 msgid "'delbuddy' command failed"
 msgstr "O comando 'delbuddy' falhou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "blocklist command failed"
 msgstr "O comando 'blocklist' falhou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2493
 msgid "Invalid input condition"
 msgstr "Condição de entrada inválida"
 
-#: ../libpurple/protocols/myspace/myspace.c:2548
 msgid "Read buffer full (2)"
 msgstr "Buffer de leitura cheio (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2591
 msgid "Unparseable message"
 msgstr "Mensagem impossível de ser processada"
 
-#: ../libpurple/protocols/myspace/myspace.c:2662
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Não foi possível conectar ao host: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2840
 msgid "IM Friends"
 msgstr "Amigos de MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2940
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"%d amigo foi adicionado ou atualizado do servidor (incluindo amigos que já "
+"estavam na lista de amigos do servidor)"
+msgstr[1] ""
 "%d amigos foram adicionados ou atualizados do servidor (incluindo amigos que "
 "já estavam na lista de amigos do servidor)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2941
 msgid "Add contacts from server"
 msgstr "Adicionar contatos do servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:2993
-#: ../libpurple/protocols/myspace/myspace.c:3057
 msgid "Add friends from MySpace.com"
 msgstr "Adicionar amigos do MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2994
 msgid "Importing friends failed"
 msgstr "Falha ao importar amigos"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Find people..."
 msgstr "Encontrar pessoas..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3053
 msgid "Change IM name..."
 msgstr "Alterar nome da conversa..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3354
 msgid "myim URL handler"
 msgstr "Suporte a URLs myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3355
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 "Não foi possível encontrar uma conta adequada do MySpace para abrir esta URL "
 "myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3356
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Ative a conta do MySpace correta e tente novamente."
 
-#: ../libpurple/protocols/myspace/myspace.c:3479
 msgid "Show display name in status text"
 msgstr "Exibir apelido na mensagem de status"
 
-#: ../libpurple/protocols/myspace/myspace.c:3482
 msgid "Show headline in status text"
 msgstr "Exibir frase na mensagem de status"
 
-#: ../libpurple/protocols/myspace/myspace.c:3487
 msgid "Send emoticons"
 msgstr "Enviar emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3492
 msgid "Screen resolution (dots per inch)"
 msgstr "Resolução da tela (pontos por polegada)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3495
 msgid "Base font size (points)"
 msgstr "Tamanho base da fonte (pontos)"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:790
-#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Usuário"
 
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3018
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "Frase"
 
-#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Música"
 
-#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Total de amigos"
 
-#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Versão do cliente"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:570
 msgid "No username set"
 msgstr "Nenhum nome de usuário definido"
 
-#: ../libpurple/protocols/myspace/user.c:577
-#: ../libpurple/protocols/myspace/user.c:671
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Por favor, escolha um nome de usuário"
 
-#: ../libpurple/protocols/myspace/user.c:578
 msgid "Please enter a username to check its availability:"
 msgstr "Por favor, entre um nome de usuário para chegar sua disponibilidade:"
 
-#: ../libpurple/protocols/myspace/user.c:658
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nome de Usuário Disponível"
 
-#: ../libpurple/protocols/myspace/user.c:659
 msgid "This username is available. Would you like to set it?"
 msgstr "Esse nome de usuário está disponível. Você gostaria de adotá-lo?"
 
-#: ../libpurple/protocols/myspace/user.c:660
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "UMA VEZ DEFINIDO, ESTE NÂO PODE SER MODIFICADO!"
 
-#: ../libpurple/protocols/myspace/user.c:672
 msgid "This username is unavailable."
 msgstr "Este nome de usuário está indisponível."
 
-#: ../libpurple/protocols/myspace/user.c:673
 msgid "Please try another username:"
 msgstr "Por favor, tente outro nome de usuário:"
 
@@ -8107,32 +5718,25 @@ msgstr "Por favor, tente outro nome de usuário:"
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:48
-#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Dar choque"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s te deu um choque!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Dando um choque em %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Bater"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s bateu em você!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Batendo em %s..."
@@ -8140,76 +5744,61 @@ msgstr "Batendo em %s..."
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Queimar"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s queimou você!"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Queimando %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Beijar"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s te beijou!"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Beijando %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Abraçar"
 
-#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s te abraçou!"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Abraçando %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Dar tapa"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s te deu um tapa!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Dando um tapa em %s..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Beliscar"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s te beliscou!"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Beliscando %s..."
@@ -8217,16 +5806,13 @@ msgstr "Beliscando %s..."
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "Cumprimentar"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s te cumprimentou!"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Cumprimentando %s..."
@@ -8234,16 +5820,13 @@ msgstr "Cumprimentando %s..."
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Tirar onda"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s tirou onda de você!"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Tirando onda de %s..."
@@ -8255,132 +5838,101 @@ msgstr "Tirando onda de %s..."
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Dar língua"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s te deu língua!"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Dar língua para %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Parâmetros requeridos não foram passados"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Não foi possível escrever na rede"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Não foi possível ler da rede"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Erro na comunicação com o servidor"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Conferência não encontrada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Conferência inexistente"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Uma pasta com este nome já existe"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "A senha expirou"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Usuário não encontrado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "A conta foi desativada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "O servidor não pôde acessar o diretório"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "O administrador do seu sistema desativou esta operação"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "O servidor está indisponível; tente de novo mais tarde"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Não é possível adicionar um contato na mesma pasta duas vezes"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Não é possível adicionar a si próprio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "O arquivo mestre está mal configurado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect username or password"
 msgstr "Nome de usuário ou senha incorreto(a)"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the username you entered"
 msgstr "Não foi possível reconhecer o host do nome de usuário digitado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
 "Sua conta foi desativada porque muitas senhas inválidas foram digitadas."
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Você não pode adicionar a mesma pessoa duas vezes a uma conversa"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Você atingiu seu limite de contatos permitidos"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect username"
 msgstr "Você digitou um nome de usuário incorreto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Ocorreu um erro ao atualizar o diretório"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Versão do protocolo incompatível"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "O usuário bloqueou você"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8388,58 +5940,47 @@ msgstr ""
 "Esta versão de avaliação não permite que mais de dez usuários se conectem ao "
 "mesmo tempo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "O usuário está desconectado ou você está bloqueado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Erro desconhecido: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "A conexão falhou (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Não foi possível enviar mensagem. Não foi possível obter detalhes do usuário "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Não foi possível adicionar %s a sua lista de amigos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Não foi possível enviar mensagem (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Não foi possível enviar mensagem para %s. Não foi possível criar a "
 "conferência (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "Não foi possível enviar mensagem. Não foi possível criar a conferência (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8448,7 +5989,6 @@ msgstr ""
 "Não foi possível mover usuário %s para a pasta %s na lista do servidor. Erro "
 "ao criar a pasta (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8457,62 +5997,46 @@ msgstr ""
 "Não foi possível adicionar %s à sua lista de amigos. Erro ao criar pasta na "
 "lista do servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Não foi possível obter detalhes do usuário %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Não foi possível adicionar usuário a sua lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Não foi possível adicionar %s a sua lista de usuários bloqueados (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Não foi possível adicionar %s a sua lista de amigos (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Não foi possível remover %s da sua lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Não foi possível mudar configurações de privacidade no servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Não foi possível criar conferência (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro na comunicação com o servidor. Fechando a conexão."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Número de telefone"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Tratamento"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4178
 msgid "User ID"
 msgstr "ID do usuário"
 
@@ -8522,37 +6046,29 @@ msgstr "ID do usuário"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferência GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s foi convidado para esta conversa."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Convite para conversa"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8563,15 +6079,12 @@ msgstr ""
 "\n"
 "Enviado: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Você deseja entrar na conversa?"
 
-#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Você foi desconectado porque conectou em outra estação de trabalho."
 
-#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8579,7 +6092,6 @@ msgstr ""
 "%s parece estar desconectado e não recebeu a mensagem que você acabou de "
 "enviar."
 
-#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8587,11 +6099,10 @@ msgstr ""
 "Não foi possível conectar ao servidor. Por favor digite o endereço do "
 "servidor em que você deseja conectar."
 
-#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O suporte a SSL não está instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2522
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não é possível enviar mais mensagens."
 
@@ -8605,41 +6116,24 @@ msgstr "Esta conferência foi fechada. Não é possível enviar mais mensagens."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3536
-#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plug-in de protocolo do mensageiro do Novell GroupWise"
 
-#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Porta do servidor"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:62
 msgid "Could not join chat room"
 msgstr "Não foi possível entrar na sala de bate-papo"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Invalid chat room name"
 msgstr "Nome de sala de bate-papo inválido"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2505
-#: ../libpurple/protocols/yahoo/yahoo.c:2673
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
-#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
-#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
 msgid "Server closed the connection."
 msgstr "O servidor encerrou a conexão."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
-#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
-#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8648,10 +6142,6 @@ msgstr ""
 "A conexão com o servidor foi perdida: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:401
-#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
-#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
-#: ../libpurple/proxy.c:1554
 msgid "Received invalid data on connection with server."
 msgstr "Dados inválidos foram recebidos na conexão com o servidor."
 
@@ -8665,8 +6155,6 @@ msgstr "Dados inválidos foram recebidos na conexão com o servidor."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Plug-in do protocolo AIM"
 
@@ -8680,43 +6168,31 @@ msgstr "Plug-in do protocolo AIM"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Plug-in do protocolo ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4456
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Codificação"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "O usuário remoto encerrou a conexão."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "O usuário remoto recusou seu pedido."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Conexão com o usuário remoto perdida:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Dados inválidos foram recebidos na conexão com o usuário remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Não foi possível estabelecer conexão com o usuário remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Mensagem instantânea direta estabelecida"
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
@@ -8725,108 +6201,82 @@ msgstr ""
 "%s tentou te enviar um arquivo %s, mas nós só permitimos arquivos de até %s "
 "pelo MI Direto. Tente usar a transferência de arquivos.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "O arquivo %s tem %s, o que é maior que o tamanho máximo de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Erro inválido"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Taxa para host"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Taxa para cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Serviço indisponível"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Serviço não definido"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "Não suportado pelo host"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "Não suportado pelo cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Recusado pelo cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Resposta muito extensa"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "Respostas perdidas"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "Requisição negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC excedida"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Direitos insuficientes"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "Na lista local de usuários permitidos/bloqueados"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (sender)"
-msgstr "Malvado demais (remetente)"
+msgid "Warning level too high (sender)"
+msgstr "Nível de avisos muito alto (remetente)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
-msgid "Too evil (receiver)"
-msgstr "Malvado demais (destinatário)"
+msgid "Warning level too high (receiver)"
+msgstr "Nível de avisos muito alto (destinatário)"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "Usuário temporariamente indisponível"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "Limite de tamanho da lista excedido"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Requisição ambígua"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Fila cheia"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "Não enquanto estiver na AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:349
 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 "
@@ -8838,7 +6288,6 @@ msgstr ""
 "codificação que ele está usando, você pode especificá-la nas opções "
 "avançadas de conta para a sua conta do AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8848,135 +6297,101 @@ msgstr ""
 "codificações diferentes, ou %s usa um cliente com defeito.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2444
-#: ../pidgin/gtkutils.c:2474
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "Ícone de exibição"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "Mensagem instantânea direta do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
-#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "Get File"
 msgstr "Receber arquivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "Jogos"
 
-#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "Conexão direta do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "Usuário AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "Niilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "Relay do servidor ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 antigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "Criptografia do Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "Segurança ativada"
 
-#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "Bate-papo com vídeo"
 
-#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "AV do iChat"
 
-#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "Vídeo ao vivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "Câmera"
 
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5893
+msgid "Screen Sharing"
+msgstr "Compartilhamento de Tela"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5928
+#, c-format
 msgid "Not Available"
 msgstr "Não disponível"
 
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5914
+#, c-format
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:736
+#, c-format
 msgid "Web Aware"
 msgstr "Permitir que outros vejam seu status pela Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1089
+#, c-format
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../libpurple/protocols/oscar/oscar.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3744
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1210
 msgid "IP Address"
 msgstr "Endereço IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:846
-#: ../libpurple/protocols/oscar/oscar.c:2945
 msgid "Warning Level"
 msgstr "Nível de alerta"
 
-#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "Comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8985,7 +6400,6 @@ msgstr ""
 "Não foi possível conectar ao servidor de autenticação:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8994,58 +6408,44 @@ msgstr ""
 "Não foi possível conectar ao servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1044
 msgid "Username sent"
 msgstr "Nome de usuário enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "Conexão estabelecida, cookie enviado"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "Finalizando a conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:1306
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the username is invalid.  "
 "Usernames must be a valid email address, or start with a letter and contain "
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"Impossível efetuar login: Não foi possível conectar como %s porque o nome "
-"de usuário é inválido. Nomes de usuário têm que ser um endereço de email "
-"válido, ou têm que começar com uma letra e conter apenas letras, números "
-"e espaços, ou conter apenas números."
+"Impossível efetuar login: Não foi possível conectar como %s porque o nome de "
+"usuário é inválido. Nomes de usuário têm que ser um endereço de email "
+"válido, ou têm que começar com uma letra e conter apenas letras, números e "
+"espaços, ou conter apenas números."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1392
-#: ../libpurple/protocols/yahoo/yahoo.c:2127
 msgid "Invalid username."
 msgstr "Nome de usuário inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1398
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta está suspensa."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O serviço AOL Instant Messenger está temporariamente indisponível."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1410
-#: ../libpurple/protocols/oscar/oscar.c:1419
 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."
@@ -9054,46 +6454,33 @@ msgstr ""
 "minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A versão do cliente que você está usando é velha demais. Favor atualizar em %"
 "s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "Autorização recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID digitada é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "Digite o SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1493
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Digite o número de 6 dígitos do visor digital."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2335
-#: ../libpurple/protocols/oscar/oscar.c:5998
-#: ../libpurple/protocols/oscar/oscar.c:6280 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9102,57 +6489,41 @@ msgstr ""
 "Você pode ser desconectado num curto período de tempo. Você pode querer usar "
 "o TOC até que isso esteja corrigido. Verifique por atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "Não foi possível conseguir um hash de conexão AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1578
-#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "Não foi possível conseguir um hash de conexão válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1710
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:2256
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
 "amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2285
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2326
-#: ../libpurple/protocols/oscar/oscar.c:2334
-#: ../libpurple/protocols/oscar/oscar.c:2461
-#: ../libpurple/protocols/oscar/oscar.c:5370
-#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2333
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2461
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9163,18 +6534,15 @@ msgstr ""
 "o seguinte motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2469
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %u aceitou seu pedido para adicioná-lo(a) à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2477
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9187,7 +6555,6 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2485
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9200,7 +6567,6 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2493
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9213,38 +6579,31 @@ msgstr ""
 "A mensagem é: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2514
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuário de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2520
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Você quer adicionar este amigo à sua lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2525 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2526
 msgid "_Decline"
 msgstr "_Rejeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2650
 #, 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] "Você perdeu %hu mensagem de %s por que ela era inválida."
 msgstr[1] "Você perdeu %hu mensagens de %s por que elas eram inválidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2659
 #, 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] "Você perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Você perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2668
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9255,21 +6614,27 @@ msgstr[0] ""
 msgstr[1] ""
 "Você perdeu %hu mensagens de %s porque o limite de freqüência foi excedido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2677
 #, 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] "Você perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
-msgstr[1] "Você perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Você perdeu %hu mensagem de %s porque o nível de avisos dele/dela é muito "
+"alto."
+msgstr[1] ""
+"Você perdeu %hu mensagens de %s porque o nível de avisos dele/dela é muito "
+"alto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2686
 #, 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] "Você perdeu %hu mensagem de %s porque você é muito malvado(a)."
-msgstr[1] "Você perdeu %hu mensagens de %s porque você é muito malvado(a)."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Você perdeu %hu mensagem de %s porque seu nível de avisos é muito alto."
+msgstr[1] ""
+"Você perdeu %hu mensagens de %s porque seu nível de avisos é muito alto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2695
 #, 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."
@@ -9277,47 +6642,31 @@ msgstr[0] "Você perdeu %hu mensagem de %s por um motivo desconhecido."
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2850
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Não foi possível enviar mensagem: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2850
-#: ../libpurple/protocols/oscar/oscar.c:2855
-#: ../libpurple/protocols/oscar/oscar.c:2919
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2853
-#: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Não foi possível enviar mensagem para %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2919
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informação do usuário indisponível: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2950
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2955
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
-msgid "Available Message"
-msgstr "Mensagem de 'Disponível':"
-
-#: ../libpurple/protocols/oscar/oscar.c:3094
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3282
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9325,7 +6674,6 @@ msgstr ""
 "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
 "caracteres inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3446
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9333,74 +6681,56 @@ msgstr ""
 "A última ação que você tentou não pôde ser executada porque você excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:3531
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3766
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
-#: ../libpurple/protocols/oscar/oscar.c:3841
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3852
+msgid "Work Information"
+msgstr "Informações do trabalho"
+
 msgid "Division"
 msgstr "Divisão"
 
-#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Position"
 msgstr "Posição"
 
-#: ../libpurple/protocols/oscar/oscar.c:3855
 msgid "Web Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3858
-msgid "Work Information"
-msgstr "Informações do trabalho"
-
-#: ../libpurple/protocols/oscar/oscar.c:3914
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3954
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "O seguinte nome de usuário está associado com %s"
 msgstr[1] "Os seguintes nomes de usuário estão associados com %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nenhum resultado encontrado para o endereço de email %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4006
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Você deve receber um email pedindo para confirmar %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:4041
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
@@ -9409,13 +6739,11 @@ msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado difere do original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
@@ -9424,7 +6752,6 @@ msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado é muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -9433,7 +6760,6 @@ msgstr ""
 "Erro 0x%04x: Não foi possível mudar endereço de email porque já existe um "
 "pedido pendente para esse nome de usuário."
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -9442,7 +6768,6 @@ msgstr ""
 "Erro 0x%04x: Não foi possível mudar o endereço de email porque este já "
 "possui muitos nomes de usuário associados a ele."
 
-#: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -9451,36 +6776,29 @@ msgstr ""
 "Erro 0x%04x: Não foi possível mudar o endereço de email porque este é "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4055
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O endereço de email de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4063
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4249
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você precisa estar "
 "conectado diretamente para enviar imagens por mensagens instantâneas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM profile."
 msgstr "Não foi possível definir perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4521
 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 "
@@ -9490,7 +6808,6 @@ msgstr ""
 "procedimento de conexão ser concluído. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando você estiver totalmente conectado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4535
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9505,11 +6822,9 @@ msgstr[1] ""
 "O tamanho máximo de %d bytes do seu perfil foi excedido. Ele foi truncado "
 "para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4584
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9524,11 +6839,9 @@ msgstr[1] ""
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. Ele foi "
 "truncado para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4589
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4662
 #, c-format
 msgid ""
 "Could not add the buddy %s because the username is invalid.  Usernames must "
@@ -9539,17 +6852,12 @@ msgstr ""
 "Nomes de usuário têm que ser um email válido, começar com uma letra e conter "
 "apenas letras, números e espaços, ou conter apenas números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4664
-#: ../libpurple/protocols/oscar/oscar.c:5139
-#: ../libpurple/protocols/oscar/oscar.c:5154
 msgid "Unable To Add"
 msgstr "Não foi possível adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:4783
 msgid "Unable To Retrieve Buddy List"
 msgstr "Não foi possível recuperar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4784
 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 minutes."
@@ -9558,15 +6866,9 @@ msgstr ""
 "momento. Sua lista de amigos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4980
-#: ../libpurple/protocols/oscar/oscar.c:4982
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/oscar/oscar.c:5222
-#: ../libpurple/protocols/oscar/oscar.c:5227
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5137
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9575,17 +6877,13 @@ msgstr ""
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5137
-#: ../libpurple/protocols/oscar/oscar.c:5152
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5151
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Não foi possível adicionar o amigo %s por um motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:5285
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
@@ -9594,23 +6892,19 @@ msgstr ""
 "O usuário %s lhe deu permissão para adicioná-lo à sua lista de amigos. Você "
 "deseja adicioná-lo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5293
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5366
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %s aceitou seu pedido para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5367
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5370
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9621,49 +6915,31 @@ msgstr ""
 "seguinte motivo: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5371
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5407
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5520
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você não pode enviar "
 "imagens por mensagens instantâneas em bate-papos do AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/oscar/oscar.c:5687
-msgid "Away Message"
-msgstr "Mensagem de ausência"
-
-#: ../libpurple/protocols/oscar/oscar.c:5687
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(obtendo)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5887
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Buddy Comment:"
 msgstr "Comentário do amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6043
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Você selecionou abrir uma mensagem instantânea direta com %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:6047
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9671,66 +6947,50 @@ msgstr ""
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6088
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6102
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:6115
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6137
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6196
 msgid "Require authorization"
 msgstr "Pedir autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6199
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Disponível na Web (você vai receber SPAM ao ativar isto!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6204
 msgid "ICQ Privacy Options"
 msgstr "Opções de privacidade do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6224
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6225
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome do usuário pode mudar apenas a maiusculização e os "
 "espaços."
 
-#: ../libpurple/protocols/oscar/oscar.c:6278
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6324
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>você não está esperando autorização</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6327
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Você está esperando autorização dos seguintes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6328
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9738,65 +6998,50 @@ msgstr ""
 "Você pode re-requisitar autorização destes amigos clicando com o botão "
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6345
 msgid "Find Buddy by Email"
 msgstr "Encontrar amigo por email"
 
-#: ../libpurple/protocols/oscar/oscar.c:6346
 msgid "Search for a buddy by email address"
 msgstr "Pesquisar por um amigo pelo endereço de email"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Digite o endereço de email do amigo que você está procurando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6508
 msgid "Set User Info (web)..."
 msgstr "Definir Informações de usuário (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6519
 msgid "Change Password (web)"
 msgstr "Mudar Senha (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Configure IM Forwarding (web)"
 msgstr "Configurar encaminhamento de mensagens instantâneas (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6540
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Display Currently Registered Email Address"
 msgstr "Mostrar o endereço de Email registrado atualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6548
 msgid "Change Currently Registered Email Address..."
 msgstr "Mudar o endereço de Email registrado atualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6561
 msgid "Search for Buddy by Email Address..."
 msgstr "Procurar por amigos pelo endereço de Email..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6566
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
-#: ../libpurple/protocols/oscar/oscar.c:6754
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9805,27 +7050,26 @@ msgstr ""
 "Sempre usar o proxy do servidor AIM/ICQ para transferências de arquivo\n"
 "(mais lento, mas não revela seu endereço IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
+msgid "Allow multiple simultaneous logins"
+msgstr "Permitir múltiplos logins simultâneos"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pedindo para %s conectar a nós em %s:%hu para mensagem instantânea direta."
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentando conectar a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Tentando conectar pelo servidor proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s acabou de pedir para fazer uma conexão direta com %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1039
 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 "
@@ -9835,168 +7079,126 @@ msgstr ""
 "para mensagens instantâneas com imagens. Por revelar seu IP, isto pode ser "
 "considerado um risco de privacidade."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Informação primária"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Introdução pessoal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Número do QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "País/Região"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Signo do horóscopo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Signo do zodíaco"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Tipo sangüíneo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Universidade"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Número do celular"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Número de telefone"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Aquário"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Peixes"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Áries"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Touro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Gêmeos"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Câncer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Leão"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Virgem"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Libra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Escorpião"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Sagitário"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Capricórnio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Rato"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Boi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigre"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Coelho"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Dragão"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Serpente"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Cavalo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Carneiro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Macaco"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Galo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Cão"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Porco"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Outro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Modificar minhas informações"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Atualizar minhas informações"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Suas informações foram atualizadas"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -10005,216 +7207,151 @@ msgstr ""
 "A definição de rostos personalizados não é suportada no momento. Favor "
 "escolher uma imagem de %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Rosto do QQ"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Você rejeitou o pedido de %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Digite seu motivo:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Rejeitar pedido"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Desculpe, você não faz meu tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Falha ao adicionar amigo com pedido de autenticação"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Você removeu um amigo com sucesso"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Você foi removido da lista de contatos de seu amigo com sucesso"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "O usuário %d precisa de autenticação"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Digite o pedido aqui"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Você quer ser meu amigo?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "Você adicionou %d à lista de contatos"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Erro no QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid inválido"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID do Grupo"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Criador"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Descrição do grupo"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Autenticação"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "Qun do QQ"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Favor digitar o ID externo do grupo"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Você só pode procurar por grupos permanentes do QQ\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "O usuário %d solicitou entrada no grupo %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Motivo: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:281
-#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "Operação do Qun QQ"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprovar"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Seu pedido de entrada no grupo %d foi rejeitado pelo administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Seu pedido de entrada no grupo %d foi aprovado pelo administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Você [%d] saiu do grupo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Você [%d] foi adicionado(a) ao grupo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Este grupo foi adicionado à sua lista de amigos."
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Não sou um membro"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Sou um membro"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Estou solicitando entrada"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Sou o administrador"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Status desconhecido"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Este grupo não permite a entrada de outros"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Você saiu do grupo com sucesso"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autorização de grupo do QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Seu pedido de autorização foi aceito pelo servidor QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Você digitou um ID de grupo fora dos limites aceitos"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Você tem certeza de que deseja sair deste Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -10222,160 +7359,122 @@ msgstr ""
 "Observação: Se você for o criador,\n"
 "esta operação apagará este Qun."
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Código [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr "Erro na operação de grupo"
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:99
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Você deseja aprovar o pedido?"
 
-#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Digite seu motivo:"
 
-#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Você alterou o membro do Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Você alterou as informações do Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Você criou um Qun com sucesso"
 
-#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "Você deseja definir os detalhes do Qun agora?"
 
-#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Definir"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Mensagem do sistema"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Falha ao enviar mensagem."
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-msgid "Keep alive error"
-msgstr "Erro de keep-alive"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Desconhecido-%d"
+
+msgid "Level"
+msgstr "Nível"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
-msgstr "Erro ao solicitar token de conexão"
+msgid "Member"
+msgstr "Membro"
 
-#: ../libpurple/protocols/qq/login_logout.c:490
-msgid "Unable to login. Check debug log."
-msgstr "Não foi possível conectar, verifique o log de depuração."
+msgid " VIP"
+msgstr " VIP"
 
-#: ../libpurple/protocols/qq/login_logout.c:493
-msgid "Unable to login"
-msgstr "Não foi possível fazer o login"
+msgid " TCP"
+msgstr " TCP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "Não foi possível conectar."
+msgid " FromMobile"
+msgstr "DoCelular"
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
-msgstr "Desconhecido-%d"
+msgid " BindMobile"
+msgstr "VinculoCelular"
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "Endereço TCP"
+msgid " Video"
+msgstr " Vídeo"
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "Endereço UDP"
+msgid " Space"
+msgstr " Space"
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
-msgstr "Nível"
+msgid "Flag"
+msgstr "Flag"
+
+msgid "Ver"
+msgstr "Ver"
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Nome inválido"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Atualmente online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Última atualização</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Servidor</b>: %s: %d<br>\n"
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Tipo de conexão:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP do Servidor</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Nome real da máquina</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Meu IP público:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de conexão:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Último IP a conectar</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Última hora de conexão</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Informações de conexão"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Mudar minhas informações"
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Exibir informações de conexão"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Sair deste Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Bloquear este amigo"
 
@@ -10389,224 +7488,254 @@ msgstr "Bloquear este amigo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Plug-in do protocolo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Conectar usando TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr "intervalo(s) de reenvio"
+
+msgid "Keep alive interval(s)"
+msgstr "Intervalo(s) de keep-alive"
+
+msgid "Update interval(s)"
+msgstr "Intervalo(s) de update"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Comprimento de token inválido, %d"
+
+msgid "Keep alive error"
+msgstr "Erro de keep-alive"
+
+msgid "Failed to connect server"
+msgstr "Não foi possível conectar ao servidor."
+
 msgid "Socket error"
 msgstr "Erro de socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"A conexão com o servidor foi perdida: \n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "Não foi possível ler do socket"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr "Erro ao enviar"
+
+msgid "Connection lost"
+msgstr "Conexão perdida"
+
+msgid "Couldn't resolve host"
+msgstr "Não foi possível resolver ao host"
+
+msgid "hostname is NULL or port is 0"
+msgstr "O nome da máquina é NULL ou a porta é 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Conectando ao servidor %s, tentativas %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Não foi possível conectar."
+
+msgid "Could not resolve hostname"
+msgstr "Não foi possível resolver host"
+
+msgid "Unable to login. Check debug log."
+msgstr "Não foi possível conectar, verifique o log de depuração."
+
+msgid "Unable to login"
+msgstr "Não foi possível fazer o login"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+"Resposta %s(0x%02X )\n"
+"Enviado %s(0x%02X )\n"
+"Id da sala %d, resposta [0x%02X]: \n"
+"%s"
+
+msgid "Failed room reply"
+msgstr "Resposta da sala falhou"
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Você não é um membro do grupo \"%s\"\n"
+
+msgid "Can not decrypt login reply"
+msgstr "Não foi possível decodificar a resposta do login"
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Código de resposta do token inválido, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d recusou o arquivo %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Envio de arquivo"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferência de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Conexão perdida"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Falha ao conectar: não houve resposta"
-
-#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "Deseja adicionar este amigo?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Você foi adicionado por %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Você deseja adicioná-lo?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s te adicionou [%s] à sua lista de contatos."
 
-#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "O usuário %s rejeitou seu pedido"
 
-#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "O usuário %s aprovou seu pedido"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s deseja te adicionar [%s] como amigo"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s não está na sua lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:420
+#, c-format
+msgid "Notice from: %s"
+msgstr "Anúncio de: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Conexão fechada (escrevendo)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID do Grupo Notes:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informações do grupo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1299
 msgid "Notes Address Book Information"
 msgstr "Informações do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1331
 msgid "Invite Group to Conference..."
 msgstr "Convidar grupo para conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:1341
 msgid "Get Notes Address Book Info"
 msgstr "Obter informações do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1508
 msgid "Sending Handshake"
 msgstr "Enviando requisição"
 
-#: ../libpurple/protocols/sametime/sametime.c:1513
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a aceitação da requisição"
 
-#: ../libpurple/protocols/sametime/sametime.c:1518
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Requisição aceita, enviando dados de conexão"
 
-#: ../libpurple/protocols/sametime/sametime.c:1523
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a aceitação dos dados"
 
-#: ../libpurple/protocols/sametime/sametime.c:1528
 msgid "Login Redirected"
 msgstr "Conexão redirecionada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Forcing Login"
 msgstr "Forçando conexão"
 
-#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Login Acknowledged"
 msgstr "Conexão aceita"
 
-#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Starting Services"
 msgstr "Iniciando serviços"
 
-#: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "Um administrador do Sametime publicou o seguinte anúncio no servidor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1685
 msgid "Sametime Administrator Announcement"
 msgstr "Anúncio do administrador do Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1738
 msgid "Connection reset"
 msgstr "Conexão redefinida"
 
-#: ../libpurple/protocols/sametime/sametime.c:1750
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erro ao ler do socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1775
-#: ../libpurple/protocols/sametime/sametime.c:3782
 msgid "Unable to connect to host"
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/sametime/sametime.c:1816
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anúncio de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1990
 msgid "Conference Closed"
 msgstr "Conferência fechada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2455
 msgid "Unable to send message: "
 msgstr "Não foi possível enviar mensagem: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3011
 msgid "Place Closed"
 msgstr "Local fechado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Microphone"
 msgstr "Microfone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Speakers"
 msgstr "Caixas de som"
 
-#: ../libpurple/protocols/sametime/sametime.c:3283
 msgid "Video Camera"
 msgstr "Câmera de vídeo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3321
-#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "Supports"
 msgstr "Suporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3326
-#: ../libpurple/protocols/sametime/sametime.c:4175
 msgid "External User"
 msgstr "Usuário externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "Create conference with user"
 msgstr "Criar conferência com usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:3433
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10615,27 +7744,21 @@ msgstr ""
 "Favor digitar um tópico para a nova conferência, e uma mensagem de convite "
 "para ser enviada para %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
 msgstr "Nova conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3439
 msgid "Create"
 msgstr "Criar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3504
 msgid "Available Conferences"
 msgstr "Conferências disponíveis"
 
-#: ../libpurple/protocols/sametime/sametime.c:3510
 msgid "Create New Conference..."
 msgstr "Criar nova conferência..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3517
 msgid "Invite user to a conference"
 msgstr "Convidar usuário para uma conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3518
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10646,27 +7769,21 @@ msgstr ""
 "usuário %s. Selecione \"Criar nova conferência\" se você deseja criar uma "
 "nova conferência e convidar este usuário para ela."
 
-#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
 msgstr "Convidar para uma conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Invite to Conference..."
 msgstr "Convidar para conferência..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3619
 msgid "Send TEST Announcement"
 msgstr "Enviar anúncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3638 ../pidgin/gtkconv.c:4534
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3666
 msgid "No Sametime Community Server specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3691
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10675,42 +7792,31 @@ msgstr ""
 "Nenhum servidor ou endereço IP foi configurado para a conta %s do Meanwhile. "
 "Favor digitar um abaixo para continuar o processo de conexão."
 
-#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "Meanwhile Connection Setup"
 msgstr "Configuração da conexão do Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Desconhecido (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
 msgstr "Último cliente conhecido"
 
-#: ../libpurple/protocols/sametime/sametime.c:4357
-#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "User Name"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4360
-#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "Sametime ID"
 msgstr "ID do Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4384
 msgid "An ambiguous user ID was entered"
 msgstr "Um ID de usuário ambíguo foi digitado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4385
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10720,15 +7826,12 @@ msgstr ""
 "Por favor selecione o usuário correto a partir da lista abaixo para adicioná-"
 "lo a sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
 msgstr "Selecionar usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
 msgid "Unable to add user: user not found"
 msgstr "Não foi possível adicionar usuário: usuário não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4476
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10737,7 +7840,6 @@ msgstr ""
 "O identificador '%s' não corresponde a nenhum usuário na sua comunidade do "
 "Sametime. Esta entrada foi removida da sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5067
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10746,63 +7848,48 @@ msgstr ""
 "Erro ao ler arquivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos armazenada remotamente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5207
 msgid "Buddy List Storage Mode"
 msgstr "Modo de armazenamento da lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Local Buddy List Only"
 msgstr "Apenas lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge List from Server"
 msgstr "Mesclar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Merge and Save List to Server"
 msgstr "Mesclar e salvar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Synchronize List with Server"
 msgstr "Sincronizar lista com o servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5271
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5365
 msgid "Unable to add group: group exists"
 msgstr "Não foi possível adicionar grupo: o grupo existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Um grupo com o nome '%s' já existe na sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5369
-#: ../libpurple/protocols/sametime/sametime.c:5499
 msgid "Unable to add group"
 msgstr "Não foi possível adicionar grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5428
 msgid "Possible Matches"
 msgstr "Possíveis resultados"
 
-#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Notes Address Book group results"
 msgstr "Resultados dos grupos do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5445
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10813,15 +7900,12 @@ msgstr ""
 "endereços do Notes a seguir. Favor selecionar o grupo correto da lista "
 "abaixo para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Select Notes Address Book"
 msgstr "Selecionar catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group not found"
 msgstr "Não foi possível adicionar grupo: grupo não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10830,11 +7914,9 @@ msgstr ""
 "O identificador '%s' não corresponde a nenhum grupo do catálogo de endereços "
 "Notes da sua comunidade Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5536
 msgid "Notes Address Book Group"
 msgstr "Grupo do catálogo de endereços Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5537
 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."
@@ -10842,12 +7924,10 @@ msgstr ""
 "Digite o nome de um grupo do catálogo de endereços do Notes no campo abaixo "
 "para adicionar o grupo e seus membros à sua lista de contatos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da pesquisa por '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10858,30 +7938,24 @@ msgstr ""
 "Você pode adicioná-los à lista de amigos ou enviá-los mensagens com os "
 "botões de ação abaixo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5594 ../pidgin/gtknotify.c:782
 msgid "Search Results"
 msgstr "Resultados da pesquisa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5619
 msgid "No matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "O identificador '%s' não corresponde a nenhum usuário da sua comunidade "
 "Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "No Matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid "Search for a user"
 msgstr "Pesquisar por um usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5662
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10889,115 +7963,59 @@ msgstr ""
 "Digite um nome o ID parcial no campo abaixo para procurar por usuários "
 "correspondentes na sua comunidade do Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "User Search"
 msgstr "Pesquisar por usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5678
 msgid "Import Sametime List..."
 msgstr "Importar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Export Sametime List..."
 msgstr "Exportar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Add Notes Address Book Group..."
 msgstr "Adicionar grupo do catálogo de endereços do Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "User Search..."
 msgstr "Pesquisa por usuários..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Force login (ignore server redirects)"
 msgstr "Forçar conexão (ignorar redirecionamentos do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5806
 msgid "Hide client identity"
 msgstr "Esconder identidade do cliente"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "O usuário %s não está presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Não foi possível fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Erro ao fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Falha ao fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tempo esgotado ao fazer o acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "O acordo de chaves foi abortado"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "O acordo de chaves já começou"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "O acordo de chaves não pode ser iniciado com você mesmo"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "O usuário remoto não está mais presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -11006,8 +8024,6 @@ msgstr ""
 "Um pedido de acordo de chaves foi recebido de %s. Você gostaria de fazer o "
 "acordo de chaves?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -11018,99 +8034,40 @@ msgstr ""
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Pedido de acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Não foi possível definir chave da mensagem instantânea"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Definir senha de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc/ops.c:1527
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1517
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Não foi possível obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Exibir chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Não foi possível carregar chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1066
-#: ../libpurple/protocols/silc/ops.c:1181
-#: ../libpurple/protocols/silc/ops.c:1303
-#: ../libpurple/protocols/silc/ops.c:1304
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1182
-#: ../libpurple/protocols/silc/ops.c:1323
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Não foi possível obter informações do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "O amigo %s não é certificado"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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."
@@ -11119,19 +8076,13 @@ msgstr ""
 "deste. Você pode usar o comando Obter Chave Pública para fazê-lo."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "O amigo %s não está presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -11139,18 +8090,12 @@ msgstr ""
 "Para adicionar um amigo você precisa importar a chave pública desde. "
 "Pressione importar para importar uma chave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Selecione o usuário correto"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
 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."
@@ -11158,8 +8103,6 @@ msgstr ""
 "Mais de um usuário foi encontrado com a mesma chave pública. Selecione o "
 "usuário correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -11167,312 +8110,154 @@ msgstr ""
 "Mais de um usuário foi encontrado com o mesmo nome. Selecione o usuário "
 "correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Desconectado, mas na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposto"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Me acorde"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperativo"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robô"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:963
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:666
-#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Enciumado"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:967
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:969
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Invencível"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:973
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Sonolento"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:975
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:676
-#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Chateado"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:977
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:678
-#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Empolgado"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:979
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:680
-#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1220
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1237
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Remover contato"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1242
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Linguagem preferida"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1252
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:728
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1257
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localização geográfica"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Redefinir chave de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "Mensagem instantânea com troca de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Obter chave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1625
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Expulsar usuário do servidor"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:1000
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Desenhar no quadro de atividades"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Frase-senha:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "O canal %s não existe na rede"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:176
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Informações do canal"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Não foi possível obter informações do canal"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome do canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuários:</b> %d<br>"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador do canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifra do canal:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC do canal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tópico do canal:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos do canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Impressão digital da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Impressão digital legível da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Adicionar chave pública do canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:305
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir chave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Frase-senha do canal"
 
-#: ../libpurple/protocols/silc/chat.c:431
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de chaves públicas do canal"
 
-#: ../libpurple/protocols/silc/chat.c:436
-#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11487,446 +8272,246 @@ msgstr ""
 "apenas usuários cujas chaves públicas estiverem listadas podem entrar no "
 "canal."
 
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:934
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autenticação do canal"
 
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Adicionar/remover"
 
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "nome do grupo"
 
-#: ../libpurple/protocols/silc/chat.c:604
-#: ../libpurple/protocols/silc/ops.c:1830
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Por favor digite o nome do grupo privado do canal %s e a frase-senha."
 
-#: ../libpurple/protocols/silc/chat.c:617
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adicionar grupo privado no canal"
 
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Lista de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Defina o limite de usuários do canal. Defina para zero para redefinir o "
 "limite de usuários."
 
-#: ../libpurple/protocols/silc/chat.c:914
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de convidados"
 
-#: ../libpurple/protocols/silc/chat.c:919
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Adicionar grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:940
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Redefinir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:945
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Definir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:953
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Definir limite de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:959
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Redefinir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Definir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:971
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Redefinir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Definir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:983
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Redefinir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:988
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Definir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Você tem que entrar no canal %s antes de poder entrar no grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1051
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1052
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Não foi possível entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1433
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1434
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "Não foi possível chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1249
-#: ../libpurple/protocols/silc/silc.c:1435
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transferência de arquivo segura"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Erro durante a transferência do arquivo"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "O outro lado desconectou"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Falha no acordo de chaves"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Falha ao criar a conexão"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "A sessão de transferência de arquivo não existe"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nenhuma sessão de transferência de arquivo ativa"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Transferência de arquivo já começou"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Não foi possível fazer o acordo de chaves para a transferência"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Não foi possível iniciar a transferência de arquivo"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Não foi possível enviar o arquivo"
 
-#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "Ocorreu um erro"
 
-#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
-#: ../libpurple/protocols/silc/ops.c:566
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s mudou o tópico de <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:632
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos do canal <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:636
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removeu todos os modos do canal <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:669
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> definiu os modos de <I>%s</I> para: %s"
 
-#: ../libpurple/protocols/silc/ops.c:677
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removeu todos os modos de <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:706
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Você foi expulso de <I>%s</I> por <I>%s</I>: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
-#: ../libpurple/protocols/silc/ops.c:743
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Você foi 'killado' por %s: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
-#: ../libpurple/protocols/silc/ops.c:774
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "'Killado' por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:811
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Desconexão do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:997
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Informação pessoal"
 
-#: ../libpurple/protocols/silc/ops.c:1020
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Data de nascimento"
 
-#: ../libpurple/protocols/silc/ops.c:1028
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Função de trabalho"
 
-#: ../libpurple/protocols/silc/ops.c:1032
-#: ../libpurple/protocols/silc/silc.c:1229
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organização"
 
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../libpurple/protocols/silc/ops.c:1060
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/silc/ops.c:1140
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Você é o fundador do canal em <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1144
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador do canal em <I>%s</I> é <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1203
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "Nome real"
 
-#: ../libpurple/protocols/silc/ops.c:1231
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de status"
 
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1367
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Impressão digital da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1368
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Impressão digital legível da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mais..."
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc/silc.c:1293
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Desconectar do servidor sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Não foi possível desconectar sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Não foi possível definir tópico"
 
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Falha ao mudar apelido"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Não foi possível obter lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1485
 msgid "Network is empty"
 msgstr "A rede está vazia"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nenhuma chave pública foi recebida"
 
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc/ops.c:1554
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Não foi possível obter informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1566
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Não foi possível obter estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1573
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11961,59 +8546,36 @@ msgstr ""
 "Total de operadores de servidor: %d\n"
 "Total de servidores de roteador: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estatísticas da rede"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falha no ping"
 
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "O servidor retornou a resposta do ping"
 
-#: ../libpurple/protocols/silc/ops.c:1626
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Não foi possível 'killar' usuário"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "WATCH"
 msgstr "MONITORAR"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "Cannot watch user"
 msgstr "Não é possível monitorar o usuário"
 
-#: ../libpurple/protocols/silc/ops.c:1741
-#: ../libpurple/protocols/silc/ops.c:1792
-#: ../libpurple/protocols/silc/silc.c:394
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Recuperando sessão"
 
-#: ../libpurple/protocols/silc/ops.c:1743
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Autenticando conexão"
 
-#: ../libpurple/protocols/silc/ops.c:1794
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Verificando a chave pública do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1831
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Frase-senha requerida"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -12022,12 +8584,10 @@ msgstr ""
 "A chave pública de %s foi recebida. Sua cópia local não confere com esta "
 "chave. Você ainda deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "A chave pública de %s foi recebida. Deseja aceitá-la?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12040,104 +8600,69 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar chave pública"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tipo de chave pública não suportada"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Desconectado pelo servidor"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Erro ao conectar no servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Falha na troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
 "Reconectar para criar uma nova sessão."
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Falha na conexão"
 
-#: ../libpurple/protocols/silc/silc.c:397
-#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Fazendo troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:449
-#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "Não foi possível criar conexão."
 
-#: ../libpurple/protocols/silc/silc.c:492
-#: ../libpurple/protocols/silc/silc.c:508
-#: ../libpurple/protocols/silc/silc.c:537
-#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "Não foi possível carregar par de chaves SILC"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:522
-#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Conectando ao servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:568
-#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: ../libpurple/protocols/silc/silc.c:619
-#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Não foi possível iniciar protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:632
-#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Erro ao carregar par de chaves do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:955
-#: ../libpurple/protocols/silc10/silc.c:656
+#, c-format
+msgid "Download %s: %s"
+msgstr "Download %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Seu humor atual"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1795
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:971
-#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Apaixonado"
 
-#: ../libpurple/protocols/silc/silc.c:982
-#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12145,63 +8670,36 @@ msgstr ""
 "\n"
 "Seu método preferido de contatos"
 
-#: ../libpurple/protocols/silc/silc.c:990
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:992
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:994
-#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Seu status atual"
 
-#: ../libpurple/protocols/silc/silc.c:1006
-#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Serviços online"
 
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "Permitir que os outros vejam os serviços que você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "Permitir que os outros vejam qual computador você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:1022
-#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Seu arquivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:1028
 msgid "Timezone (UTC)"
 msgstr "Fuso horário (GMT)"
 
-#: ../libpurple/protocols/silc/silc.c:1032
-#: ../libpurple/protocols/silc/silc.c:1033
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Atributos de status online do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1034
-#: ../libpurple/protocols/silc10/silc.c:737
 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 "
@@ -12211,217 +8709,128 @@ msgstr ""
 "e suas informações pessoais. Por favor preencha as informações que você "
 "deseja que seja vista por outros usuários vejam sobre você."
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc/silc.c:1702
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:784
-#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "Não há mensagem do dia disponível"
 
-#: ../libpurple/protocols/silc/silc.c:1076
-#: ../libpurple/protocols/silc/silc.c:1697
-#: ../libpurple/protocols/silc10/silc.c:779
-#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Não há mensagem do dia associada com esta conexão."
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc/silc.c:1244
-#: ../libpurple/protocols/silc/silc.c:1245
-#: ../libpurple/protocols/silc10/silc.c:830
-#: ../libpurple/protocols/silc10/silc.c:874
-#: ../libpurple/protocols/silc10/silc.c:945
-#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Criar novo par de chaves do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "As frases-senha não conferem"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Falha ao gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1212
-#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Tamanho da chave"
 
-#: ../libpurple/protocols/silc/silc.c:1214
-#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1239
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Frase-senha (redigitar)"
 
-#: ../libpurple/protocols/silc/silc.c:1246
-#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1289
-#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Status online"
 
-#: ../libpurple/protocols/silc/silc.c:1297
-#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Ver mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:1301
-#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Criar par de chaves do SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1393
-#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usuário <I>%s</I> não está presente na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1573
-#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Tópico muito extenso"
 
-#: ../libpurple/protocols/silc/silc.c:1654
-#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Você precisa especificar um apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "canal %s não encontrado"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modos do canal de %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1763
-#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nenhum modo de canal está definido em %s"
 
-#: ../libpurple/protocols/silc/silc.c:1776
-#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Falha ao definir cmodes de %s"
 
-#: ../libpurple/protocols/silc/silc.c:1806
-#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comando desconhecido: %s, (Pode ser uma falha do cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1869
-#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1873
-#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Vê ou altera o tópico"
 
-#: ../libpurple/protocols/silc/silc.c:1882
-#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;senha&gt;]:  Entra em um canal nesta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1886
-#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  Lista os canais desta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1890
-#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1894
-#: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Manda uma mensagem privada para um "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1898
-#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;usuário&gt; [&lt;mensagem&gt;]:  Manda uma mensagem privada para "
 "um usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1902
-#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Exibe a mensagem do dia do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1906
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  Desconecta do servidor sem sair do mesmo"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional"
 
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Chama qualquer comando de cliente do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;usuário&gt; [-pubkey|&lt;motivo&gt;]: Expulsa o usuário do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1928
-#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1932
-#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12429,8 +8838,6 @@ msgstr ""
 "cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe os "
 "modos do canal."
 
-#: ../libpurple/protocols/silc/silc.c:1936
-#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12438,19 +8845,13 @@ msgstr ""
 "cumode &lt;usuário|canal&gt; +|-&lt;modos&gt; &lt;usuário&gt;: Muda os modos "
 "do usuário no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1940
-#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuário&gt;: Define seus modos na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;usuário&gt; [-pubkey]: Obtém privilégios de operador do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1948
-#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12458,46 +8859,30 @@ msgstr ""
 "invite &lt;canal&gt; [-|+]&lt;usuário&gt;:  convida um usuário ou adiciona/"
 "remove-o da lista de convites do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &ltusuário&gt; [comentário]:  Expulsa o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1956
-#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: Exibe detalhes administrativos do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;usuário&gt;]:  Bane o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;usuário|servidor&gt;:  Obtém a chave pública do servidor ou do "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1968
-#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Exibe as estatísticas do servidor e da rede"
 
-#: ../libpurple/protocols/silc/silc.c:1972
-#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia um PING para o servidor conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1977
-#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Lista os usuários no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1981
-#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12514,143 +8899,93 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2092
-#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "Plug-in do protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2094
-#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 "Plug-in do protocolo de conferência segura em tempo-real na internet (Secure "
 "Internet Live Conferencing - SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:2135
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2150
 msgid "Network"
 msgstr "Rede"
 
-#: ../libpurple/protocols/silc/silc.c:2146
-#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:2150
-#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:2160
-#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Cifra"
 
-#: ../libpurple/protocols/silc/silc.c:2170
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2173
 msgid "Use Perfect Forward Secrecy"
 msgstr "Usar \"Perfect Forward Secrecy\""
 
-#: ../libpurple/protocols/silc/silc.c:2177
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Autenticação via chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:2180
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instantâneas sem troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:2183
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensagens no quadro de atividades"
 
-#: ../libpurple/protocols/silc/silc.c:2186
-#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Expandir contatos _automaticamente"
 
-#: ../libpurple/protocols/silc/silc.c:2189
-#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Assinar digitalmente e verificar todas as mensagens"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Criando par de chaves do SILC..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Não foi possível criar par de chaves do SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:363
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nome real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome do usuário: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "Email: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome do host: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:371
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organização: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:373
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Tamanho da chave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:377
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versão: %s\n"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12661,8 +8996,6 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12671,44 +9004,28 @@ msgstr ""
 "Impressão digital legível da chave pública:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informações da chave pública"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Pager"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Computador"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s mandou uma mensagem para o quadro de atividades. Deseja abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12717,96 +9034,74 @@ msgstr ""
 "%s mandou uma mensagem para o quadro de atividades no canal %s. Você deseja "
 "abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Quadro de atividades"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Estatísticas do servidor indisponíveis"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Versões incompatíveis, atualize seu cliente"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Falha: O usuário remoto não confia/suporta sua chave pública."
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Falha: O usuário remoto não suporta o grupo KE proposto."
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Falha: O usuário remoto não suporta a cifra proposta"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Falha: O usuário remoto não suporta o PKCS proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1952
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Falha: O usuário remoto não suporta a função de hash proposta"
 
-#: ../libpurple/protocols/silc10/ops.c:1955
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Falha: O usuário remoto não suporta o HMAC proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1957
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Falha: Assinatura incorreta"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Falha: Cookie inválido"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autenticação mal sucedida"
 
-#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "Não foi possível iniciar conexão do cliente SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "João sem nome"
 
-#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Não foi possível enviar"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Resposta do servidor desconhecida."
 
-#: ../libpurple/protocols/simple/simple.c:1749
-#: ../libpurple/protocols/simple/simple.c:1795
-#: ../libpurple/protocols/simple/simple.c:1810
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "Não foi possível criar socket de escuta"
 
-#: ../libpurple/protocols/simple/simple.c:1774
-msgid "Couldn't resolve host"
-msgstr "Não foi possível resolver ao host"
-
-#: ../libpurple/protocols/simple/simple.c:1875
-msgid "Could not resolve hostname"
-msgstr "Não foi possível resolver host"
-
-#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas"
 
@@ -12818,163 +9113,142 @@ msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plug-in do protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plug-in do protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Anunciar status (nota: todos podem te observar)"
 
-#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Usuário de autenticação"
 
-#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Domínio de autenticação"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Procurando por %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Conexão para %s falhou"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectando: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Não foi possível escrever arquivo %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Não foi possível ler arquivo %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mensagem muito extensa, últimos %s bytes truncados."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s não está conectado no momento."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Alertar %s não é permitido."
 
-#: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Uma mensagem foi descartada, você está excedendo o limite de velocidade do "
 "servidor."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Bate-papo não disponível em %s."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Você está mandando mensagens muito rapidamente para %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 "Você perdeu uma mensagem instantânea de %s porque ela era muito extensa."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Você perdeu uma mensagem de mensagem instantânea de %s porque ela foi "
 "enviada muito rapidamente."
 
-#: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Falha."
 
-#: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Excesso de resultados."
 
-#: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Necessários mais qualificadores."
 
-#: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Serviço de diretório temporariamente indisponível."
 
-#: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "Email lookup restricted."
 msgstr "Pesquisa por email restrita."
 
-#: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Palavra-chave ignorada."
 
-#: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Nenhuma palavra-chave."
 
-#: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Usuário não tem informação de diretório."
 
-#: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "País não suportado."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Falha desconhecida: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Nome de usuário ou senha incorreto(a)."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "O serviço está temporariamente indisponível."
 
-#: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Seu nível de alerta é alto demais para que você possa se conectar no momento."
 
-#: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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."
@@ -12983,81 +9257,63 @@ msgstr ""
 "minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Um erro desconhecido ocorreu ao conectar: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Um erro desconhecido, %d, ocorreu. Informações: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Nome de grupo inválido"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Conexão fechada"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Esperando resposta..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "O TOC voltou de sua pausa. Agora você pode mandar mensagens novamente."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Mudança de senha efetuada com sucesso"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6847
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Ver informações de diretório"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Definir informações de diretório"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Não foi possível abrir %s para escrita!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Transferência de arquivo falhou; o outro lado provavelmente cancelou-a."
 
-#: ../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 "Não foi possível conectar para transferência."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 "Não foi possível escrever cabeçalho de arquivo. O arquivo não será "
 "transferido."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s pede a %s para aceitar %d arquivo: %s (%.2f %s)%s%s"
 msgstr[1] "%s pede a %s para aceitar %d arquivos: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pede a você para enviar um arquivo a ele"
@@ -13072,30 +9328,24 @@ msgstr "%s pede a você para enviar um arquivo a ele"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Plug-in do protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s te enviou um convite para ver webcam, que é um recurso não suportado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Sua mensagem do Yahoo! não foi enviada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensagem do sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -13104,18 +9354,15 @@ msgstr ""
 "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
 "de amigos com o seguinte motivo: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
 "de amigos."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "Pedido para adicionar amigo negado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13126,11 +9373,9 @@ msgstr ""
 "desconhecido. Provavelmente, você não conseguirá conectar com sucesso ao "
 "Yahoo. Verifique %s por atualizações."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Falha na autenticação do Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13139,52 +9384,37 @@ msgstr ""
 "Você tentou ignorar %s, mas o usuário está na sua lista de amigos. Ao clicar "
 "\"Sim\" o usuário será removido e ignorado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Sua conta está travada, favor entrar no site do Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Número de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode "
 "corrigir isso."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Não foi possível adicionar o amigo %s ao grupo %s à lista do servidor na "
 "conta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "Não foi possível adicionar amigo à lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "O servidor retornou uma resposta HTTP inválida."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2718
-#: ../libpurple/protocols/yahoo/yahoo.c:2906
-#: ../libpurple/protocols/yahoo/yahoo.c:3011
-#: ../libpurple/protocols/yahoo/yahoo.c:3022
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Problema na conexão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13193,7 +9423,6 @@ msgstr ""
 "A conexão com %s foi perdida:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13202,103 +9431,72 @@ msgstr ""
 "Não foi possível estabelecer conexão com %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/protocols/yahoo/yahoo.c:3833
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3140
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
 msgid "Not at Desk"
 msgstr "Não estou por perto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3839
 msgid "Not in Office"
 msgstr "Fora do escritório"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3146
-#: ../libpurple/protocols/yahoo/yahoo.c:3845
 msgid "On Vacation"
 msgstr "De férias"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3150
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
-#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "Presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "Iniciar conferência"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "Configurações de presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "Começar a desenhar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3561
 msgid "Activate which ID?"
 msgstr "Ativar qual ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3572
 msgid "Join whom in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3588
 msgid "Join User in Chat..."
 msgstr "Ingressar usuário no bate-papo..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3593
 msgid "Open Inbox"
 msgstr "Abrir caixa de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4182
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lista as salas desta rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 
@@ -13312,92 +9510,64 @@ msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Yahoo Protocol Plugin"
 msgstr "Plug-in do protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Japan"
 msgstr "Yahoo Japão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Pager server"
 msgstr "Servidor do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Japan Pager server"
 msgstr "Servidor japonês do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4441
 msgid "File transfer server"
 msgstr "Servidor de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4444
 msgid "Japan file transfer server"
 msgstr "Servidor japonês de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4447
 msgid "File transfer port"
 msgstr "Porta da transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4450
 msgid "Chat room locale"
 msgstr "Locale da sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4453
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4461
 msgid "Chat room list URL"
 msgstr "URL da lista de salas de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4464
 msgid "Yahoo Chat server"
 msgstr "Servidor de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4467
 msgid "Yahoo Chat port"
 msgstr "Porta de bate-papo do Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Enviado pedido para desenhar."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1111
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1515
 msgid "Unable to establish file descriptor."
 msgstr "Não foi possível estabelecer descritor de arquivo."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1410
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s está tentando lhe enviar um grupo de %d arquivos.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Erro ao enviar"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil do Yahoo! Japão"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Perfil do Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -13405,54 +9575,40 @@ msgstr ""
 "Desculpe, perfis marcados como contendo conteúdo adulto não são suportados "
 "atualmente."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 "Se você deseja ver este perfil, visite este link no seu navegador da web:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "ID do Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "Última(s) notícia(s)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "Link legal 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "Link legal 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "Link legal 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "Última atualização"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informação do usuário %s indisponível"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -13460,7 +9616,6 @@ msgstr ""
 "Desculpe, este perfil parece estar numa língua ou formato não suportado "
 "atualmente."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13468,7 +9623,6 @@ msgstr ""
 "Não foi possível obter o perfil do usuário. Provavelmente isto é um problema "
 "no servidor. Favor tentar novamente mais tarde."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 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 "
@@ -13479,40 +9633,32 @@ msgstr ""
 "perfil de um usuário. Se você sabe que o usuário existe, favor tentar "
 "novamente."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "O perfil do usuário está vazio."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Convite rejeitado"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "Falha ao entrar no bate-papo"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Sala desconhecida"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Talvez a sala esteja cheia"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "Não disponível"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13520,46 +9666,34 @@ msgstr ""
 "Erro desconhecido. Você pode ter que desconectar e esperar cinco minutos "
 "antes de poder ingressar novamente numa sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Você está conversando em %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Falha ao ingressar amigo no bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Talvez eles não estejam em um bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Falha ao obter a lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Vozes"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Não foi possível obter lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Salas de usuário"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Problema na conexão ao servidor YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13568,7 +9702,6 @@ msgstr ""
 "Perdida conexão com servidor\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13576,79 +9709,60 @@ msgstr ""
 "(Houve um erro ao converter esta mensagem.\t Verifique a opção 'Codificação' "
 "no editor de contas)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Não foi possível enviar para o bate-papo %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:795
-#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Invisível ou não conectado"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Em %s desde %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1510
-#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_Instância:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "Destinatá_rio:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Tentativa de se inscrever em  %s,%s,%s falhou"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;usuário&gt;: Localiza o usuário"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;usuário&gt;:  Localiza o usuário"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instância&gt;: Define a instância a ser usada nesta classe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instância&gt;: Define a instância a ser usada nesta classe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2725
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instância&gt;: Define a instância a ser usada nesta classe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;classe&gt; &lt;instância&gt; &lt;destinatário&gt;: Entra em um novo "
 "bate-papo"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2736
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instância&gt;: Envia uma mensagem para &lt;mensagem,<i>instância</i>,"
 "*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2742
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13656,7 +9770,6 @@ msgstr ""
 "zci &lt;classe&gt; &lt;instância&gt;: Envia uma mensagem para &lt;<i>classe</"
 "i>,<i>instância</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2748
 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;"
@@ -13664,7 +9777,6 @@ msgstr ""
 "zci &lt;classe&gt; &lt;instância&gt; &lt;destinatário&gt;: Envia uma "
 "mensagem para &lt;<i>classe</i>,<i>instância</i>,<i>destinatário</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13672,16 +9784,13 @@ msgstr ""
 "zir &lt;instância&gt; &lt;destinatário&gt;: Envia uma mensagem para &lt;"
 "MENSAGEM,<i>instância</i>,<i>destinatário</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2759
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;classe&gt;: Envia uma mensagem para &lt;<i>classe</i>,PESSOAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "Reinscrever"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "Obter inscrições do servidor"
 
@@ -13695,45 +9804,33 @@ msgstr "Obter inscrições do servidor"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2931
-#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Plug-in do protocolo Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "Usar tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "Comando tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Exportar para .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Exportar para .zepyhr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "Importar de .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "Importar de .zepyhr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Exposição"
 
-#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
-#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13742,77 +9839,62 @@ msgstr ""
 "Não foi possível criar socket\n"
 "%s"
 
-#: ../libpurple/proxy.c:687
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Não foi possível interpretar resposta do proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
-#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexão do proxy HTTP %d"
 
-#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Acesso negado: o servidor proxy HTTP não permite o tunelamento da porta %d."
 
-#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-#: ../libpurple/proxy.c:1793
 msgid "Could not resolve host name"
 msgstr "Não foi possível resolver host"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Chamando a atenção de %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s chamou sua atenção!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "_Sim"
 
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_No"
 msgstr "_Não"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "_Aceitar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Não estou aqui no momento"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "status salvos"
 
-#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s mudou seu apelido para %s.\n"
 
-#: ../libpurple/server.c:356
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "Chamando a atenção de %s..."
-
-#: ../libpurple/server.c:401
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s chamou sua atenção!"
-
-#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13821,98 +9903,96 @@ msgstr ""
 "%s convidou %s para a sala de bate-papo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s convidou %s para a sala de bate-papo %s\n"
 
-#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para bate-papo?"
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+msgid "Shortcut"
+msgstr "Atalho"
+
+msgid "The text-shortcut for the smiley"
+msgstr "O atalho de teclado para o smiley"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Imagem Salva"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Imagem salva. (isso é o que tenho de fazer por agora)."
+
 msgid "SSL Connection Failed"
 msgstr "Falha na conexão SSL"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Falha na negociação SSL"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "O outro lado enviou um certificado SSL inválido"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Erro de SSL desconhecido"
 
-#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Redefinir"
 
-#: ../libpurple/status.c:157 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1088
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
-#: ../libpurple/status.c:160
 msgid "Extended away"
 msgstr "Ausente (estendido)"
 
-#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr "Móvel"
 
-#: ../libpurple/status.c:162
 msgid "Listening to music"
 msgstr "Escutando música"
 
-#: ../libpurple/status.c:611
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) mudou o tópico de %s para %s"
 
-#: ../libpurple/status.c:622
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) agora é %s"
 
-#: ../libpurple/status.c:628
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) não é mais %s"
 
-#: ../libpurple/status.c:1243
 #, c-format
 msgid "%s became idle"
 msgstr "%s tornou-se inativo"
 
-#: ../libpurple/status.c:1263
 #, c-format
 msgid "%s became unidle"
 msgstr "%s voltou da inatividade"
 
-#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s tornou-se inativo"
 
-#: ../libpurple/status.c:1331
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s voltou da inatividade"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13921,67 +10001,56 @@ msgstr ""
 "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
 "(as), e o antigo arquivo foi movido para %s~."
 
-#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Não foi possível abrir %s: Número excessivo de redirecionamentos"
 
-#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Não foi possível conectar a %s"
 
-#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13990,137 +10059,116 @@ msgstr ""
 "Não foi possível alocar memória suficiente para guardar o conteúdo de %s. O "
 "servidor da web pode estar tentando alguma operação mal-intencionada."
 
-#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler de %s: %s"
 
-#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erro ao gravar em %s: %s"
 
-#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Não foi possível conectar a %s: %s"
 
-#: ../libpurple/util.c:4697
 #, c-format
 msgid " - %s"
 msgstr "- %s"
 
-#: ../libpurple/util.c:4703
 #, c-format
 msgid " (%s)"
 msgstr "(%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:322
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Conexão interrompida por outro software no seu computador."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:325
+#, c-format
 msgid "Remote host closed connection."
 msgstr "O usuário remoto encerrou a conexão."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:328
+#, c-format
 msgid "Connection timed out."
 msgstr "Tempo limite de conexão esgotado."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:331
+#, c-format
 msgid "Connection refused."
 msgstr "Conexão rejeitada."
 
-#: ../pidgin.desktop.in.h:1
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "O endereço já está em uso"
+
 msgid "Internet Messenger"
 msgstr "Mensageiro da Internet"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Mensageiro da Internet Pidgin"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Envie mensagens instantâneas através de múltiplos protocolos"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientação"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "A orientação da bandeja"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Opções de conexão"
 
-#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:411 ../pidgin/gtkaccount.c:1039
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:501
 msgid "Remember pass_word"
 msgstr "Lembrar _senha"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:555
 msgid "User Options"
 msgstr "Opções do usuário"
 
-#: ../pidgin/gtkaccount.c:568
 msgid "_Local alias:"
 msgstr "Apelido _local:"
 
-#: ../pidgin/gtkaccount.c:572
 msgid "New _mail notifications"
 msgstr "Notificar ao receber novos e_mails"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:577
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar este _ícone de exibição para esta conta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:705
 #, c-format
 msgid "%s Options"
 msgstr "Opções de %s"
 
-#: ../pidgin/gtkaccount.c:910
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configurações de proxy do GNOME"
 
-#: ../pidgin/gtkaccount.c:911
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuração global de proxy"
 
-#: ../pidgin/gtkaccount.c:917
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkaccount.c:923
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:929
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:935
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:941 ../pidgin/gtkprefs.c:1340
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -14129,69 +10177,52 @@ msgstr "Usar configurações do ambiente"
 #. 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:980
 msgid "If you look real closely"
 msgstr "Se você olhar bem de perto"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:983
 msgid "you can see the butterflies mating"
 msgstr "você pode ver as borboletas acasalando-se"
 
-#: ../pidgin/gtkaccount.c:1004
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1334
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1027 ../pidgin/gtkprefs.c:1355
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:1373
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1410
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: ../pidgin/gtkaccount.c:1171
 msgid "Unable to save new account"
 msgstr "Não foi possível salvar nova conta"
 
-#: ../pidgin/gtkaccount.c:1172
 msgid "An account already exists with the specified criteria."
 msgstr "Já existe uma conta com os atributos especificados."
 
-#: ../pidgin/gtkaccount.c:1449
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../pidgin/gtkaccount.c:1466
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1473
-msgid "Create this new account on the server"
-msgstr "Criar esta nova conta no servidor"
+msgid "Create _this new account on the server"
+msgstr "Criar es_ta nova conta no servidor"
 
-#: ../pidgin/gtkaccount.c:1487
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtkplugin.c:753
-#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../pidgin/gtkaccount.c:1936
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2139
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14215,7 +10246,6 @@ msgstr ""
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Adicionar/Editar</b> na janela da Lista de Amigos"
 
-#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -14223,7 +10253,6 @@ msgid_plural ""
 msgstr[0] "Você tem %d contato chamado %s. Você gostaria de juntá-lo?"
 msgstr[1] "Você tem %d contatos chamados %s. Você gostaria de juntá-los?"
 
-#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
@@ -14233,15 +10262,12 @@ msgstr ""
 "lista de amigos e que usem uma única janela de conversa. Você pode separá-"
 "los novamente escolhendo \"Expandir\" no menu de contexto do contato"
 
-#: ../pidgin/gtkblist.c:683
 msgid "Please update the necessary fields."
 msgstr "Favor atualizar os campos necessários."
 
-#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkblist.c:6794
 msgid "Room _List"
 msgstr "_Lista de salas"
 
-#: ../pidgin/gtkblist.c:1058
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -14249,112 +10275,85 @@ msgstr ""
 "Por favor digite as informações apropriadas sobre o bate-papo em que você "
 "gostaria de entrar.\n"
 
-#: ../pidgin/gtkblist.c:1070 ../pidgin/gtkblist.c:6829
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkprivacy.c:549
-#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1349
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1392
 msgid "Move to"
 msgstr "Mover para"
 
-#: ../pidgin/gtkblist.c:1432
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: ../pidgin/gtkblist.c:1435 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1441
 msgid "_Send File..."
 msgstr "_Enviar arquivo..."
 
-#: ../pidgin/gtkblist.c:1448
 msgid "Add Buddy _Pounce..."
 msgstr "Adicionar _ação de usuário..."
 
-#: ../pidgin/gtkblist.c:1453 ../pidgin/gtkblist.c:1457
-#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1602
 msgid "View _Log"
 msgstr "Ver _histórico"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Hide when offline"
 msgstr "Esconder quando desconectado"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Show when offline"
 msgstr "Mostrar quando desconectado"
 
-#: ../pidgin/gtkblist.c:1477 ../pidgin/gtkblist.c:1486
-#: ../pidgin/gtkblist.c:1587 ../pidgin/gtkblist.c:1608
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkblist.c:1488
-#: ../pidgin/gtkblist.c:1589 ../pidgin/gtkblist.c:1610
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../pidgin/gtkblist.c:1538
+msgid "Set Custom Icon"
+msgstr "Definir Ícone Personalizado..."
+
+msgid "Remove Custom Icon"
+msgstr "Remover ícone personalizado"
+
 msgid "Add _Buddy..."
 msgstr "Adicionar a_migo..."
 
-#: ../pidgin/gtkblist.c:1541
 msgid "Add C_hat..."
 msgstr "Adicionar _bate-papo..."
 
-#: ../pidgin/gtkblist.c:1544
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkblist.c:1546
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../pidgin/gtkblist.c:1573
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: ../pidgin/gtkblist.c:1575
 msgid "Persistent"
 msgstr "Persistente"
 
-#: ../pidgin/gtkblist.c:1585
 msgid "_Edit Settings..."
 msgstr "Editar configurações"
 
-#: ../pidgin/gtkblist.c:1615 ../pidgin/gtkblist.c:1638
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: ../pidgin/gtkblist.c:1643
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1894 ../pidgin/gtkblist.c:1906
-#: ../pidgin/gtkblist.c:5493 ../pidgin/gtkblist.c:5506
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:2366 ../pidgin/gtkconv.c:4936
-#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -14363,148 +10362,116 @@ msgstr ""
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2717
 msgid "Unknown node type"
 msgstr "Tipo de nó desconhecido"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3153
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../pidgin/gtkblist.c:3154
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3155
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: ../pidgin/gtkblist.c:3156
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3157
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _histórico do usuário..."
 
-#: ../pidgin/gtkblist.c:3159
 msgid "/Buddies/Sh_ow"
 msgstr "/Amigos/E_xibir"
 
-#: ../pidgin/gtkblist.c:3160
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Amigos/Exibir/Amig_os desconectados"
 
-#: ../pidgin/gtkblist.c:3161
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Amigos/Exibir/Grupos _vazios"
 
-#: ../pidgin/gtkblist.c:3162
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Amigos/Exibir/_Detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:3163
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Amigos/Exibir/_Tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:3164
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Amigos/Exibir/Ícones de _protocolo"
 
-#: ../pidgin/gtkblist.c:3165
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigo_s"
 
-#: ../pidgin/gtkblist.c:3167
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3168
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: ../pidgin/gtkblist.c:3169
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: ../pidgin/gtkblist.c:3171
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3174
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../pidgin/gtkblist.c:3175 ../pidgin/gtkblist.c:7514
-msgid "/Accounts/Manage"
-msgstr "/Contas/Gerenciar"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Contas/Gerenciar Contas"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3178
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:3179
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/Ações de _usuário"
 
-#: ../pidgin/gtkblist.c:3180
 msgid "/Tools/_Certificates"
 msgstr "/Ferramentas/_Certificados"
 
-#: ../pidgin/gtkblist.c:3181
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
-#: ../pidgin/gtkblist.c:3182
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferências"
 
-#: ../pidgin/gtkblist.c:3183
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:3185
+msgid "/Tools/Smile_y"
+msgstr "/Ferramentas/Smile_y"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
-#: ../pidgin/gtkblist.c:3186
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:3187
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/Log do _sistema"
 
-#: ../pidgin/gtkblist.c:3189
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
 #. Help
-#: ../pidgin/gtkblist.c:3191
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../pidgin/gtkblist.c:3192
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: ../pidgin/gtkblist.c:3193
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _depuração"
 
-#: ../pidgin/gtkblist.c:3195 ../pidgin/gtkblist.c:3197
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: ../pidgin/gtkblist.c:3228
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:3247
 #, c-format
 msgid ""
 "\n"
@@ -14513,7 +10480,6 @@ msgstr ""
 "\n"
 "<b>Ocupantes:</b> %d"
 
-#: ../pidgin/gtkblist.c:3252
 #, c-format
 msgid ""
 "\n"
@@ -14522,128 +10488,98 @@ msgstr ""
 "\n"
 "<b>Tópico:</b> %s"
 
-#: ../pidgin/gtkblist.c:3252
 msgid "(no topic set)"
 msgstr "(Nenhum tópico foi definido)"
 
-#: ../pidgin/gtkblist.c:3331
 msgid "Buddy Alias"
 msgstr "Apelido do amigo"
 
-#: ../pidgin/gtkblist.c:3360
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3406
 msgid "Last Seen"
 msgstr "Visto pela última vez em"
 
-#: ../pidgin/gtkblist.c:3427
 msgid "Spooky"
 msgstr "Assustador"
 
-#: ../pidgin/gtkblist.c:3429
 msgid "Awesome"
 msgstr "Impressionante"
 
-#: ../pidgin/gtkblist.c:3431
 msgid "Rockin'"
 msgstr "Botando pra quebrar"
 
-#: ../pidgin/gtkblist.c:3462
 msgid "Total Buddies"
 msgstr "Total de Amigos"
 
-#: ../pidgin/gtkblist.c:3824
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inativo por %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3826
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inativo por %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3828
 #, c-format
 msgid "Idle %dm"
 msgstr "Inativo por %dm"
 
-#: ../pidgin/gtkblist.c:3982
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3983 ../pidgin/gtkblist.c:4016
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: ../pidgin/gtkblist.c:3984
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3985
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3986 ../pidgin/gtkblist.c:4019
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: ../pidgin/gtkblist.c:3987
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: ../pidgin/gtkblist.c:4022
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:4025
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:4157 ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensagem não lida de %s\n"
 msgstr[1] "%d mensagens não lidas de %s\n"
 
-#: ../pidgin/gtkblist.c:4320
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:4323
 msgid "By status"
 msgstr "Por status"
 
-#: ../pidgin/gtkblist.c:4324
 msgid "By log size"
 msgstr "Por tamanho do histórico"
 
-#: ../pidgin/gtkblist.c:4662
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:4664
 #, c-format
 msgid "%s disabled"
 msgstr "%s desativado"
 
-#: ../pidgin/gtkblist.c:4668
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../pidgin/gtkblist.c:4668 ../pidgin/gtkblist.c:4787
 msgid "Re-enable"
 msgstr "Re-ativar"
 
-#: ../pidgin/gtkblist.c:4785
 msgid "Welcome back!"
 msgstr "Bem vindo de volta!"
 
-#: ../pidgin/gtkblist.c:4821
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14654,31 +10590,26 @@ msgstr[1] ""
 "%d contas foram desconectadas porque você está usando as mesmas de outro "
 "local."
 
-#: ../pidgin/gtkblist.c:5100
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuário:</b>"
 
-#: ../pidgin/gtkblist.c:5107
 msgid "<b>Password:</b>"
 msgstr "<b>Senha:</b>"
 
-#: ../pidgin/gtkblist.c:5118
 msgid "_Login"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkblist.c:5202
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5216
 #, 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Bem vindo ao %s!</span>\n"
 "\n"
@@ -14690,47 +10621,36 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5487
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Amigos/Exibir/Amigos desconectados"
 
-#: ../pidgin/gtkblist.c:5490
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Amigos/Exibir/Grupos vazios"
 
-#: ../pidgin/gtkblist.c:5496
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Amigos/Exibir/Detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:5499
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Amigos/Exibir/Tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:5502
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Amigos/Exibir/Ícones de protocolo"
 
-#: ../pidgin/gtkblist.c:6455
 msgid "Add a buddy.\n"
 msgstr "Adicionar um amigo.\n"
 
-#: ../pidgin/gtkblist.c:6470
 msgid "Buddy's _username:"
 msgstr "Nome de _usuário do amigo:"
 
-#: ../pidgin/gtkblist.c:6492
 msgid "(Optional) A_lias:"
 msgstr "(Opcional) Ape_lido:"
 
-#: ../pidgin/gtkblist.c:6510
 msgid "Add buddy to _group:"
 msgstr "Adicionar amigo ao _grupo:"
 
-#: ../pidgin/gtkblist.c:6759
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo não suporta salas de bate-papo."
 
-#: ../pidgin/gtkblist.c:6775
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14738,7 +10658,6 @@ msgstr ""
 "Atualmente, você não está conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: ../pidgin/gtkblist.c:6819
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14746,78 +10665,60 @@ msgstr ""
 "Por favor digite um apelido, e as informações apropriadas sobre o bate-papo "
 "que você gostaria de adicionar à sua lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:6842
 msgid "A_lias:"
 msgstr "Ape_lido:"
 
-#: ../pidgin/gtkblist.c:6849
 msgid "Auto_join when account becomes online."
 msgstr "Entrar automaticamente ao conectar."
 
-#: ../pidgin/gtkblist.c:6850
 msgid "_Hide chat when the window is closed."
 msgstr "Esconder conversa quando a janela for fechada."
 
-#: ../pidgin/gtkblist.c:6876
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: ../pidgin/gtkblist.c:7534
+msgid "Enable Account"
+msgstr "Ativar conta"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Contas/Ativar conta"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:7558
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../pidgin/gtkblist.c:7571 ../pidgin/gtkconv.c:3194
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
-#: ../pidgin/gtkblist.c:7579
 msgid "_Disable"
 msgstr "_Desativar"
 
-#: ../pidgin/gtkblist.c:7591
-msgid "Enable Account"
-msgstr "Ativar conta"
-
-#: ../pidgin/gtkblist.c:7597
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Contas/Ativar conta"
-
-#: ../pidgin/gtkblist.c:7646
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:7716
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "Servidores SSL"
 
-#: ../pidgin/gtkconv.c:488
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: ../pidgin/gtkconv.c:752 ../pidgin/gtkconv.c:778
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Este amigo não está usando o mesmo protocolo deste bate-papo."
 
-#: ../pidgin/gtkconv.c:772
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Você não está conectado com uma conta que permita convidar este amigo."
 
-#: ../pidgin/gtkconv.c:825
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:855
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14825,187 +10726,138 @@ msgstr ""
 "Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: ../pidgin/gtkconv.c:876
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:887 ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: ../pidgin/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:989
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: ../pidgin/gtkconv.c:1135 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Procurar"
 
-#: ../pidgin/gtkconv.c:1161 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Pesquisar por:"
 
-#: ../pidgin/gtkconv.c:1662
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: ../pidgin/gtkconv.c:1665
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1685
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-#: ../pidgin/gtkconv.c:1708
 msgid "Last said"
 msgstr "Última mensagem"
 
-#: ../pidgin/gtkconv.c:2689
 msgid "Unable to save icon file to disk."
 msgstr "Não foi possível salvar arquivo de ícone no disco."
 
-#: ../pidgin/gtkconv.c:2767
 msgid "Save Icon"
 msgstr "Salvar ícone"
 
-#: ../pidgin/gtkconv.c:2825
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2830
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: ../pidgin/gtkconv.c:2833
 msgid "Save Icon As..."
 msgstr "Salvar ícone como..."
 
-#: ../pidgin/gtkconv.c:2837
 msgid "Set Custom Icon..."
 msgstr "Definir ícone personalizado..."
 
-#: ../pidgin/gtkconv.c:2841
 msgid "Change Size"
 msgstr "Alterar Tamanho"
 
-#: ../pidgin/gtkconv.c:2854
-msgid "Remove Custom Icon"
-msgstr "Remover ícone personalizado"
-
-#: ../pidgin/gtkconv.c:2979
 msgid "Show All"
 msgstr "Mostrar todos"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2998
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:3000
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkconv.c:3005
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _histórico"
 
-#: ../pidgin/gtkconv.c:3008
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: ../pidgin/gtkconv.c:3010
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
-#: ../pidgin/gtkconv.c:3014
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: ../pidgin/gtkconv.c:3015
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
-#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informações"
 
-#: ../pidgin/gtkconv.c:3019
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/M_ais"
 
-#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Apel_idar..."
 
-#: ../pidgin/gtkconv.c:3027
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3031
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: ../pidgin/gtkconv.c:3033
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: ../pidgin/gtkconv.c:3038
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir lin_k..."
 
-#: ../pidgin/gtkconv.c:3040
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir imag_em..."
 
-#: ../pidgin/gtkconv.c:3046
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:3050
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../pidgin/gtkconv.c:3051
 msgid "/Options/Enable _Logging"
 msgstr "/Opções/Gravar _históricos"
 
-#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Ativar _sons"
 
-#: ../pidgin/gtkconv.c:3054
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opções/Mostrar barras de ferramen_tas de formatação"
 
-#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opções/_Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3182
 msgid "/Conversation/More"
 msgstr "/Conversa/Mais"
 
-#: ../pidgin/gtkconv.c:3238
 msgid "/Options"
 msgstr "/Opções"
 
@@ -15014,79 +10866,60 @@ msgstr "/Opções"
 #. 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:3273 ../pidgin/gtkconv.c:3305
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver histórico"
 
-#: ../pidgin/gtkconv.c:3319
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: ../pidgin/gtkconv.c:3323
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
-#: ../pidgin/gtkconv.c:3329
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informações"
 
-#: ../pidgin/gtkconv.c:3333
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3339
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: ../pidgin/gtkconv.c:3343
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3347
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3351
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: ../pidgin/gtkconv.c:3355
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: ../pidgin/gtkconv.c:3361
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir link..."
 
-#: ../pidgin/gtkconv.c:3365
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: ../pidgin/gtkconv.c:3371
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Gravar históricos"
 
-#: ../pidgin/gtkconv.c:3374
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Ativar sons"
 
-#: ../pidgin/gtkconv.c:3387
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opções/Mostrar barras de ferramentas de formatação"
 
-#: ../pidgin/gtkconv.c:3390
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3468
 msgid "User is typing..."
 msgstr "O usuário está digitando..."
 
-#: ../pidgin/gtkconv.c:3542
 #, c-format
 msgid ""
 "\n"
@@ -15096,526 +10929,377 @@ msgstr ""
 "%s parou de digitar"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3722 ../pidgin/gtkconv.c:8482
 msgid "S_end To"
 msgstr "En_viar para"
 
-#: ../pidgin/gtkconv.c:4441 ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4600
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5942 ../pidgin/gtkconv.c:6063
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: ../pidgin/gtkconv.c:6697 ../pidgin/gtkstatusbox.c:684
 msgid "Typing"
 msgstr "Digitando"
 
-#: ../pidgin/gtkconv.c:6701
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
-#: ../pidgin/gtkconv.c:6704
 msgid "Nick Said"
 msgstr "Apelido mencionado"
 
-#: ../pidgin/gtkconv.c:6707 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
-#: ../pidgin/gtkconv.c:6713
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../pidgin/gtkconv.c:7954
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Limpa todas as janela de conversa."
 
-#: ../pidgin/gtkconv.c:8158
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: ../pidgin/gtkconv.c:8190
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Você tem mensagens não lidas. Tem certeza de que deseja fechar a janela?"
 
-#: ../pidgin/gtkconv.c:8823
 msgid "Close other tabs"
 msgstr "Fechar as outras abas"
 
-#: ../pidgin/gtkconv.c:8829
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: ../pidgin/gtkconv.c:8837
 msgid "Detach this tab"
 msgstr "Separar esta aba"
 
-#: ../pidgin/gtkconv.c:8843
 msgid "Close this tab"
 msgstr "Fechar esta aba"
 
-#: ../pidgin/gtkconv.c:9365
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: ../pidgin/gtkconv.c:9969
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: ../pidgin/gtkconv.c:9971
 msgid "Separate IM and Chat windows"
 msgstr "Separar janelas de MI e bate-papos"
 
-#: ../pidgin/gtkconv.c:9973 ../pidgin/gtkprefs.c:1576
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../pidgin/gtkconv.c:9975
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9977
 msgid "By account"
 msgstr "Por conta"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Salvar log de depuração"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Inverter"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Realçar resultados"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Apenas _ícone"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Apenas _texto"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "Am_bos"
 
-#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filtrar"
 
-#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Clique com o botão direito para mais opções."
 
-#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Nível "
 
-#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Selecione o nível do filtro de depuração."
 
-#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Tudo"
 
-#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Miscelânea"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Erro "
 
-#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Erro fatal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
-msgid "lead developer"
-msgstr "desenvolvedor principal"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../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:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "desenvolvedor"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "suporte"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "suporte/QA"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
 msgstr "desenvolvedor & webmaster"
 
-#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "Contribuidor Sênior/QA"
 
-#: ../pidgin/gtkdialogs.c:110
 msgid "win32 port"
 msgstr "port para Win32"
 
-#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../pidgin/gtkdialogs.c:113
 msgid "libfaim maintainer"
 msgstr "mantenedor da libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:116
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e dirigente designado [vagabundo preguiçoso]"
 
-#: ../pidgin/gtkdialogs.c:117
 msgid "XMPP developer"
 msgstr "desenvolvedor do XMPP"
 
-#: ../pidgin/gtkdialogs.c:118
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:134
+msgid "lead developer"
+msgstr "desenvolvedor principal"
+
 msgid "Afrikaans"
 msgstr "Africâner"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:230
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr "Latim bielorrusso"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:231
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233
 msgid "Catalan"
 msgstr "Catalão"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalão"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:236
 msgid "German"
 msgstr "Alemão"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "Grego"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "Inglês australiano"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "Inglês canadense"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "Inglês britânico"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "Estônio"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "Basco"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
 msgid "French"
 msgstr "Francês"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:247
 msgid "Galician"
 msgstr "Galego"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "Guzerate"
 
-#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "Time de tradução do idioma Guzerate"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:248
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "Hindu"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:249
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "Bahasa Indonésia"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:250
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
-#: ../pidgin/gtkdialogs.c:252 ../pidgin/gtkdialogs.c:253
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:254
 msgid "Georgian"
 msgstr "Geórgio"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores do Ubuntu do idioma Geórgio"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "Canarês"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "Time de tradução do idioma Canarês"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "Laociano"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:257
-#: ../pidgin/gtkdialogs.c:258
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:259
 msgid "Macedonian"
 msgstr "Macedônio"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
 msgid "Bokmål Norwegian"
 msgstr "Dano-Norueguês"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "Nepalês"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "Holandês, Flamengo"
 
-#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "Novo norueguês"
 
-#: ../pidgin/gtkdialogs.c:195
+msgid "Occitan"
+msgstr "Provençal"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:262
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "Português do Brasil"
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Pashto"
 msgstr "Afegão"
 
-#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
 msgid "Russian"
 msgstr "Russo"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:265 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:268
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "Albanês"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:269 ../pidgin/gtkdialogs.c:270
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:271
-#: ../pidgin/gtkdialogs.c:272
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:212
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:214
 msgid "Thai"
 msgstr "Tailandês"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:273
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "Urdu"
 msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:217
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:217
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o time do Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:274
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
 msgid "Hong Kong Chinese"
 msgstr "Chinês de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:275
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: ../pidgin/gtkdialogs.c:229
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:360
 #, c-format
 msgid "About %s"
 msgstr "Sobre o %s"
 
-#: ../pidgin/gtkdialogs.c:396
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15637,57 +11321,43 @@ msgstr ""
 "contribuidoes. Veja o arquivo 'COPYRIGHT' para uma lista completa destes "
 "contribuidores. Não oferecemos nenhuma garantia para este programa.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:414
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin no irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:419
 msgid "Current Developers"
 msgstr "Desenvolvedores atuais"
 
-#: ../pidgin/gtkdialogs.c:434
 msgid "Crazy Patch Writers"
 msgstr "Escritores de patch malucos"
 
-#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Developers"
 msgstr "Desenvolvedores aposentados"
 
-#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Crazy Patch Writers"
 msgstr "Escritores de patch aposentados"
 
-#: ../pidgin/gtkdialogs.c:479
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:494
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
-#: ../pidgin/gtkdialogs.c:514
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: ../pidgin/gtkdialogs.c:532
 msgid "Debugging Information"
 msgstr "Informações de depuração"
 
-#: ../pidgin/gtkdialogs.c:748 ../pidgin/gtkdialogs.c:887
-#: ../pidgin/gtkdialogs.c:968
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
-#: ../pidgin/gtkdialogs.c:973
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../pidgin/gtkdialogs.c:900
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: ../pidgin/gtkdialogs.c:902
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
@@ -15695,36 +11365,28 @@ msgstr ""
 "Por favor digite o nome de usuário da pessoa cuja informação você gostaria "
 "de ver."
 
-#: ../pidgin/gtkdialogs.c:992
 msgid "View User Log"
 msgstr "Ver histórico do usuário"
 
-#: ../pidgin/gtkdialogs.c:1014
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: ../pidgin/gtkdialogs.c:1015
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: ../pidgin/gtkdialogs.c:1037
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: ../pidgin/gtkdialogs.c:1060
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1061
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: ../pidgin/gtkdialogs.c:1100
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15739,15 +11401,12 @@ msgstr[1] ""
 "Você está prestes a remover o contato que contém %s e %d outros amigos da "
 "sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1108
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1111
 msgid "_Remove Contact"
 msgstr "_Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1142
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15756,15 +11415,12 @@ msgstr ""
 "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1149
 msgid "Merge Groups"
 msgstr "Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1152
 msgid "_Merge Groups"
 msgstr "_Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1202
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15773,30 +11429,24 @@ msgstr ""
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1205
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1208
 msgid "_Remove Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1241
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1244
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1247
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1268
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15805,223 +11455,188 @@ msgstr ""
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1271
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1274
 msgid "_Remove Chat"
 msgstr "_Remover bate-papo"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Clique com o botão direito para mais mensagens não lidas...\n"
 
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
+msgid "_Change Status"
 msgstr "Alterar status"
 
-#: ../pidgin/gtkdocklet.c:681
-msgid "Show Buddy List"
-msgstr "Exibir lista de amigos"
+msgid "Show Buddy _List"
+msgstr "Exibir _lista de amigos"
 
-#: ../pidgin/gtkdocklet.c:707
-msgid "New Message..."
+msgid "_Unread Messages"
+msgstr "Mensagens não lidas"
+
+msgid "New _Message..."
 msgstr "Nova mensagem..."
 
-#: ../pidgin/gtkdocklet.c:722
-msgid "Mute Sounds"
-msgstr "Não tocar sons"
+msgid "_Accounts"
+msgstr "_Contas"
+
+msgid "Plu_gins"
+msgstr "Plu_g-ins"
+
+msgid "Pr_eferences"
+msgstr "Pr_eferências"
 
-#: ../pidgin/gtkdocklet.c:729
-msgid "Blink on New Message"
+msgid "Mute _Sounds"
+msgstr "Não tocar _sons"
+
+msgid "_Blink on New Message"
 msgstr "Piscar ao receber nova mensagem"
 
-#: ../pidgin/gtkdocklet.c:739
-msgid "Quit"
+msgid "_Quit"
 msgstr "Fechar"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recebendo como:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recebendo de:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando para:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "Não há um aplicativo configurado para abrir este tipo de arquivo."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Ocorreu um erro na abertura do arquivo."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Erro ao executar %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Erro ao executar %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "O processo retornou o código de erro %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Arquivo local:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Tempo decorrido:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "_Feche esta janela quando todas as transferências terminarem"
 
-#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "Limpar transferências _concluídas"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "_Detalhes da transferência"
 
 #. Pause button
-#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausar"
 
 #. Resume button
-#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:842
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"
 
-#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Reset formatting"
 msgstr "Limpa_r formatação"
 
-#: ../pidgin/gtkimhtml.c:867
 msgid "Disable _smileys in selected text"
 msgstr "Desativar _smileys no texto selecionado"
 
-#: ../pidgin/gtkimhtml.c:1430
 msgid "Hyperlink color"
 msgstr "Cor do hyperlink"
 
-#: ../pidgin/gtkimhtml.c:1431
 msgid "Color to draw hyperlinks."
 msgstr "Cor a ser usada para desenhar os hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1434
 msgid "Hyperlink prelight color"
 msgstr "Cor do hyperlink sob o cursor"
 
-#: ../pidgin/gtkimhtml.c:1435
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Cor a ser usada para desenhar os hyperlinks quando o mouse está sobre eles."
 
-#: ../pidgin/gtkimhtml.c:1438 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Cor do Nome das Mensagens Enviadas"
 
-#: ../pidgin/gtkimhtml.c:1439
 msgid "Color to draw the name of a message you sent."
 msgstr "Cor para desenhar o nome da mensagem que você enviou."
 
-#: ../pidgin/gtkimhtml.c:1442 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Cor do Nome das Mensagens Recebidas"
 
-#: ../pidgin/gtkimhtml.c:1443
 msgid "Color to draw the name of a message you received."
 msgstr "Cor para desenhar o nome da mensagem que você recebeu."
 
-#: ../pidgin/gtkimhtml.c:1446
 msgid "\"Attention\" Name Color"
 msgstr "\"Atenção\" Nome de Cor"
 
-#: ../pidgin/gtkimhtml.c:1447
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "Cor para desenhar o nome de uma mensagem que você recebeu contendo seu nome."
+msgstr ""
+"Cor para desenhar o nome de uma mensagem que você recebeu contendo seu nome."
 
-#: ../pidgin/gtkimhtml.c:1450 ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr "Cor do Nome da Mensagem de Ação"
 
-
-#: ../pidgin/gtkimhtml.c:1451
 msgid "Color to draw the name of an action message."
 msgstr "Cor para desenhar o nome de uma mensagem de ação."
 
-#: ../pidgin/gtkimhtml.c:1460
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Cor do Nome da Mensagem de Ação para Mensagem de Sussurro"
+
+msgid "Whisper Message Name Color"
+msgstr "Cor do Nome das Mensagens de Sussurro"
+
 msgid "Typing notification color"
 msgstr "Cor da notificação de digitação"
 
-#: ../pidgin/gtkimhtml.c:1461
 msgid "The color to use for the typing notification font"
 msgstr "Cor para utilizar na fonte da notificação de digitação"
 
-#: ../pidgin/gtkimhtml.c:1464
 msgid "Typing notification font"
 msgstr "Fonte da notificação da digitação"
 
-#: ../pidgin/gtkimhtml.c:1465
 msgid "The font to use for the typing notification"
 msgstr "Fonte para se utilizar na notificação de digitação"
 
-#: ../pidgin/gtkimhtml.c:1468 ../pidgin/gtkimhtml.c:1469
 msgid "Enable typing notification"
 msgstr "Habilitar notificação de digitação"
 
-#: ../pidgin/gtkimhtml.c:1688
 msgid "_Copy Email Address"
 msgstr "_Copiar endereço de email"
 
-#: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no navegador"
 
-#: ../pidgin/gtkimhtml.c:1710
 msgid "_Copy Link Location"
 msgstr "_Copiar endereço do link"
 
-#: ../pidgin/gtkimhtml.c:3482
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16031,7 +11646,6 @@ msgstr ""
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3485
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16041,7 +11655,6 @@ msgstr ""
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3514
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16052,7 +11665,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3517
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16063,35 +11675,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3598 ../pidgin/gtkimhtml.c:3610
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: ../pidgin/gtkimhtml.c:3638
+#, c-format
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:164
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "Exibir emoticons personalizados"
+
 msgid "Select Font"
 msgstr "Selecionar fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Selecionar cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Selecionar cor de fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Descrição"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -16099,163 +11708,136 @@ msgstr ""
 "Por favor digite a URL e a descrição do link que você gostaria de inserir.  "
 "A descrição é opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Por favor digite a URL do link que você gostaria de inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert Link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1264
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Não foi possível armazenar imagem: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:712
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Este emoticon está desativado por que um emoticon personalizado já existe "
+"para este atalho:\n"
+" %s"
+
 msgid "Smile!"
 msgstr "Emoticon!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:763
+msgid "_Manage custom smileys"
+msgstr "Gerenciar e_moticons personalizados"
+
 msgid "This theme has no available smileys."
 msgstr "Este tema não possui emoticons disponíveis."
 
-#: ../pidgin/gtkimhtmltoolbar.c:847 ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Font"
 msgstr "_Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Group Items"
 msgstr "Agrupar itens"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Ungroup Items"
 msgstr "Desagrupar itens"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
 msgid "Strikethrough"
 msgstr "Tachado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Increase Font Size"
 msgstr "Aumentar tamanho da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Decrease Font Size"
 msgstr "Diminuir tamanho da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Font Face"
 msgstr "Tipo da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Background Color"
 msgstr "Cor do fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Foreground Color"
 msgstr "Cor da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Reset Formatting"
 msgstr "Limpar formatação"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert IM Image"
 msgstr "Inserir imagem de MI"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert Smiley"
 msgstr "Inserir emoticon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negrito</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<i>_Italic</i>"
 msgstr "<i>_Itálico</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<u>_Underline</u>"
 msgstr "<u>_Sublinhado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Tachado</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Maior</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Normal"
 msgstr "N_ormal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>M_enor</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "_Font face"
 msgstr "_Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Foreground _color"
 msgstr "_Cor da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Bac_kground color"
 msgstr "Co_r do fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "Ima_gem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1284
 msgid "_Horizontal rule"
 msgstr "Régua _horizontal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1306
 msgid "_Smile!"
 msgstr "_Emoticon!"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Erro ao Excluir Log"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Verifique as permissões e tente novamente."
 
-#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -16264,7 +11846,6 @@ msgstr ""
 "Você tem certeza de que deseja remover permanentemente o registro da "
 "conversa com %s, que começou às %s?"
 
-#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -16273,7 +11854,6 @@ msgstr ""
 "Você tem certeza de que deseja remover permanentemente o registro da "
 "conversa em %s, que começou às %s?"
 
-#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -16282,35 +11862,28 @@ msgstr ""
 "Você tem certeza de que deseja remover permanentemente o registro do sistema "
 "que começou às %s?"
 
-#: ../pidgin/gtklog.c:323
 msgid "Delete Log?"
 msgstr "Excluir Log?"
 
-#: ../pidgin/gtklog.c:334
 msgid "Delete Log..."
 msgstr "Excluir Log..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa no %s em %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa com %s em %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Navegar na pasta de históricos"
 
-#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Tente `%s -h' para mais informações.\n"
 
-#: ../pidgin/gtkmain.c:389
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16341,7 +11914,6 @@ msgstr ""
 "  --display=DISPLAY   seleciona o display X a usar\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../pidgin/gtkmain.c:402
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16370,7 +11942,6 @@ msgstr ""
 "                      vírgula)\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../pidgin/gtkmain.c:532
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16412,71 +11983,56 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:726 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:360
 msgid "Open All Messages"
 msgstr "Abrir todas as mensagens"
 
-#: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Você tem email!</span>"
 
-#: ../pidgin/gtknotify.c:563
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tem %d nova mensagem."
 msgstr[1] "%s tem %d novas mensagens."
 
-#: ../pidgin/gtknotify.c:587
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d novo email.</b>"
 msgstr[1] "<b>%d novos emails.</b>"
 
-#: ../pidgin/gtknotify.c:1021
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando de navegador \"%s\" é inválido."
 
-#: ../pidgin/gtknotify.c:1023 ../pidgin/gtknotify.c:1035
-#: ../pidgin/gtknotify.c:1048 ../pidgin/gtknotify.c:1185
 msgid "Unable to open URL"
 msgstr "Não foi possível abrir URL"
 
-#: ../pidgin/gtknotify.c:1033 ../pidgin/gtknotify.c:1046
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao executar \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1186
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "A opção de comando do navegador 'Manual' foi escolhida, mas nenhum comando "
 "foi definido."
 
-#: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
 msgstr "Os plug-ins a seguir serão descarregados."
 
-#: ../pidgin/gtkplugin.c:297
 msgid "Multiple plugins will be unloaded."
 msgstr "Vários plug-ins serão descarregados."
 
-#: ../pidgin/gtkplugin.c:301
 msgid "Unload Plugins"
 msgstr "Descarregar plug-ins"
 
-#: ../pidgin/gtkplugin.c:318
 msgid "Could not unload plugin"
 msgstr "Não foi possível descarregar o plug-in"
 
-#: ../pidgin/gtkplugin.c:319
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -16484,7 +12040,6 @@ msgstr ""
 "O plug-in não pôde ser descarregado no momento, mas será desativado na "
 "próxima inicialização."
 
-#: ../pidgin/gtkplugin.c:454
 #, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
@@ -16493,136 +12048,103 @@ msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Erro: %s\n"
 "Verifique o site do plug-in para uma atualização.</span>"
 
-#: ../pidgin/gtkplugin.c:583
 msgid "Author"
 msgstr "Autor"
 
-#: ../pidgin/gtkplugin.c:661
 msgid "<b>Written by:</b>"
 msgstr "<b>Escrito por:</b>"
 
-#: ../pidgin/gtkplugin.c:685
 msgid "<b>Web site:</b>"
 msgstr "<b>Site na internet:</b>"
 
-#: ../pidgin/gtkplugin.c:694
 msgid "<b>Filename:</b>"
 msgstr "<b>Nome do arquivo:</b>"
 
-#: ../pidgin/gtkplugin.c:720
 msgid "Configure Pl_ugin"
 msgstr "Configurar pl_ug-in"
 
-#: ../pidgin/gtkplugin.c:788
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalhes do plug-in</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Selecione um arquivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Quem terá a ação"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_Desconectar"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "O amigo ficar _ausente"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "Volta_r da ausência"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Tornar-se _inativo"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Não estiver mais i_nativo"
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "C_omeçar a digitar"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "P_ausar ao digitar"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Parar de di_gitar"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "En_viar uma mensagem"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "Abrir uma jan_ela de MI"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Exibir notificação _popup"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Envia_r uma mensagem"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "E_xecutar um comando"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Tocar um _som"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Pré-_visualizar"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "_Executar apenas quando meu status não for Disponível"
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Alvo da ação"
 
-#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "O tema de emoticons não pôde ser descompactado."
 
-#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Instalar tema"
 
-#: ../pidgin/gtkprefs.c:646
 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."
@@ -16630,148 +12152,112 @@ msgstr ""
 "Selecione um tema de emoticons que você gostaria de usar da lista abaixo. "
 "Novos temas podem ser instalados arrastando e soltando-os na lista de temas."
 
-#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Ícone"
 
-#: ../pidgin/gtkprefs.c:894
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de Teclado"
 
-#: ../pidgin/gtkprefs.c:914
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Fechar C_onversas com a Tecla Esc"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "System Tray Icon"
 msgstr "Ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "_Show system tray icon:"
 msgstr "Mo_strar ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:947
 msgid "On unread messages"
 msgstr "Para as mensagens não lidas"
 
-#: ../pidgin/gtkprefs.c:953
 msgid "Conversation Window Hiding"
 msgstr "Quando esconder as janelas de conversa"
 
-#: ../pidgin/gtkprefs.c:954
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:957 ../pidgin/gtkprefs.c:2075
 msgid "When away"
 msgstr "Quando ausente"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:965
 msgid "Tabs"
 msgstr "Abas"
 
-#: ../pidgin/gtkprefs.c:967
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar mensagens instantâneas e bate-papos em janelas com _abas"
 
-#: ../pidgin/gtkprefs.c:981
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar o b_otão de fechar nas abas"
 
-#: ../pidgin/gtkprefs.c:984
 msgid "_Placement:"
 msgstr "_Posicionamento:"
 
-#: ../pidgin/gtkprefs.c:986
 msgid "Top"
 msgstr "Cima"
 
-#: ../pidgin/gtkprefs.c:987
 msgid "Bottom"
 msgstr "Baixo"
 
-#: ../pidgin/gtkprefs.c:988
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../pidgin/gtkprefs.c:989
 msgid "Right"
 msgstr "Direita"
 
-#: ../pidgin/gtkprefs.c:991
 msgid "Left Vertical"
 msgstr "Vertical à esquerda"
 
-#: ../pidgin/gtkprefs.c:992
 msgid "Right Vertical"
 msgstr "Vertical à direita"
 
-#: ../pidgin/gtkprefs.c:999
 msgid "N_ew conversations:"
 msgstr "Novas conv_ersas:"
 
-#: ../pidgin/gtkprefs.c:1048
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar _formatação nas mensagens recebidas"
 
-#: ../pidgin/gtkprefs.c:1050
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Fechar janelas de MI imediatamente quando a aba for fechada"
 
-#: ../pidgin/gtkprefs.c:1053
 msgid "Show _detailed information"
 msgstr "Exibir informações _detalhadas"
 
-#: ../pidgin/gtkprefs.c:1055
 msgid "Enable buddy ic_on animation"
 msgstr "Ativar animação nos íc_ones de amigos"
 
-#: ../pidgin/gtkprefs.c:1062
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar amigos de que você está digitando para eles"
 
-#: ../pidgin/gtkprefs.c:1065
 msgid "Highlight _misspelled words"
 msgstr "Realçar palavras _mal grafadas"
 
-#: ../pidgin/gtkprefs.c:1069
 msgid "Use smooth-scrolling"
 msgstr "Usar rolagem suave"
 
-#: ../pidgin/gtkprefs.c:1072
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando mensagens forem recebidas"
 
-#: ../pidgin/gtkprefs.c:1074
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar novas janelas de conversa"
 
-#: ../pidgin/gtkprefs.c:1078
 msgid "Minimum input area height in lines:"
 msgstr "Altura da área minima de entrada em linhas:"
 
-#: ../pidgin/gtkprefs.c:1084
 msgid "Font"
 msgstr "Fonte"
 
-#: ../pidgin/gtkprefs.c:1086
 msgid "Use document font from _theme"
 msgstr "Usar a fonte de documento do _tema"
 
-#: ../pidgin/gtkprefs.c:1088
 msgid "Use font from _theme"
 msgstr "Usar a fonte do _tema"
 
-#: ../pidgin/gtkprefs.c:1094
 msgid "Conversation _font:"
 msgstr "_Fonte para as conversas:"
 
-#: ../pidgin/gtkprefs.c:1101
 msgid "Default Formatting"
 msgstr "Formatação padrão"
 
-#: ../pidgin/gtkprefs.c:1120
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16779,63 +12265,48 @@ msgstr ""
 "Sua mensagem enviada aparecerá assim quando você usar protocolos que "
 "suportem formatação."
 
-#: ../pidgin/gtkprefs.c:1180
 msgid "Cannot start proxy configuration program."
 msgstr "Não foi possível iniciar o programa de configuração do proxy."
 
-#: ../pidgin/gtkprefs.c:1192
 msgid "Cannot start browser configuration program."
 msgstr "Não foi possível iniciar o programa de configuração do navegador."
 
-#: ../pidgin/gtkprefs.c:1212
 msgid "ST_UN server:"
 msgstr "_Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1224
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1228
 msgid "_Autodetect IP address"
 msgstr "Detectar endereço IP _automaticamente"
 
-#: ../pidgin/gtkprefs.c:1237
 msgid "Public _IP:"
 msgstr "_IP público:"
 
-#: ../pidgin/gtkprefs.c:1268
 msgid "Ports"
 msgstr "Portas"
 
-#: ../pidgin/gtkprefs.c:1271
 msgid "_Enable automatic router port forwarding"
 msgstr "Habilitar roteador automático de _encaminhamento de porta"
 
-#: ../pidgin/gtkprefs.c:1274
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
-#: ../pidgin/gtkprefs.c:1277
 msgid "_Start port:"
 msgstr "Porta _inicial:"
 
-#: ../pidgin/gtkprefs.c:1284
 msgid "_End port:"
 msgstr "Porta _final:"
 
-#: ../pidgin/gtkprefs.c:1292
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy &amp; navegador"
 
-#: ../pidgin/gtkprefs.c:1300
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>O programa de configuração do proxy não foi encontrado</b>"
 
-#: ../pidgin/gtkprefs.c:1308
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>O programa de configuração do browser não foi encontrado.</b>"
 
-#: ../pidgin/gtkprefs.c:1313
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16843,99 +12314,75 @@ msgstr ""
 "Preferências do proxy e do navegador são configuradas\n"
 "nas preferências do GNOME"
 
-#: ../pidgin/gtkprefs.c:1320
 msgid "Configure _Proxy"
 msgstr "Configurar _proxy"
 
-#: ../pidgin/gtkprefs.c:1325
 msgid "Configure _Browser"
 msgstr "Configurar _navegador"
 
-#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1336
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkprefs.c:1392
 msgid "_User:"
 msgstr "_Usuário:"
 
-#: ../pidgin/gtkprefs.c:1480
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1481
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1482
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1483
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1484
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1485
 msgid "Desktop Default"
 msgstr "Desktop Padrão"
 
-#: ../pidgin/gtkprefs.c:1486
 msgid "GNOME Default"
 msgstr "Padrão do GNOME"
 
-#: ../pidgin/gtkprefs.c:1487
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1488
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1489
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1490
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1499
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1560
 msgid "Browser Selection"
 msgstr "Seleção do navegador"
 
-#: ../pidgin/gtkprefs.c:1564
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1572
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: ../pidgin/gtkprefs.c:1574
 msgid "Browser default"
 msgstr "Navegador padrão"
 
-#: ../pidgin/gtkprefs.c:1575
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: ../pidgin/gtkprefs.c:1577
 msgid "New tab"
 msgstr "Nova aba"
 
-#: ../pidgin/gtkprefs.c:1594
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16944,63 +12391,54 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1620
 msgid "Log _format:"
 msgstr "_Formato do histórico:"
 
-#: ../pidgin/gtkprefs.c:1625
 msgid "Log all _instant messages"
 msgstr "_Gravar todas as mensagens instantâneas"
 
-#: ../pidgin/gtkprefs.c:1627
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: ../pidgin/gtkprefs.c:1629
 msgid "Log all _status changes to system log"
 msgstr "Gravar todos as mudanças de _status no histórico do sistema"
 
-#: ../pidgin/gtkprefs.c:1779
 msgid "Sound Selection"
 msgstr "Seleção de som"
 
-#: ../pidgin/gtkprefs.c:1789
+#, c-format
 msgid "Quietest"
 msgstr "Muito silencioso"
 
-#: ../pidgin/gtkprefs.c:1791
+#, c-format
 msgid "Quieter"
 msgstr "Mais silencioso"
 
-#: ../pidgin/gtkprefs.c:1793
+#, c-format
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1797
+#, c-format
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1799
+#, c-format
 msgid "Louder"
 msgstr "Mais alto"
 
-#: ../pidgin/gtkprefs.c:1801
+#, c-format
 msgid "Loudest"
 msgstr "Muito alto"
 
-#: ../pidgin/gtkprefs.c:1864
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1866
 msgid "Console beep"
 msgstr "Bipe do console"
 
-#: ../pidgin/gtkprefs.c:1873
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: ../pidgin/gtkprefs.c:1886
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17009,282 +12447,264 @@ msgstr ""
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: ../pidgin/gtkprefs.c:1895
 msgid "Sounds when conversation has _focus"
 msgstr "Emitir sons quando a janela da conversa _ganhar foco"
 
-#: ../pidgin/gtkprefs.c:1897
 msgid "Enable sounds:"
 msgstr "Ativar sons:"
 
-#: ../pidgin/gtkprefs.c:1914
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1981
 msgid "Play"
 msgstr "Tocar"
 
-#: ../pidgin/gtkprefs.c:2058
+msgid "_Browse..."
+msgstr "Proc_urar..."
+
+msgid "_Reset"
+msgstr "_Redefinir"
+
 msgid "_Report idle time:"
 msgstr "Mostrar _tempo de inatividade:"
 
-#: ../pidgin/gtkprefs.c:2063
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-#: ../pidgin/gtkprefs.c:2072
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: ../pidgin/gtkprefs.c:2076
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2082
 msgid "Auto-away"
 msgstr "Auto-ausente"
 
-#: ../pidgin/gtkprefs.c:2084
 msgid "Change status when _idle"
 msgstr "Mudar status após _inatividade"
 
-#: ../pidgin/gtkprefs.c:2088
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de tornar inativo:"
 
-#: ../pidgin/gtkprefs.c:2095
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2108
 msgid "Status at Startup"
 msgstr "Status na inicialização"
 
-#: ../pidgin/gtkprefs.c:2110
 msgid "Use status from last _exit at startup"
 msgstr "Usar o s_tatus da última saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:2117
 msgid "Status to a_pply at startup:"
 msgstr "Status a a_plicar na inicialização:"
 
-#: ../pidgin/gtkprefs.c:2146
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2148
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: ../pidgin/gtkprefs.c:2155
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2159
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos os usuários me contatem"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Permitir apenas os usuários na minha lista de amigos"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Permitir apenas usuários abaixo"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Bloquear todos os usuários"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Bloquear apenas os usuários abaixo"
 
-#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Mudanças nas configurações de privacidade entram em efeito imediatamente."
 
-#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Definir privacidade para:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
 msgstr "Remover Tudo"
 
-#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Permitir usuário"
 
-#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Digite um usuário que você permite que o contate."
 
-#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Favor digitar o nome do usuário que você gostaria que pudesse contatar você."
 
-#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permitir que %s te contate?"
 
-#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Você tem certeza de que deseja permitir que %s te contate?"
 
-#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Bloquear o usuário"
 
-#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Digite um usuário para bloquear."
 
-#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Por favor digite o nome do usuário que você deseja bloquear."
 
-#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Você tem certeza de que deseja bloquear %s?"
 
-#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Você deseja sobrescrevê-lo?"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Escolher novo nome"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Selecionar pasta..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "Ob_ter lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Adicionar bate-papo"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Você tem certeza de que deseja remover os status salvos selecionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
 "Este título já está sendo utilizado. Você precisa selecionar um título que "
 "ainda não exista."
 
-#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Outro"
 
-#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Use um status _diferente para algumas contas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "Status de %s"
 
-#: ../pidgin/gtkstatusbox.c:688
+msgid "Custom Smiley"
+msgstr "Emoticon personalizado"
+
+msgid "Duplicate Shortcut"
+msgstr "Atalho duplicado"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Um emoticon personalizado para o atalho selecionado já existe. Por favor, "
+"forneça um atalho diferente."
+
+msgid "More Data needed"
+msgstr "Mais dados necessários"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Por favor, defina um atalho para associar com o emoticon."
+
+msgid "Please select an image for the smiley."
+msgstr "Por favor, favor selecione uma imagem para o emoticon."
+
+msgid "Edit Smiley"
+msgstr "Editar Emoticon"
+
+msgid "Add Smiley"
+msgstr "Adicionar Emoticon"
+
+msgid "Smiley _Image"
+msgstr "_Imagem do Emoticon"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Atalhos de Emoticon"
+
+msgid "Smiley"
+msgstr "Emoticon"
+
+msgid "Custom Smiley Manager"
+msgstr "Gerenciador de emoticons personalizados"
+
 msgid "Waiting for network connection"
 msgstr "Esperando pela conexão de rede"
 
-#: ../pidgin/gtkstatusbox.c:1101
 msgid "New status..."
 msgstr "Novo status..."
 
-#: ../pidgin/gtkstatusbox.c:1102
 msgid "Saved statuses..."
 msgstr "Status salvos..."
 
-#: ../pidgin/gtkstatusbox.c:1737
 msgid "Status Selector"
 msgstr "Seletor de status"
 
-#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao carregar %s: %s."
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Não foi possível enviar a pasta %s."
 
-#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -17293,12 +12713,9 @@ msgstr ""
 "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que "
 "estão dentro dela individualmente."
 
-#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
-#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "Você arrastou uma imagem"
 
-#: ../pidgin/gtkutils.c:1585
 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."
@@ -17306,23 +12723,18 @@ msgstr ""
 "Você pode usar esta imagem numa transferência de arquivo, incluí-la nesta "
 "mensagem, ou usá-la como o ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "Definir como ícone de amigo"
 
-#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Você deseja defini-la como o ícone de amigo deste usuário?"
 
-#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -17330,7 +12742,6 @@ msgstr ""
 "Você pode usar esta imagem numa transferência de arquivo, ou usá-la como o "
 "ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17343,11 +12754,9 @@ msgstr ""
 #. * 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:1664
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
-#: ../pidgin/gtkutils.c:1664
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -17355,7 +12764,6 @@ msgstr ""
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
 
-#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17366,25 +12774,20 @@ msgstr ""
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimensões da imagem:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "O arquivo '%s' é grande demais para %s. Tente uma imagem menor.\n"
 
-#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "Erro no ícone"
 
-#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir arquivo '%s': %s"
 
-#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17392,83 +12795,63 @@ msgstr ""
 "Falha ao carregar imagem '%s': motivo desconhecido, provavelmente o arquivo "
 "de imagem está corrompido"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Salvar arquivo"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Selecionar cor"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Apelido:"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Fechar _abas"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Ver info"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "Conv_idar"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Abrir email"
 
-#: ../pidgin/pidgintooltip.c:100
 msgid "Pidgin Tooltip"
 msgstr "Dicas de Ferramentas do Pidgin"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Emoticons do Pidgin"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Penguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Ao selecionar este tema, os emoticons gráficos serão desativados."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "nenhum"
 
-#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Probabilidade de resposta"
 
-#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Configuração das estatísticas"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Tempo limite de resposta:"
 
-#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
-#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Diferença máxima da variável \"visto pela última vez\""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Limite:"
 
@@ -17478,47 +12861,38 @@ msgstr "Limite:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "Previsão de disponibilidade do contato"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr "Plug-in de previsão de disponibilidade do contato."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Displays statistical information about your buddies' availability"
-msgstr "Mostrar informações estatísticas sobre a disponibilidade de seus amigos"
+msgstr ""
+"Mostrar informações estatísticas sobre a disponibilidade de seus amigos"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "O amigo estiver inativo"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "O amigo estiver ausente"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "O amigo estiver ausente \"estendido\""
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "O amigo estiver num dispositivo móvel"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "O amigo estiver desconectado"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Valores pontuais a serem usados quando..."
 
-#: ../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"
@@ -17526,11 +12900,9 @@ msgstr ""
 "O amigo com a <i>maior pontuação</i> é o amigo que terá prioridade no "
 "contato.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Usar o último amigo quando as pontuações forem iguais"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Valores pontuais a serem usados para a conta..."
 
@@ -17540,21 +12912,18 @@ msgstr "Valores pontuais a serem usados para a conta..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioridade de contatos"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Permite controlar os valores associados com diferentes status de amigos."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -17562,61 +12931,47 @@ msgstr ""
 "Permite controlar os valores pontuais dos status de inativo/ausente/"
 "desconectado para amigos na computação da prioridade dos contatos."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Cores da conversa"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Personalize as cores na janela de conversa"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Mensagens de erro"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Mensagens realçadas"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Mensagens de sistema"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Mensagens enviadas"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Mensagens recebidas"
 
-#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Selecione a cor de %s"
 
-#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Ignorar formato original"
 
-#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Aplicar em bate-papos"
 
-#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Aplicar em mensagens instantâneas"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Por número de conversas"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Posicionamento das conversas"
 
 #. 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\"."
@@ -17624,11 +12979,9 @@ msgstr ""
 "Nota: A preferência \"Novas conversas\" deve ser definida para \"Por número "
 "de conversas\"."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Número de conversas por janela"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 "Separar janelas de mensagens instantâneas e bate-papos quando posicionando "
@@ -17640,19 +12993,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Posições extras"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Opções extra de posicionamento de conversas."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -17661,20 +13011,16 @@ msgstr ""
 "mensagens instantâneas de bate-papos"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configuração dos gestos do mouse"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Botão do meio do mouse"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Botão direito do mouse"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Exibição visual dos gestos"
 
@@ -17684,19 +13030,16 @@ msgstr "_Exibição visual dos gestos"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Gestos do mouse"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Fornece suporte a gestos do mouse"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -17708,41 +13051,32 @@ msgstr ""
 "com o botão do meio pressionado para executar certas ações:\n"
 "\n"
 " • Arraste para baixo e depois para a direita para fechar uma conversa.\n"
-" • Arraste para cima e depois para a esquerda para alternar para a conversa"
-"anterior.\n"
+" • Arraste para cima e depois para a esquerda para alternar para a "
+"conversaanterior.\n"
 " • Arraste para cima e depois para a direita para alternar para a próxima "
 "conversa."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Mensagens instantâneas"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Selecione uma pessoa do seu catálogo de endereços abaixo, ou adicione uma "
 "nova pessoa."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Nova pessoa"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Selecionar amigo"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -17751,43 +13085,33 @@ msgstr ""
 "a ela, ou crie uma nova pessoa."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalhes do usuário"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Associar amigo"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:242
-#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send email"
 msgstr "Não foi possível enviar email."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "O executável do evolution não foi encontrado no PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An email address was not found for this buddy."
 msgstr "Não foi encontrado um endereço de Email para este amigo."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Adicionar ao catálogo de endereços"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send Email"
 msgstr "Enviar email"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Configuração da integração com o Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Selecionar todas as contas onde amigos devem ser adicionados automaticamente."
@@ -17798,7 +13122,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Integração com o Evolution"
 
@@ -17806,37 +13129,28 @@ msgstr "Integração com o Evolution"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Fornece integração com o Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Por favor, digite as informações da pessoa abaixo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's username and account type below."
 msgstr "Por favor digite o nome de usuário do amigo e o tipo de conta abaixo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo da conta:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "Informações opcionais:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "Sobrenome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "Email:"
 msgstr "Email:"
 
@@ -17846,7 +13160,6 @@ msgstr "Email:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Teste dos sinais do GTK"
 
@@ -17854,14 +13167,11 @@ msgstr "Teste dos sinais do GTK"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 "Teste para ver se todos os sinais da interface estão funcionando "
 "corretamente."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17870,7 +13180,6 @@ msgstr ""
 "\n"
 "<b>Comentário do amigo</b>: %s"
 
-#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Histórico"
 
@@ -17880,7 +13189,6 @@ msgstr "Histórico"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Minimizar enquanto ausente"
 
@@ -17888,49 +13196,38 @@ msgstr "Minimizar enquanto ausente"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimiza a lista de amigos e suas conversas quando você fica ausente."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Verificador de email"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Verifica novos emails locais."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Adiciona uma pequena caixa à lista de amigos que mostra se você tem novos e-"
 "mails."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Marcatexto"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Desenha uma linha para indicar novas mensagens numa conversa."
 
-#: ../pidgin/plugins/markerline.c:240
 msgid "Jump to markerline"
 msgstr "Ir para marcatexto"
 
-#: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "Desenhar linha em"
 
-#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "Janelas de mensagens _instantâneas"
 
-#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "J_anelas de bate-papo"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -17938,36 +13235,28 @@ msgstr ""
 "Uma sessão de conversa musical foi requisitada. Favor clicar no ícone da "
 "conversa musical para aceitá-la."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Sessão de conversa musical confirmada."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Conversa musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Houve um conflito ao executar o comando:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Erro ao executar editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "O seguinte erro ocorreu:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configuração de conversa musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Caminho do editor de partituras"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -17979,12 +13268,10 @@ msgstr "_Aplicar"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plug-in de conversa musical para composição colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 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."
@@ -17994,79 +13281,63 @@ msgstr ""
 "tempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:689
 msgid "Notify For"
 msgstr "Notificar para"
 
-#: ../pidgin/plugins/notify.c:708
 msgid "\t_Only when someone says your username"
 msgstr "\t_Apenas quando alguém menciona seu nome"
 
-#: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
 msgstr "_Janelas com foco"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:726
 msgid "Notification Methods"
 msgstr "Métodos de notificação"
 
-#: ../pidgin/plugins/notify.c:733
 msgid "Prepend _string into window title:"
 msgstr "Inserir este _texto no título da janela:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:752
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserir c_ontador de novas mensagens no título da janela"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:761
 msgid "Insert count of new message into _X property"
 msgstr "Inserir c_ontador de novas mensagens na propriedade _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:769
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Definir a opção \"_URGENT\" do gerenciador de janelas"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
 msgstr "Coloc_ar janela de conversa no topo"
 
 #. Present conversation method button
-#: ../pidgin/plugins/notify.c:786
 msgid "_Present conversation window"
 msgstr "Janela de conversa atual"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:794
 msgid "Notification Removal"
 msgstr "Remoção de notificação"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:799
 msgid "Remove when conversation window _gains focus"
 msgstr "Remover quando a janela da conversa _ganhar foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:806
 msgid "Remove when conversation window _receives click"
 msgstr "_Remover quando a janela da conversa for clicada"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:814
 msgid "Remove when _typing in conversation window"
 msgstr "Remover ao _digitar na janela da conversa"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:822
 msgid "Remove when a _message gets sent"
 msgstr "Remover quando uma _mensagem for enviada"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:831
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remover ao mudar para a a_ba da conversa"
 
@@ -18076,7 +13347,6 @@ msgstr "Remover ao mudar para a a_ba da conversa"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:924
 msgid "Message Notification"
 msgstr "Notificação de mensagens"
 
@@ -18084,7 +13354,6 @@ msgstr "Notificação de mensagens"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:927 ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Oferece diversas maneiras de te notificar sobre mensagens não lidas."
 
@@ -18094,19 +13363,16 @@ msgstr "Oferece diversas maneiras de te notificar sobre mensagens não lidas."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Plug-in de demonstração do Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Um plug-in de exemplo que faz coisas - veja a descrição."
 
 #. *  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"
@@ -18119,56 +13385,44 @@ msgstr ""
 "- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
 "se conectam"
 
-#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Cor do cursor"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Cor do cursor secundário"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Cor do hyperlink"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Cor do Nome de Mensagens Realçadas"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separação horizontal do GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Janela de conversas"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Diálogo de requisição"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Diálogo de notificação"
 
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Selecionar cor"
 
-#: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Selecionar fonte da interface"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Selecionar fonte de %s"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "Fonte da interface do GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atalhos do GTK+"
 
@@ -18192,48 +13446,37 @@ msgstr "Tema de atalhos do GTK+"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "_Cores da interface"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Tamanho dos controles"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas do gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Gravar configurações em %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Re-carregar arquivos gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Controle do tema do GTK+ do Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Oferece acesso a configurações do gtkrc comumente utilizadas."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Entrada pura"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permite enviar entrada pura para protocolos baseados em texto."
 
-#: ../pidgin/plugins/raw.c:178
 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."
@@ -18242,7 +13485,6 @@ msgstr ""
 "IRC, TOC). Pressione 'Enter' na caixa de entrada para enviar. Verifique a "
 "janela de depuração."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -18251,12 +13493,10 @@ msgstr ""
 "Você está usando o %s, versão %s. A versão atual é a %s. Você pode obtê-la "
 "em <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Histórico de alterações:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nova versão disponível"
 
@@ -18266,19 +13506,16 @@ msgstr "Nova versão disponível"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notificação de nova versão"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Verifica periodicamente por novas versões."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -18294,88 +13531,70 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/sendbutton.c:138
 msgid "Send Button"
 msgstr "Botão de Envio"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/sendbutton.c:140
 msgid "Conversation Window Send Button."
 msgstr "Botão de Enviar da Janela de Conversa."
 
 #. *< summary
-#: ../pidgin/plugins/sendbutton.c:141
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for when no physical keyboard is present."
 msgstr ""
-"Adiciona um botão Enviar na área de entrada da janela de conversação. Ideal"
-"para quando nenhum teclado físico está presente."
+"Adiciona um botão Enviar na área de entrada da janela de conversação. "
+"Idealpara quando nenhum teclado físico está presente."
 
-#: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "Correção duplicada"
 
-#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "A palavra especificada já existe na lista de correções."
 
-#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "Substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "Você digita"
 
-#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "Você envia"
 
-#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "Apenas palavras inteiras"
 
-#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "Diferenciar maiusculização"
 
-#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "Inserir nova substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "Você _digita:"
 
-#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "Você _envia:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2296
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
-"Maiusculização _exata (desmarque para tratar da maiusculização automaticamente)"
+"Maiusculização _exata (desmarque para tratar da maiusculização "
+"automaticamente)"
 
-#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "Apenas substituir palavras _inteiras"
 
-#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "Opções gerais de substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "Ativar substituição da última palavra ao enviar"
 
-#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "Substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
@@ -18387,7 +13606,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Monitor de amigos"
 
@@ -18395,11 +13613,9 @@ msgstr "Monitor de amigos"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Uma versão da lista de amigos que rola horizontalmente."
 
-#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Mostrar marcações de tempo a cada"
 
@@ -18409,50 +13625,39 @@ msgstr "Mostrar marcações de tempo a cada"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Marcação de tempo"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Mostra marcações de tempo como o iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr ""
 "Adiciona marcações de tempo como as do iChat às conversas a cada N minutos."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Opções de formatação da marcação de tempo"
 
-#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Forçar formato de data 24-horas"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Mostrar datas em..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Conversas:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Para mensagens atrasadas"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Para mensagens atrasadas e em bate-papos"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "_Históricos de mensagens:"
 
@@ -18462,64 +13667,49 @@ msgstr "_Históricos de mensagens:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Formatos de marcação de tempo das mensagens"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Personaliza os formatos de marcação de tempo das mensagens."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Este plug-in permite ao usuário personalizar os formatos de marcação de tempo "
-"nas conversas e logs."
+"Este plug-in permite ao usuário personalizar os formatos de marcação de "
+"tempo nas conversas e logs."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Janelas de conversa por mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparência da janela de _mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar slider na janela de mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Remover transparência da janela quando esta ganhar foco"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Sempre no topo"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Janela da lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparência da janela da _lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Remover a transparência da lista de amigos ao focá-la"
 
@@ -18529,19 +13719,16 @@ msgstr "Remover a transparência da lista de amigos ao focá-la"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparência"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparência variável para a lista de amigos e conversas."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -18553,54 +13740,43 @@ msgstr ""
 "\n"
 "* Nota: Este plug-in requer Win2000 ou superior."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Versão do ambiente de tempo de execução do GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Iniciar"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Executar %s na inicialização do Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Lista de _amigos ancorável"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Manter a janela da lista de amigos no topo:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Apenas quando ancorado"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Piscar a janela quando mensagens de bate-papo forem recebidas"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opções do Pidgin para Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opções específicas do Pidgin para Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Fornece opções específicas do Pidgin para Windows, como ancoramento da lista "
 "de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "\"<font color='#777777'>Desconectado.</font>"
 
@@ -18610,49 +13786,80 @@ msgstr "\"<font color='#777777'>Desconectado.</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Console XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Conta: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Não conectado ao XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Inserir um comando (stanza) <iq/>"
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Inserir um comando (stanza) <presence/>"
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Inserir um comando (stanza) <message/>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Código [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Erro na operação de grupo"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "Erro ao definir as opções do socket"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Autenticação do Windows Live ID: Não foi possível encontrar token de "
+#~ "autenticação na resposta do servidor"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "A autenticação do Windows Live ID falhou"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "Malvado demais (remetente)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Malvado demais (destinatário)"
+
+#~ msgid "Available Message"
+#~ msgstr "Mensagem de 'Disponível':"
+
+#~ msgid "Away Message"
+#~ msgstr "Mensagem de ausência"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(obtendo)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Erro ao solicitar token de conexão"
+
+#~ msgid "TCP Address"
+#~ msgstr "Endereço TCP"
+
+#~ msgid "UDP Address"
+#~ msgstr "Endereço UDP"
+
 #~ msgid "Screen name:"
 #~ msgstr "Nome de usuário:"
 
-#~ msgid "Screen Name"
-#~ msgstr "Nome de usuário"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Alguém diz seu nome no bate-papo"
 
diff --git a/po/ro.po b/po/ro.po
index 19dbdd3b99..4e516c1c47 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.4.2\n"
+"Project-Id-Version: pidgin-2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-12 03:22-0400\n"
-"PO-Revision-Date: 2008-05-14 23:49+0300\n"
+"POT-Creation-Date: 2008-08-15 12:03-0400\n"
+"PO-Revision-Date: 2008-08-13 23:52+0300\n"
 "Last-Translator: Mişu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,13 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Încercaţi „%s -h” pentru mai multe informaţii.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -50,7 +46,6 @@ msgstr ""
 "  -n, --nologin       fără autentificare automată\n"
 "  -v, --version       arată versiunea curentă\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:738
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -61,254 +56,105 @@ msgstr ""
 "investigaţi problema şi să terminaţi manual migrarea. Raportaţi această "
 "eroare la http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:595
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772 ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244 ../finch/gntrequest.c:380 ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310 ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121 ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2080
-#: ../libpurple/protocols/jabber/chat.c:682
-#: ../libpurple/protocols/jabber/chat.c:693
-#: ../libpurple/protocols/jabber/jabber.c:1594
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Eroare"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Contul nu a fost adăugat"
 
-#: ../finch/gntaccount.c:125
 msgid "Username of an account must be non-empty."
 msgstr "Numele de utilizator al unui cont nu poate fi gol."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notificare la mail nou"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Salvare parolă"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Nu există nici un modul de protocol instalat"
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Probabil aţi uitat să faceţi „make install”.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1449 ../pidgin/gtkblist.c:4671
 msgid "Modify Account"
 msgstr "Modificare cont"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Cont nou"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Username:"
 msgstr "Nume utilizator:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Creează acest cont pe server"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:641 ../finch/gntblist.c:747
-#: ../finch/gntblist.c:782 ../finch/gntblist.c:1134 ../finch/gntblist.c:1360
-#: ../finch/gntblist.c:1494 ../finch/gntblist.c:2661 ../finch/gntblist.c:2712
-#: ../finch/gntblist.c:2776 ../finch/gntblist.c:2838 ../finch/gntcertmgr.c:90
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:471 ../finch/gntpounce.c:679
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1064 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:178 ../libpurple/account.c:1118
-#: ../libpurple/account.c:1437 ../libpurple/account.c:1472
-#: ../libpurple/conversation.c:1235 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:759
-#: ../libpurple/protocols/jabber/buddy.c:2474
-#: ../libpurple/protocols/jabber/buddy.c:2510
-#: ../libpurple/protocols/jabber/chat.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#: ../libpurple/protocols/jabber/jabber.c:1072
-#: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/jabber/si.c:1113
-#: ../libpurple/protocols/jabber/usermood.c:199
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:403
-#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
-#: ../libpurple/protocols/msn/msn.c:373 ../libpurple/protocols/msnp9/msn.c:284
-#: ../libpurple/protocols/msnp9/msn.c:301
-#: ../libpurple/protocols/msnp9/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:356
-#: ../libpurple/protocols/myspace/user.c:582
-#: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6209
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:120
-#: ../libpurple/protocols/qq/group_opt.c:375
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3440
-#: ../libpurple/protocols/sametime/sametime.c:3526
-#: ../libpurple/protocols/sametime/sametime.c:3700
-#: ../libpurple/protocols/sametime/sametime.c:5453
-#: ../libpurple/protocols/sametime/sametime.c:5543
-#: ../libpurple/protocols/sametime/sametime.c:5668
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc/chat.c:753
-#: ../libpurple/protocols/silc/ops.c:1833
-#: ../libpurple/protocols/silc/silc.c:1039
-#: ../libpurple/protocols/silc/silc.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:742
-#: ../libpurple/protocols/silc10/silc.c:948
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
-#: ../libpurple/protocols/yahoo/yahoo.c:3575 ../pidgin/gtkaccount.c:1843
-#: ../pidgin/gtkaccount.c:2404 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkblist.c:6879 ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:768 ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1019
-#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
-#: ../pidgin/gtkdialogs.c:1113 ../pidgin/gtkdialogs.c:1154
-#: ../pidgin/gtkdialogs.c:1210 ../pidgin/gtkdialogs.c:1249
-#: ../pidgin/gtkdialogs.c:1276 ../pidgin/gtkimhtmltoolbar.c:438
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:302 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1619
 msgid "Cancel"
 msgstr "Renunţă"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1471 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:758 ../pidgin/gtkblist.c:684
-#: ../pidgin/gtkdebug.c:746 ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Salvează"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1834
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1613
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sigur doriţi să ştergeţi %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Ştergere cont"
 
 #. Delete button
-#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1842 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1618
 msgid "Delete"
 msgstr "Şterge"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2528 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2263 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Conturi"
 
-#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puteţi activa şi şterge conturi din lista următoare."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:640
-#: ../finch/gntblist.c:747 ../finch/gntblist.c:782 ../finch/gntblist.c:2947
-#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5542
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2403
-#: ../pidgin/gtkblist.c:6878 ../pidgin/gtkconv.c:1721
-#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Adăugare"
 
 #. Modify button
-#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Modificare"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2350
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s l-a făcut pe %s contactul său%s%s"
 
-#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2402
 msgid "Add buddy to your list?"
 msgstr "Doriţi adăugarea utilizatorului în lista de contacte?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2460
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
 "%s%s%s%s doreşte să adauge utilizatorul %s în lista sa de contacte%s%s."
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2483
-#: ../pidgin/gtkaccount.c:2490
 msgid "Authorize buddy?"
 msgstr "Autorizaţi contactul?"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2484 ../pidgin/gtkaccount.c:2491
 msgid "Authorize"
 msgstr "Autorizează"
 
-#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkaccount.c:2492
 msgid "Deny"
 msgstr "Refuză"
 
-#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -317,12 +163,10 @@ msgstr ""
 "Conectaţi: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Cont: %s (%s)"
 
-#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
@@ -331,344 +175,183 @@ msgstr ""
 "\n"
 "Ultima oară: acum %s"
 
-#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Implicită"
 
-#: ../finch/gntblist.c:584
 msgid "You must provide a username for the buddy."
 msgstr "Introduceţi un nume de utilizator pentru acest contact."
 
-#: ../finch/gntblist.c:586
 msgid "You must provide a group."
 msgstr "Trebuie să furnizaţi un grup."
 
-#: ../finch/gntblist.c:588
 msgid "You must select an account."
 msgstr "Trebuie să selectaţi un cont."
 
-#: ../finch/gntblist.c:590
 msgid "The selected account is not online."
 msgstr "Contul selectat nu este conectat."
 
-#: ../finch/gntblist.c:595
 msgid "Error adding buddy"
 msgstr "Eroare la adăugarea contactului"
 
-#: ../finch/gntblist.c:622 ../libpurple/protocols/irc/irc.c:974
-#: ../libpurple/protocols/irc/msgs.c:364
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:976
-#: ../libpurple/protocols/oscar/oscar.c:2944
-#: ../libpurple/protocols/oscar/oscar.c:3961
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1210
-#: ../libpurple/protocols/silc/ops.c:1213
-#: ../libpurple/protocols/silc/ops.c:1349
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc/silc.c:1221
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtksavedstatuses.c:971
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: ../finch/gntblist.c:625
 msgid "Alias (optional)"
 msgstr "Alias (opţional)"
 
-#: ../finch/gntblist.c:628
 msgid "Add in group"
 msgstr "Adaugă în grup"
 
-#: ../finch/gntblist.c:632 ../finch/gntblist.c:726 ../finch/gntblist.c:1705
-#: ../finch/gntblist.c:2642 ../finch/gntblist.c:2698 ../finch/gntblist.c:2763
-#: ../finch/gntblist.c:2823 ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3319 ../pidgin/gtknotify.c:530
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Cont"
 
-#: ../finch/gntblist.c:638 ../finch/gntblist.c:1183
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6427
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "Adaugă contact"
 
-#: ../finch/gntblist.c:638
 msgid "Please enter buddy information."
 msgstr "Introduceţi informaţii despre contact."
 
-#: ../finch/gntblist.c:694 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Chat-uri"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:732 ../finch/gntblist.c:2637 ../finch/gntblist.c:2693
-#: ../finch/gntblist.c:2818 ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/jabber/jabber.c:994
-#: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1595
-#: ../libpurple/protocols/msnp9/msn.c:1660
-#: ../libpurple/protocols/msnp9/msn.c:1687
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:766
-#: ../pidgin/gtkroomlist.c:749
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nume"
 
-#: ../finch/gntblist.c:735 ../finch/gntblist.c:1646
-#: ../libpurple/protocols/msn/msn.c:1573
-#: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:609
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1042 ../pidgin/gtkdialogs.c:1064
-#: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:738 ../finch/gntblist.c:2963
 msgid "Group"
 msgstr "Grup"
 
-#: ../finch/gntblist.c:742 ../finch/gntblist.c:1150
 msgid "Auto-join"
 msgstr "Intră automat"
 
-#: ../finch/gntblist.c:745 ../finch/gntblist.c:1185 ../pidgin/gtkblist.c:6792
 msgid "Add Chat"
 msgstr "Adaugă un chat"
 
-#: ../finch/gntblist.c:746
 msgid "You can edit more information from the context menu later."
 msgstr "Puteţi modifica mai multe date din acest meniu contextual mai târziu."
 
-#: ../finch/gntblist.c:759 ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "Eroare la adăugarea grupului"
 
-#: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
 msgstr "Trebuie să daţi un nume grupului de adăugat."
 
-#: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
 msgstr "Există deja un grup cu acest nume."
 
-#: ../finch/gntblist.c:780 ../finch/gntblist.c:1187
-#: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5540 ../pidgin/gtkblist.c:6875
 msgid "Add Group"
 msgstr "Adaugă grup"
 
-#: ../finch/gntblist.c:780
 msgid "Enter the name of the group"
 msgstr "Introduceţi numele grupului"
 
-#: ../finch/gntblist.c:1133 ../pidgin/gtkblist.c:683
 msgid "Edit Chat"
 msgstr "Editare chat"
 
-#: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "Trebuie să actualizaţi câmpurile obligatorii."
 
-#: ../finch/gntblist.c:1134 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editare"
 
-#: ../finch/gntblist.c:1159
 msgid "Edit Settings"
 msgstr "Editare opţiuni"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Information"
 msgstr "Detalii"
 
-#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Retrieving..."
 msgstr "Descărcare..."
 
-#: ../finch/gntblist.c:1249 ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:906
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Detalii"
 
-#: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
 msgstr "Adăugare întâmpinare"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1260 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1113
-#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1669
 msgid "Send File"
 msgstr "Trimitere fişier"
 
-#: ../finch/gntblist.c:1267 ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
-msgstr "Blocat(ă)"
+msgstr "Blocat"
 
-#: ../finch/gntblist.c:1273 ../finch/gntblist.c:1662 ../finch/gntblist.c:2832
 msgid "View Log"
 msgstr "Arată înregistrările"
 
-#: ../finch/gntblist.c:1355
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduceţi noul nume pentru %s"
 
-#: ../finch/gntblist.c:1357 ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "Redenumire"
 
-#: ../finch/gntblist.c:1357
 msgid "Set Alias"
 msgstr "Alegere alias"
 
-#: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
 msgstr "Lăsaţi câmpul necompletat pentru a reseta numele."
 
-#: ../finch/gntblist.c:1472
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Eliminarea acestui contact va elimina şi identităţile subordonate"
 
-#: ../finch/gntblist.c:1480
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Eliminarea acestui grup va elimina şi contactele din grup"
 
-#: ../finch/gntblist.c:1485
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Sigur doriţi să ştergeţi %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "Confirmare eliminare"
 
-#: ../finch/gntblist.c:1493 ../finch/gntblist.c:1648 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1718 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:268
 msgid "Remove"
 msgstr "Ştergere"
 
 #. Buddy List
-#: ../finch/gntblist.c:1622 ../finch/gntblist.c:3004 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5166
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Listă de contacte"
 
-#: ../finch/gntblist.c:1653
 msgid "Place tagged"
 msgstr "Plasare etichetată"
 
-#: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
 msgstr "Schimbă eticheta"
 
 #. General
-#: ../finch/gntblist.c:1698 ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1285
-#: ../libpurple/protocols/jabber/buddy.c:2265
-#: ../libpurple/protocols/jabber/buddy.c:2457
-#: ../libpurple/protocols/jabber/jabber.c:1002
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/jabber.c:1656
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1598
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1016
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3343
 msgid "Nickname"
 msgstr "Pseudonim"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1720 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:982
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:541
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2968
-#: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3371
-#: ../pidgin/gtkblist.c:3831 ../pidgin/gtkprefs.c:2056
 msgid "Idle"
-msgstr "Inactiv(ă)"
+msgstr "Inactiv"
 
-#: ../finch/gntblist.c:1734
 msgid "On Mobile"
 msgstr "Mobil"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nou..."
 
-#: ../finch/gntblist.c:2042 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Salvat..."
 
-#: ../finch/gntblist.c:2496 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:715
 msgid "Plugins"
 msgstr "Module"
 
-#: ../finch/gntblist.c:2650 ../finch/gntblist.c:2655
 msgid "Block/Unblock"
 msgstr "Blocare/Deblocare"
 
-#: ../finch/gntblist.c:2651 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Blocare"
 
-#: ../finch/gntblist.c:2652 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Deblocare"
 
-#: ../finch/gntblist.c:2657
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
@@ -679,72 +362,29 @@ msgstr ""
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2660 ../finch/gntblist.c:2711 ../finch/gntblist.c:2837
-#: ../finch/gntcertmgr.c:89 ../finch/gntconn.c:137 ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
-#: ../libpurple/account.c:1436 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1786
-#: ../libpurple/protocols/jabber/xdata.c:402
-#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
-#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
-#: ../libpurple/protocols/msnp9/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:300
-#: ../libpurple/protocols/msnp9/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:334
-#: ../libpurple/protocols/myspace/user.c:581
-#: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6208
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc/chat.c:752
-#: ../libpurple/protocols/silc/ops.c:1306
-#: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1038
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1909
-#: ../libpurple/protocols/silc10/silc.c:741
-#: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3563
-#: ../libpurple/protocols/yahoo/yahoo.c:3574 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:767 ../pidgin/gtkdialogs.c:906
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2706 ../pidgin/gtkdialogs.c:762
 msgid "New Instant Message"
 msgstr "Mesaj nou"
 
-#: ../finch/gntblist.c:2708 ../pidgin/gtkdialogs.c:764
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "Introduceţi numele de utilizator sau aliasul persoanei pe care doriţi "
-"să o contactaţi."
+msgstr ""
+"Introduceţi numele de utilizator sau aliasul persoanei pe care doriţi să o "
+"contactaţi."
 
-#: ../finch/gntblist.c:2759
 msgid "Channel"
 msgstr "Canal"
 
-#: ../finch/gntblist.c:2771 ../pidgin/gtkblist.c:1036
 msgid "Join a Chat"
 msgstr "Intră într-un chat"
 
-#: ../finch/gntblist.c:2773
 msgid "Please enter the name of the chat you want to join."
 msgstr "Introduceţi numele chat-ului în care doriţi să intraţi."
 
-#: ../finch/gntblist.c:2775 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Intră"
 
-#: ../finch/gntblist.c:2834 ../pidgin/gtkdialogs.c:995
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
@@ -753,84 +393,64 @@ msgstr ""
 "vedeţi înregistrările."
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2882 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Opţiuni"
 
-#: ../finch/gntblist.c:2888
 msgid "Send IM..."
 msgstr "Trimitere mesaj..."
 
-#: ../finch/gntblist.c:2893
 msgid "Block/Unblock..."
 msgstr "Blocare/Deblocare..."
 
-#: ../finch/gntblist.c:2898
 msgid "Join Chat..."
 msgstr "Intră în chat..."
 
-#: ../finch/gntblist.c:2903 ../finch/gntconv.c:611
 msgid "View Log..."
 msgstr "Arată înregistrările..."
 
-#: ../finch/gntblist.c:2908
+msgid "View All Logs"
+msgstr "Arată toate înregistrările"
+
 msgid "Show"
 msgstr "Arată"
 
-#: ../finch/gntblist.c:2913
 msgid "Empty groups"
 msgstr "Grupuri fără contacte"
 
-#: ../finch/gntblist.c:2920
 msgid "Offline buddies"
 msgstr "Contacte deconectate"
 
-#: ../finch/gntblist.c:2927
 msgid "Sort"
 msgstr "Sortare"
 
-#: ../finch/gntblist.c:2932
 msgid "By Status"
 msgstr "După status"
 
-#: ../finch/gntblist.c:2937 ../pidgin/gtkblist.c:4322
 msgid "Alphabetically"
 msgstr "Alfabetic"
 
-#: ../finch/gntblist.c:2942
 msgid "By Log Size"
 msgstr "După mărimea înregistrărilor"
 
-#: ../finch/gntblist.c:2953
 msgid "Buddy"
 msgstr "Contact"
 
-#: ../finch/gntblist.c:2958 ../libpurple/protocols/oscar/oscar.c:649
-#: ../libpurple/protocols/silc/silc.c:984
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Chat"
 
-#: ../finch/gntblist.c:2968 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Grupare"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Importare certificat"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Trebuie specificat numele calculatorului"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr ""
 "Introduceţi numele calculatorului pentru care a fost eliberat certificatul"
 
-#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -839,19 +459,15 @@ msgstr ""
 "Fişierul %s nu a putut fi importat\n"
 "Asiguraţi-vă că fişierul este în format PEM şi poate fi citit.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Eroare la importarea certificatului"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Importarea certificatului X.509 a eşuat"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Selectaţi un certificat PEM"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -860,24 +476,19 @@ msgstr ""
 "Exportarea în fişierul %s a eşuat.\n"
 "Verificaţi dacă aveţi drepturi de scriere în acel director\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Eroare la exportarea certicatului"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Exportarea certificatului X.509 a eşuat"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "Exportare certificat PEM X.509"
 
-#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificat pentru %s"
 
-#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -890,57 +501,38 @@ msgstr ""
 "Amprentă SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "Certificat SSL server"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Sigur doriţi ştergerea certificatului pentru %s?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Confirmare ştergere certificat"
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Administrator de certificate"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:695
-#: ../libpurple/protocols/silc/silc.c:1223
-#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Nume calculator"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1697
-#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Detalii"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:417 ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2377
-#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Închide"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s s-a deconectat."
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -953,11 +545,9 @@ msgstr ""
 "Nu se va mai reîncerca conectarea cu acest cont. Trebuie să corectaţi "
 "eroarea şi să reactivaţi contul."
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Reactivare cont"
 
-#: ../finch/gntconn.c:156
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
@@ -965,47 +555,37 @@ msgstr ""
 "Contul a fost deconectat şi nu mai sunteţi parte în acest chat. Veţi intra "
 "din nou automat atunci când contactul se va conecta din nou."
 
-#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "Nu există o asemenea comandă."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:494
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Eroare de sintaxă: Aţi introdus un număr greşit de argumente pentru această "
 "comandă."
 
-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:500
 msgid "Your command failed for an unknown reason."
 msgstr "Comanda dată a eşuat din motive necunoscute."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:507
 msgid "That command only works in chats, not IMs."
 msgstr "Această comandă funcţionează doar în chat-uri, nu şi în discuţii."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:510
 msgid "That command only works in IMs, not chats."
 msgstr "Această comandă funcţionează doar în discuţii, nu şi în chat-uri."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:515
 msgid "That command doesn't work on this protocol."
 msgstr "Această comandă nu funcţionează în acest protocol."
 
-#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "Mesajul nu a fost trimis pentru că nu v-aţi conectat."
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3566
 #, c-format
 msgid ""
 "\n"
@@ -1014,69 +594,73 @@ msgstr ""
 "\n"
 "%s vă scrie..."
 
-#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Aţi ieşit din acest chat."
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1403
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Înregistrarea a fost activată. Mesajele viitoare din această discuţie vor fi "
 "înregistrate."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1411
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Înregistrarea a fost dezactivată. Mesajele viitoare din această discuţie nu "
 "vor fi înregistrate."
 
-#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Trimite către"
 
-#: ../finch/gntconv.c:568
+msgid "Invite message"
+msgstr "Mesaj de invitare"
+
+msgid "Invite"
+msgstr "Invită"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Introduceţi numele utilizatorului pe care doriţi să-l invitaţi.\n"
+"Puteţi adăuga un mesaj de invitare opţional."
+
 msgid "Conversation"
 msgstr "Discuţie"
 
-#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Goleşte fereastra"
 
-#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Arată marcaje de timp"
 
-#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Adăugare întâmpinare..."
 
-#: ../finch/gntconv.c:615
+msgid "Invite..."
+msgstr "Invită..."
+
 msgid "Enable Logging"
 msgstr "Activează înregistrarea"
 
-#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Activează sunetul"
 
-#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<Răspuns-Automat> "
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:970
-msgid "List of users:\n"
-msgstr "Lista utilizatorilor:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lista utilizatorului:\n"
+msgstr[1] "Lista celor %d utilizatori:\n"
+msgstr[2] "Lista celor %d utilizatori:\n"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:339
 msgid "Supported debug options are:  version"
 msgstr "Opţiunile de depanare suportate sunt:  version"
 
-#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:391
 msgid "No such command (in this context)."
 msgstr "Nu există o asemenea comandă (în acest context)."
 
-#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:394
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1084,7 +668,20 @@ msgstr ""
 "Utilizaţi „/help &lt;comandă&gt;” pentru ajutor referitor la o comandă.\n"
 "Următoarele comenzi sunt disponibile în acest context:\n"
 
-#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7932
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s nu este o clasă validă de mesaje. Consultaţi „/help msgcolor” pentru a "
+"afla clasele valide de mesaje."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s nu este o culoare validă. Consultaţi „/help msgcolor” pentru a afla "
+"culorile valide."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1092,12 +689,10 @@ msgstr ""
 "say &lt;mesaj&gt;:  Trimite un mesaj normal, ca şi cum nu s-ar fi folosit o "
 "comandă."
 
-#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7935
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acţiune&gt;:  Trimite o acţiune tip IRC către un contact sau un chat."
 
-#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7938
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1105,48 +700,49 @@ msgstr ""
 "debug &lt;opţiune&gt;:  Trimite diverse informaţii de depanare în discuţia "
 "curentă."
 
-#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7941
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Goleşte conţinutul ferestrei de discuţii."
 
-#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7947
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comandă&gt;:  Ajutor pentru o comandă specifică."
 
-#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Arată lista utilizatorilor din chat."
 
-#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Arată fereastra de module."
 
-#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Arată lista de contacte"
 
-#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Arată fereastra de editare a conturilor."
 
-#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Arată fereastra de depanare."
 
-#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: Arată fereastra cu preferinţe."
 
-#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Arată fereastra de statusuri salvate."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:967 ../pidgin/gtkconv.c:2707
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Alegeţi o "
+"culoare pentru o anumită clasă de mesaje din fereastra de discuţii.<br>    "
+"&lt;clase&gt;: receive, send, highlight, action, timestamp<br>    &lt;text/"
+"fundal&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, "
+"default<br><br>EXEMPLU:<br>    msgcolor send cyan default"
+
 msgid "Unable to open file."
 msgstr "Nu se poate deschide fişierul."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Fereastră de depanare"
 
@@ -1154,152 +750,104 @@ msgstr "Fereastră de depanare"
 #. * 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:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Goleşte"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filtru:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pauză"
 
-#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Transfer de fişiere - %d%% din %d fişiere."
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Transfer de fişiere - %d%% din un fişier."
+msgstr[1] "Transfer de fişiere - %d%% din %d fişiere."
+msgstr[2] "Transfer de fişiere - %d%% din %d de fişiere."
 
 #. Create the window.
-#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transfer de fişiere"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progres"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nume fişier"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Mărime"
 
-#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Viteză"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Rămas"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:809
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:972
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msnp9/msn.c:540
-#: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:822
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:2756
-#: ../libpurple/protocols/oscar/oscar.c:3819
-#: ../libpurple/protocols/sametime/sametime.c:3315
-#: ../libpurple/protocols/sametime/sametime.c:4206
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3415
-#: ../pidgin/gtkblist.c:3429 ../pidgin/gtkblist.c:3431
-#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Închide fereastra la terminarea tuturor transferurilor"
 
-#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Şterge transferurile terminate"
 
-#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Stop"
 
-#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Aştept începerea transferului"
 
-#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Oprit"
 
-#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Eşuat"
 
-#: ../finch/gntft.c:436 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:447
 msgid "Sent"
 msgstr "Trimis"
 
-#: ../finch/gntft.c:447
 msgid "Received"
 msgstr "Primit"
 
-#: ../finch/gntft.c:448 ../pidgin/gtkft.c:160 ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "Terminat"
 
-#: ../finch/gntft.c:450
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Fişierul a fost salvat ca %s."
 
-#: ../finch/gntft.c:457
 msgid "Sending"
 msgstr "Se trimite"
 
-#: ../finch/gntft.c:457
 msgid "Receiving"
 msgstr "Se primeşte"
 
-#: ../finch/gntlog.c:184
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Discuţii în %s din %s"
 
-#: ../finch/gntlog.c:187
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Discuţii cu %s în %s"
 
-#: ../finch/gntlog.c:230 ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:270 ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
 "Evenimentele de sistem vor fi înregistrate doar dacă opţiunea „Înregistrează "
-"toate schimbările de status în înregistrările sistem” este activată."
+"toate schimbările de status în înregistrările de sistem” este activată."
 
-#: ../finch/gntlog.c:274 ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -1307,58 +855,48 @@ msgstr ""
 "Mesajele vor fi înregistrate doar dacă opţiunea „Înregistrează toate "
 "mesajele” este activată."
 
-#: ../finch/gntlog.c:277 ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chat-urile vor fi înregistrate doar dacă opţiunea „Înregistrează toate chat-"
 "urile” este activată."
 
-#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "Nu s-au găsit nici un fel de înregistrări."
 
-#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Mărime totală înregistrări:"
 
 #. Search box *********
-#: ../finch/gntlog.c:338
 msgid "Scroll/Search: "
 msgstr "Derulare/Căutare:"
 
-#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Discuţii în %s"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:724
-#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Discuţii cu %s"
 
-#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "All Conversations"
+msgstr "Toate discuţiile"
+
 msgid "System Log"
-msgstr "Înregistrări sistem"
+msgstr "Înregistrări de sistem"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Mailuri"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Aveţi mail nou!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:537
 msgid "Sender"
 msgstr "Expeditor"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:544
 msgid "Subject"
 msgstr "Subiect"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -1366,53 +904,37 @@ msgstr[0] "%s (%s) are un mesaj nou."
 msgstr[1] "%s (%s) are %d mesaje noi."
 msgstr[2] "%s (%s) are %d de mesaje noi."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
 msgstr "Mail nou"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:984
 #, c-format
 msgid "Info for %s"
 msgstr "Detalii pentru %s"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:985
 msgid "Buddy Information"
 msgstr "Detalii contact"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuă"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1658
 msgid "IM"
 msgstr "Mesaj"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3525
-msgid "Invite"
-msgstr "Invită"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(nimic)"
 
-#: ../finch/gntnotify.c:426
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "EROARE"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "activarea modulului a eşuat"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "dezactivarea modului a eşuat"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1429,42 +951,33 @@ msgstr ""
 "Adresă Internet: %s\n"
 "Nume fişier: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Modulul trebuie încărcat înainte de a-l putea configura."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Nu există preferinţe pentru acest modul."
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Au apărut erori la încărcarea modulului"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "Fişierul selectat nu este un modul valid."
 
-#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "Deschideţi fereastra de depanare şi încercaţi din nou să localizaţi mesajul "
 "de eroare."
 
-#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Selectaţi modulul de instalat"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Puteţi (dez)activa module din lista următoare."
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Instalare modul..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Configurare modul"
 
@@ -1473,387 +986,290 @@ msgstr "Configurare modul"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2180
 msgid "Preferences"
 msgstr "Preferinţe"
 
-#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Precizaţi un contact pentru întâmpinare."
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Întâmpinare nouă"
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Editare întâmpinare"
 
-#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Întâmpinare pentru"
 
 #. Account:
-#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Cont:"
 
-#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Nume contact:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Întâmpinare la..."
 
-#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Autentificare"
 
-#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "Deconectare"
 
-#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "Intrarea în absenţă"
 
-#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "Întoarcerea din absenţă"
 
-#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "Intrarea în inactivitate"
 
-#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "Revenirea din inactivitate"
 
-#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "Tastarea unui mesaj nou"
 
-#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Pauză în timpul tastării"
 
-#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "Oprirea din tastare"
 
-#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "Trimiterea unui mesaj"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Acţiune"
 
-#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Deschide o discuţie"
 
-#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Deschide o fereastră de notificare"
 
-#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Trimite un mesaj"
 
-#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Execută o comandă"
 
-#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Redă un sunet"
 
-#: ../finch/gntpounce.c:460
 msgid "Pounce only when my status is not Available"
 msgstr "Întâmpinare doar în starea de indisponibilitate"
 
-#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Recurentă"
 
-#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Nu se poate crea întâmpinarea"
 
-#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Nu aveţi nici măcar un cont creat."
 
-#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Trebuie să creaţi un cont înainte de a putea crea o întâmpinare."
 
-#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Sigur doriţi să ştergeţi întâmpinarea la %s pentru %s?"
 
-#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Întâmpinări contacte"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s a început să vă scrie (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s s-a oprit în timp ce vă scria (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s s-a autentificat (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s s-a întors din inactivitate (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s s-a întors din absenţă (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a încetat să vă scrie (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s s-a deconectat (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s a intrat în inactivitate (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s a intrat în absenţă (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s v-a trimis un mesaj. (%s)"
 
-#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Eveniment necunoscut în întâmpinare. Raportaţi această eroare."
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "În funcţie de tastare"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2061
 msgid "From last sent message"
 msgstr "Începând cu ultimul mesaj trimis"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:948 ../pidgin/gtkprefs.c:956
-#: ../pidgin/gtkprefs.c:2060 ../pidgin/gtkprefs.c:2074
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Niciodată"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Arată inactivitatea"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Arată contactele deconectate"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notifică contactele când le scriu"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Format înregistrări"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Înregistrează mesajele"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Înregistrează chat-urile"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Înregistrează schimbările de status"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Raportează inactivitatea"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Schimbă statusul în inactivitate"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minute înaintea schimbării statusului:"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Schimbă statusul în:"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1046 ../pidgin/gtkprefs.c:2147
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Discuţii"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1617 ../pidgin/gtkprefs.c:2158
 msgid "Logging"
 msgstr "Înregistrare"
 
-#: ../finch/gntrequest.c:381
 msgid "You must fill all the required fields."
 msgstr "E necesară completarea tuturor câmpurilor cerute."
 
-#: ../finch/gntrequest.c:382
 msgid "The required fields are underlined."
 msgstr "Câmpurile cerute sunt subliniate."
 
-#: ../finch/gntrequest.c:640
 msgid "Not implemented yet."
 msgstr "Neimplementat încă."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "Salvează fişierul..."
 
-#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1554
-#: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "Deschide fişierul..."
 
-#: ../finch/gntrequest.c:762
 msgid "Choose Location..."
 msgstr "Alegeţi un loc..."
 
-#: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Apăsaţi ENTER pentru a găsi mai multe camere în această categorie."
 
-#: ../finch/gntroomlist.c:273
 msgid "Get"
 msgstr "Obţinere"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "Listă camere de chat"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Un contact se autentifică"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Un contact se deconectează"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Aţi primit un mesaj"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Aţi primit un mesaj ce începe o discuţie"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Aţi trimis un mesaj"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Cineva intră în chat"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Cineva iese din chat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Spuneţi ceva într-un chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Alţii spun ceva într-un chat"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your username in chat"
 msgstr "Cineva v-a scris numele de utilizator într-un chat"
 
-#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "Eroare GStreamer"
 
-#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "Iniţializarea GStreamer a eşuat."
 
-#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1741
-#: ../pidgin/gtkprefs.c:1830 ../pidgin/gtkprefs.c:2003
 msgid "(default)"
 msgstr "(implicit)"
 
-#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "Selectaţi un fişier de sunet..."
 
-#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "Preferinţe sunet"
 
-#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1868
 msgid "Automatic"
 msgstr "Automat"
 
-#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "Bip în consolă"
 
-#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1872
 msgid "Command"
 msgstr "Comandă"
 
-#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "Fără sunete"
 
-#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1863
 msgid "Sound Method"
 msgstr "Sistemul de sunet"
 
-#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "Sistem:"
 
-#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1863,82 +1279,56 @@ msgstr ""
 "(%s pentru numele fişierului)"
 
 #. Sound options
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1894
 msgid "Sound Options"
 msgstr "Opţiuni sunet"
 
-#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "Utilizează sunete când fereastra de discuţii are focus"
 
-#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:946 ../pidgin/gtkprefs.c:958
-#: ../pidgin/gtkprefs.c:1901 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Întotdeauna"
 
-#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1899
 msgid "Only when available"
 msgstr "Doar când sunt disponibil(ă)"
 
-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1900
 msgid "Only when not available"
 msgstr "Doar când nu sunt disponibil(ă)"
 
-#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1929
 msgid "Sound Events"
 msgstr "Evenimente sonore"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1988
 msgid "Event"
 msgstr "Eveniment"
 
-#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "Fişier"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:2007
 msgid "Test"
 msgstr "Testare"
 
-#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:2011
 msgid "Reset"
 msgstr "Anulare"
 
-#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:2015
 msgid "Choose..."
 msgstr "Alegeţi..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Sigur doriţi să ştergeţi %s?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Ştergere status"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Statusuri salvate"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1397
-#: ../libpurple/protocols/msn/msn.c:747
-#: ../libpurple/protocols/myspace/myspace.c:171
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titlu"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tip"
 
@@ -1950,133 +1340,72 @@ msgstr "Tip"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:293
-#: ../libpurple/protocols/bonjour/bonjour.c:300
-#: ../libpurple/protocols/bonjour/bonjour.c:383
-#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/jabber/jabber.c:1667
-#: ../libpurple/protocols/jabber/jabber.c:1683
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
-#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2856
-#: ../libpurple/protocols/novell/novell.c:2959
-#: ../libpurple/protocols/novell/novell.c:2965
-#: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5669
-#: ../libpurple/protocols/oscar/oscar.c:5887
-#: ../libpurple/protocols/oscar/oscar.c:5901
-#: ../libpurple/protocols/oscar/oscar.c:5917
-#: ../libpurple/protocols/oscar/oscar.c:5924
-#: ../libpurple/protocols/oscar/oscar.c:5931
-#: ../libpurple/protocols/sametime/sametime.c:3338
-#: ../libpurple/protocols/sametime/sametime.c:3344
-#: ../libpurple/protocols/sametime/sametime.c:3350
-#: ../libpurple/protocols/sametime/sametime.c:3429
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3817
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
-#: ../libpurple/protocols/zephyr/zephyr.c:2352
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Mesaj"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Activare"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Titlu invalid"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Vă rugăm să introduceţi un titlu pentru status."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Titlu duplicat"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Vă·rugăm să introduceţi un titlu diferit pentru status."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Mesaj:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Editare status"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Activează un status diferit pentru următoarele conturi:"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Salvează şi activează"
 
-#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Certificate"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2149
 msgid "Sounds"
 msgstr "Sunete"
 
-#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Statusuri"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Au apărut erori la încărcarea modulului."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Nu s-a găsit un ecran X"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Nu s-a găsit o fereastră"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
 "Acest modul nu poate fi încărcat deoarece nu a fost compilat cu suport X11."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Modul clipboard"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -2084,77 +1413,60 @@ msgstr ""
 "Când conţinutul clipboard-ului gnt se schimbă, acesta este făcut disponibil "
 "şi altor aplicaţii X, dacă e posibil."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s s-a conectat"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s s-a deconectat"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s v-a trimis un mesaj"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s v-a scris pseudonimul în %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s a trimis un mesaj pe %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Contactul se (de)conectează"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Primiţi un mesaj"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Cineva scrie ceva într-un chat"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Cineva v-a scris numele într-un chat"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notificare animată atunci când:"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Fă şi zgomot!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Schimbă starea fereastrei terminalului în URGENT"
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Modul de notificare animată"
 
-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:132
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<h1>Discuţie cu %s în %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:159
 msgid "History Plugin Requires Logging"
 msgstr "Modulul „Istoric” necesită autentificare"
 
-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:160
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2167,15 +1479,12 @@ msgstr ""
 "Înregistrarea mesajelor pentru discuţii şi/sau chat-uri va activa istoricul "
 "pentru mesajele respective."
 
-#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:203
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Arată discuţiile recent înregistrate în noile discuţii."
 
-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:204
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2183,168 +1492,113 @@ msgstr ""
 "La iniţierea unei noi discuţii acest modul va insera ultima discuţie în "
 "fereastra curentă."
 
-#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+#, c-format
 msgid "Online"
-msgstr "Conectat(ă)"
-
-#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2082
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:155
-#: ../pidgin/gtkblist.c:3415 ../pidgin/gtkblist.c:3807
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1090
+msgstr "Conectat"
+
 msgid "Offline"
-msgstr "Deconectat(ă)"
+msgstr "Deconectat"
 
-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3451
 msgid "Online Buddies"
 msgstr "Contacte conectate"
 
-#: ../finch/plugins/grouping.c:117
 msgid "Offline Buddies"
 msgstr "Contacte deconectate"
 
-#: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
 msgstr "Conectate/Deconectate"
 
-#: ../finch/plugins/grouping.c:168
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr "Fără grupare"
 
-#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "Oferă opţiuni alternative de grupare a listei de contacte."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Caută după un text în înregistrări."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastLog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Modul Lastlog."
 
-#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "conturi"
 
-#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:204
-#: ../libpurple/protocols/silc/silc.c:473
 msgid "Password is required to sign on."
 msgstr "Se cere parola pentru autentificare."
 
-#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduceţi parola pentru %s (%s)"
 
-#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "Salvare parolă"
 
-#: ../libpurple/account.c:1144 ../libpurple/connection.c:118
-#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Lipseşte modulul de protocol pentru %s"
 
-#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Eroare la conectare"
 
-#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1739
 msgid "New passwords do not match."
 msgstr "Noua parolă a fost confirmată greşit."
 
-#: ../libpurple/account.c:1370
 msgid "Fill out all fields completely."
 msgstr "E necesară completarea tuturor câmpurilor."
 
-#: ../libpurple/account.c:1402
 msgid "Original password"
 msgstr "Vechea parolă"
 
-#: ../libpurple/account.c:1410
 msgid "New password"
 msgstr "Noua parolă"
 
-#: ../libpurple/account.c:1418
 msgid "New password (again)"
 msgstr "Confirmare parolă nouă"
 
-#: ../libpurple/account.c:1425
 #, c-format
 msgid "Change password for %s"
 msgstr "Schimbare parolă pentru %s"
 
-#: ../libpurple/account.c:1433
 msgid "Please enter your current password and your new password."
 msgstr "Introduceţi vechea parolă pentru a o schimba cu una nouă."
 
-#: ../libpurple/account.c:1464
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificare detalii pentru %s"
 
-#: ../libpurple/account.c:1467 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Detalii utilizator"
 
-#: ../libpurple/account.c:1938 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:813
-#: ../libpurple/protocols/jabber/buddy.c:2078
-#: ../libpurple/protocols/jabber/buddy.c:2095
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3442 ../pidgin/gtkblist.c:6317
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Contacte"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "listă de contacte"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(NU SE POTRIVEŞTE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s a prezentat următorul certificat pentru unică folosinţă:"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2354,53 +1608,40 @@ msgstr ""
 "Amprentă SHA1: %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Verificare certificat de unică folosinţă"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Autorităţi de certificare"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "Cache de certificate SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Acceptaţi certificatul pentru %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "Verificare certificat SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Acceptare"
 
-#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Respingere"
 
-#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Vizualizare certificat..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2409,7 +1650,6 @@ msgstr ""
 "Certificatul prezentat de „%s” este semnat în nume propriu. Nu poate fi "
 "verificat automat."
 
-#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Lanţul de certificare prezentat de %s nu este valid."
@@ -2419,16 +1659,13 @@ msgstr "Lanţul de certificare prezentat de %s nu este valid."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "Eroare în certificatul SSL"
 
-#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Lanţ de certificare invalid"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2437,14 +1674,12 @@ msgstr ""
 "fi validat."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 "Acest certificat pretinde că a fost creat cu un certificat root necunoscut "
 "pentru Pidgin."
 
-#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2454,7 +1689,6 @@ msgstr ""
 "Lanţul de certificare prezentat de %s nu are o semnătură digitală validă de "
 "la autoritatea de certificare cu care pretinde că a fost creat."
 
-#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "Semnătura invalidă de la autoritatea de certificare"
 
@@ -2462,7 +1696,6 @@ msgstr "Semnătura invalidă de la autoritatea de certificare"
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1434
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2473,7 +1706,6 @@ msgstr ""
 "conectaţi."
 
 #. Make messages
-#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2491,126 +1723,93 @@ msgstr ""
 "Dată de expirare: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Detalii certificat"
 
-#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Eroare la înregistrare"
 
-#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Eroare la ştergerea înregistrării"
 
-#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s s-a autentificat"
 
-#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s s-a deconectat"
 
-#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2398
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:329
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Nu s-a putut trimite mesajul: Mesajul este prea mare."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nu s-a putut trimite mesajul către %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Mesaj în absenţă prea mare."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:296
-#: ../libpurple/protocols/bonjour/jabber.c:339
 msgid "Unable to send message."
 msgstr "Nu se poate trimite mesajul."
 
-#: ../libpurple/conversation.c:1231
 msgid "Send Message"
 msgstr "Trimitere mesaj"
 
-#: ../libpurple/conversation.c:1234
 msgid "_Send Message"
 msgstr "Trimite mesa_jul"
 
-#: ../libpurple/conversation.c:1640
 #, c-format
 msgid "%s entered the room."
 msgstr "%s a intrat în chat."
 
-#: ../libpurple/conversation.c:1643
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] a intrat în chat."
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sunteţi cunoscut acum ca %s"
 
-#: ../libpurple/conversation.c:1773
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s este acum %s"
 
-#: ../libpurple/conversation.c:1848
 #, c-format
 msgid "%s left the room."
 msgstr "%s a ieşit din chat."
 
-#: ../libpurple/conversation.c:1851
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a ieşit din chat (%s)."
 
-#: ../libpurple/dbus-server.c:586
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Conectare eşuată: %s"
 
-#: ../libpurple/dbus-server.c:598
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Nu s-a putut obţine un nume: %s"
 
-#: ../libpurple/dbus-server.c:612
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Nu s-a putut obţine un nume „serv”: %s"
 
-#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Serverul D-BUS Purple nu este pornit din următoarele motive:"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Fără nume"
 
-#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "Nu s-a putut crea un nou proces „resolver”\n"
 
-#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "Nu s-a putut trimite cererea către procesul „resolver”\n"
 
-#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2619,13 +1818,10 @@ msgstr ""
 "Eroare la rezolvarea %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
-#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Eroare la rezolvarea %s: %d"
 
-#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2634,20 +1830,17 @@ msgstr ""
 "Eroare la citirea de la procesul „resolver”:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:599
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF la citirea de la procesul „resolver”"
 
-#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Eroare la crearea firului de execuţie: %s"
 
-#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Motiv necunoscut"
 
-#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2656,7 +1849,6 @@ msgstr ""
 "Eroare la citirea %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2665,7 +1857,6 @@ msgstr ""
 "Eroare la scrierea %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2674,39 +1865,31 @@ msgstr ""
 "Eroare la accesarea %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "Nu se poate scrie în director."
 
-#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nu se poate trimite un fişier de 0 octeţi."
 
-#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Nu se poate trimite un director."
 
-#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nu este un fişier obişnuit. Nu va fi suprascris.\n"
 
-#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s doreşte să vă trimită fişierul %s (%s)"
 
-#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s doreşte să vă trimită un fişier"
 
-#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Acceptaţi transferul de fişiere iniţiat de %s?"
 
-#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2717,133 +1900,105 @@ msgstr ""
 "Serverul: %s\n"
 "Portul: %d"
 
-#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s se oferă să trimită fişierul %s"
 
-#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s nu este un nume de fişier valid.\n"
 
-#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se oferă trimiterea %s la %s"
 
-#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Se iniţiază transferul fişierului %s de la %s"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferul fişierului %s s-a terminat"
 
-#: ../libpurple/ft.c:703
+#, c-format
 msgid "File transfer complete"
 msgstr "Transferul fişierelor s-a terminat"
 
-#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Aţi întrerupt transferul fişierului %s"
 
-#: ../libpurple/ft.c:1143
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Transferul fişierului a fost întrerupt"
 
-#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s a întrerupt transferul fişierului %s"
 
-#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s a întrerupt transferul fişierului"
 
-#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Transferul fişierului către %s a eşuat."
 
-#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Transferul fişierului de la %s a eşuat."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Porneşte comanda într-un terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „aim” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „gg” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „icq” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „irc” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „msnim” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „sip” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „xmpp” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Comanda utilizată pentru URL-urile „ymsgr” în caz de activare"
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Comanda asociată URL-urile „aim”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Comanda asociată URL-urile „gg”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Comanda asociată URL-urile „icq”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Comanda asociată URL-urile „irc”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Comanda asociată URL-urile „msnim”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Comanda asociată URL-urile „sip”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Comanda asociată URL-urile „xmpp”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Comanda asociată URL-urile „ymsgr”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -2851,7 +2006,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „aim”."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -2859,7 +2013,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „gg”."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -2867,7 +2020,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „icq”."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -2875,7 +2027,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „irc”."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -2883,7 +2034,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „msnim”."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -2891,7 +2041,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „sip”."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -2899,7 +2048,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „xmpp”."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -2907,7 +2055,6 @@ msgstr ""
 "Adevărat când comanda specificată în cheia „command” ar trebui să fie "
 "asociată URL-urilor „ymsgr”."
 
-#: ../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."
@@ -2915,73 +2062,58 @@ msgstr ""
 "Adevărat când comanda asociată acestui tip de URL ar trebui pornită într-un "
 "terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „aim”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „gg”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „icq”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „irc”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „msnim”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „sip”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „xmpp”"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 "Specifică dacă această comandă ar trebui să fie asociată URL-urilor „ymsgr”"
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Nu există o funcţie de citire a înregistrărilor</"
 "font></b>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Text simplu"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Vechiul format simplificat"
 
-#: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
 msgstr "Înregistrarea acestei discuţii a eşuat."
 
-#: ../libpurple/log.c:1293
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1377
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2990,7 +2122,6 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;Răspuns "
 "automat&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1379
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2999,44 +2130,38 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;Răspuns "
 "automat&gt;>:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Nu găsesc calea înregistrărilor!</b></font>"
 
-#: ../libpurple/log.c:1449 ../libpurple/log.c:1579
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Nu s-a putut citi fişierul: %s</b></font>"
 
-#: ../libpurple/log.c:1511
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Răspuns-Automat>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Utilizaţi %s, dar acest modul necesită %s."
 
-#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Acest modul nu are un ID definit."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Nepotrivire număr magic modul: %d (necesită %d)"
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Nepotrivire versiune ABI %d.%d.x (necesită %d.%d.x)"
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
-msgstr "Modulul nu implementează toate funcţiile necesare"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Modulul nu implementează toate funcţiile necesare (list_icon, login şi close)"
 
-#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -3044,88 +2169,62 @@ msgid ""
 msgstr ""
 "Modulul %s cerut nu a fost găsit. Instalaţi acest modul şi încercaţi din nou."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Acest modul nu a putut fi încărcat."
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Modulul cerut %s cerut nu a putut fi încărcat."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Acest modul nu a putut fi încărcat."
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s necesită %s, dar descărcărea sa a eşuat."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Auto-acceptare"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 "Permite acceptarea automată a transferurilor de fişiere iniţiate de anumiţi "
 "utilizatori."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 "Transferul acceptat automat al fişierului „%s” de la „%s” s-a terminat."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Acceptare automată finalizată"
 
-#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Când %s trimite o cerere de transfer de fişiere"
 
-#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Preferinţe acceptare automată"
 
-#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Salvează"
 
-#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2338
-#: ../libpurple/protocols/oscar/oscar.c:6001
-#: ../libpurple/protocols/oscar/oscar.c:6056
-#: ../libpurple/protocols/oscar/oscar.c:6283
-#: ../libpurple/protocols/oscar/oscar.c:6353 ../libpurple/request.h:1401
-#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Renunţă"
 
-#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Întreabă"
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Acceptă automat"
 
-#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Refuză automat"
 
-#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Acceptare fişiere..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3133,12 +2232,10 @@ msgstr ""
 "Cale pentru salvarea fişierelor:\n"
 "(Precizaţi calea completă)"
 
-#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Refuză automat pentru utilizatorii ce nu fac parte din lista de contacte"
 
-#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3146,18 +2243,15 @@ msgstr ""
 "Notifică printr-o fereastră popup când se finalizează un transfer de\n"
 "fişiere acceptat automat şi nu există o discuţie deschisă cu expeditorul"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msn/msn.c:1860
-#: ../libpurple/protocols/msnp9/msn.c:1671
-#: ../libpurple/protocols/msnp9/msn.c:1701
+msgid "Create a new directory for each user"
+msgstr "Creează un nou director pentru fiecare utilizator"
+
 msgid "Notes"
 msgstr "Notiţe"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Introduceţi notiţele despre contactul selectat..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Editare notiţe..."
 
@@ -3169,18 +2263,15 @@ msgstr "Editare notiţe..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Notiţe asociate contactelor"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Permite asocierea de notiţe contactelor din listă."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Adaugă opţiunea de stocare de notiţe pentru contactele din lista de contacte."
@@ -3191,7 +2282,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Test cifru"
 
@@ -3199,7 +2289,6 @@ msgstr "Test cifru"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Testare cifruri incluse în libpurple."
 
@@ -3209,7 +2298,6 @@ msgstr "Testare cifruri incluse în libpurple."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Exemplu de modul DBus"
 
@@ -3217,8 +2305,6 @@ msgstr "Exemplu de modul DBus"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Exemplu de modul DBus"
 
@@ -3228,7 +2314,6 @@ msgstr "Exemplu de modul DBus"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Fişier de control"
 
@@ -3236,50 +2321,38 @@ msgstr "Fişier de control"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Permite controlul prin introducerea unor comenzi într-un fişier."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minute"
 
 #. 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
 msgid "I'dle Mak'er"
 msgstr "Falsificator de inactivitate"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Opţiuni de inactivitate falsă"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Schimbă"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Niciunul dintre conturi nu este inactiv."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Anulează inactivitatea asociată contului"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Anulează"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Utilizează inactivitatea falsă pentru toate conturile"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Utilizează inactivitatea falsă pentru toate conturile inactive"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Permite introducerea manuală a unei false perioade de inactivitate."
 
@@ -3289,19 +2362,16 @@ msgstr "Permite introducerea manuală a unei false perioade de inactivitate."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Client de test IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Modul de test pentru suport IPC, ca client."
 
 #. *  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."
@@ -3315,32 +2385,26 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Server de test IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Modul de test pentru suport IPC, ca server."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Modul de test pentru suportul IPC, ca server. Acesta primeşte comenzile IPC."
 
-#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "Configurare ascundere mesaje intrare/ieşire"
 
-#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "Mărime minimă cameră"
 
-#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Timeout de inactivitate (în minute)"
 
@@ -3350,19 +2414,16 @@ msgstr "Timeout de inactivitate (în minute)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "Ascundere mesaje de intrare/ieşire"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "Ascunde mesajele exhaustive de intrare şi ieşire"
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3374,34 +2435,25 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Utilizatorul este deconectat."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Răspuns automat trimis:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:84
 #, c-format
 msgid "%s has signed off."
 msgstr "%s s-a deconectat."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Se poate să nu fi ajuns unul sau mai multe mesaje."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Aţi fost deconectat de la server."
 
-#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3409,85 +2461,65 @@ msgstr ""
 "Sunteţi momentan deconectat(ă). Nu veţi mai primi mesaje până la următoarea "
 "autentificare."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Mesajul nu a putut fi trimis pentru că a depăşit mărimea maximă."
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Mesajul nu a putut fi trimis."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2855
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2860
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2864
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2869
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2873
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2877
 msgid "Trillian"
 msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2881
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2837
 msgid "General Log Reading Configuration"
 msgstr "Configurare citire înregistrări generale"
 
-#: ../libpurple/plugins/log_reader.c:2841
 msgid "Fast size calculations"
 msgstr "Calcul rapid mărime"
 
-#: ../libpurple/plugins/log_reader.c:2845
 msgid "Use name heuristics"
 msgstr "Euristică pentru nume"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2851
 msgid "Log Directory"
 msgstr "Director înregistrări"
 
@@ -3497,19 +2529,16 @@ msgstr "Director înregistrări"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2910
 msgid "Log Reader"
 msgstr "Citire înregistrări"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2914
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Importă înregistrările altor clienţi IM în Gaim."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2918
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3523,20 +2552,15 @@ msgstr ""
 "\n"
 "Atenţie! Acest modul este în stadiu alpha şi e instabil."
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Încărcare module Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Încarcă module .NET cu Mono."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "Adaugă un rând extra în discuţii"
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr "Adaugă un rând extra în chat-uri"
 
@@ -3549,18 +2573,15 @@ msgstr "Adaugă un rând extra în chat-uri"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Rânduri extra"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Rând extra înainte de afişarea unui mesaj."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
@@ -3568,15 +2589,12 @@ msgstr ""
 "Introduce un rând nou înaintea mesajelor astfel încât restul mesajului să "
 "apară dedesubtul numelui de utilizator în fereastra de discuţii."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Emulare mesaje offline"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator deconectat."
 
-#: ../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."
@@ -3584,7 +2602,6 @@ msgstr ""
 "Restul de mesaje vor fi salvate ca întâmpinare. Puteţi apoi edita sau şterge "
 "întâmpinarea din fereastra de editare a întâmpinărilor."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -3594,50 +2611,22 @@ msgstr ""
 "întâmpinare astfel încât acestea să fie trimise automat când „%s” se va "
 "conecta din nou?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mesaje offline"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Puteţi edita ori şterge întâmpinarea din fereastra „Întâmpinări contacte"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Da"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:675
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1930
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Nu"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Salvează mesajele offline într-o întâmpinare"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Nu întreba. Salvează într-o întâmpinare întotdeauna."
 
@@ -3647,26 +2636,21 @@ msgstr "Nu întreba. Salvează într-o întâmpinare întotdeauna."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Încărcare module Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Permite încărcarea de module Perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Modul paranormal"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Permite prevederea discuţiilor iniţiate de interlocutori"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -3674,23 +2658,18 @@ msgstr ""
 "Deschide ferestrele sau taburile de discuţii înainte ca interlocutorii să vă "
 "trimită ce începuseră să scrie. Merge cu AIM, ICQ, XMPP, Sametime şi Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Vine, vine, calcă totul în picioare..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Activează doar pentru cei din lista de contacte"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Dezactivare în absenţă"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Arată un mesaj de notificare în discuţii"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Adu deasupra discuţiile cu mesaje paranormale"
 
@@ -3700,7 +2679,6 @@ msgstr "Adu deasupra discuţiile cu mesaje paranormale"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Test semnale"
 
@@ -3708,8 +2686,6 @@ msgstr "Test semnale"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Testează toate semnalele pentru a verifica funcţionarea corectă."
 
@@ -3719,7 +2695,6 @@ msgstr "Testează toate semnalele pentru a verifica funcţionarea corectă."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Modul simplu"
 
@@ -3727,13 +2702,10 @@ msgstr "Modul simplu"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Testează dacă lucrurile merg cum trebuie."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Certificate X.509"
 
@@ -3743,7 +2715,6 @@ msgstr "Certificate X.509"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3751,8 +2722,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "Oferă suport SSL prin bibliotecile GNUTLS."
 
@@ -3762,7 +2731,6 @@ msgstr "Oferă suport SSL prin bibliotecile GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3770,8 +2738,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Oferă suport SSL prin bibliotecile Mozilla NSS."
 
@@ -3781,7 +2747,6 @@ msgstr "Oferă suport SSL prin bibliotecile Mozilla NSS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3789,48 +2754,38 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Oferă suport SSL prin bibliotecile aferente."
 
-#: ../libpurple/plugins/statenotify.c:54
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s a revenit din absenţă."
 
-#: ../libpurple/plugins/statenotify.c:56
 #, c-format
 msgid "%s has gone away."
 msgstr "%s a intrat în absenţă."
 
-#: ../libpurple/plugins/statenotify.c:66
 #, c-format
 msgid "%s has become idle."
 msgstr "%s a intrat în inactivitate."
 
-#: ../libpurple/plugins/statenotify.c:68
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s a revenit din inactivitate."
 
-#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s has signed on."
 msgstr "%s s-a autentificat."
 
-#: ../libpurple/plugins/statenotify.c:95
 msgid "Notify When"
 msgstr "Notifică la:"
 
-#: ../libpurple/plugins/statenotify.c:98
 msgid "Buddy Goes _Away"
 msgstr "Intrarea în _absenţă"
 
-#: ../libpurple/plugins/statenotify.c:101
 msgid "Buddy Goes _Idle"
 msgstr "Intrarea în _inactivitate"
 
-#: ../libpurple/plugins/statenotify.c:104
 msgid "Buddy _Signs On/Off"
 msgstr "(_De)Autentificarea unui contact"
 
@@ -3840,7 +2795,6 @@ msgstr "(_De)Autentificarea unui contact"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:152
 msgid "Buddy State Notification"
 msgstr "Notificări stări contacte"
 
@@ -3848,23 +2802,18 @@ msgstr "Notificări stări contacte"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:155
-#: ../libpurple/plugins/statenotify.c:158
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
 "Notifică în fereastra de discuţii la schimbarea statusului unui contact."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Încărcare module Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Permite încărcarea de module Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3872,60 +2821,34 @@ msgstr ""
 "Nu s-a detectat o instalare ActiveTCL. Dacă doriţi să utilizaţi module TCL, "
 "instalaţi ActiveTCL de la http://www.activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:102
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
 "Nu s-a găsit Apple Bonjour pentru Windows, pentru detalii consultaţi: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging ."
+"d.pidgin.im/BonjourWindows ."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:121
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "Ascultarea interfaţei de reţea pentru noi conexiuni IM a eşuat\n"
+msgstr ""
+"Utilizarea interfaţei de reţea pentru a detecta noi conexiuni IM a eşuat\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Nu se poate deschide o conexiune cu serverul local mDNS. E pornit?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:393
-#: ../libpurple/protocols/bonjour/bonjour.c:699
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "Prenume"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:395
-#: ../libpurple/protocols/bonjour/bonjour.c:702
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "Nume de familie"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:399
-#: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/jabber/buddy.c:1373
-#: ../libpurple/protocols/jabber/buddy.c:2267
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "Email"
 msgstr "Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:402
-#: ../libpurple/protocols/bonjour/bonjour.c:708
 msgid "AIM Account"
 msgstr "Cont AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:405
-#: ../libpurple/protocols/bonjour/bonjour.c:711
 msgid "XMPP Account"
 msgstr "Cont XMPP"
 
@@ -3939,395 +2862,253 @@ msgstr "Cont XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:509
-#: ../libpurple/protocols/bonjour/bonjour.c:511
 msgid "Bonjour Protocol Plugin"
 msgstr "Modul de protocol Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:652
 msgid "Purple Person"
 msgstr "Persoană Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:431
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s a încheiat discuţia."
 
-#: ../libpurple/protocols/bonjour/jabber.c:481
-#: ../libpurple/protocols/bonjour/jabber.c:546
-#: ../libpurple/protocols/bonjour/jabber.c:591
-#: ../libpurple/protocols/bonjour/jabber.c:768
-#: ../libpurple/protocols/bonjour/jabber.c:786
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nu s-a putut trimite mesajul, discuţia nu a putut fi iniţiată."
 
-#: ../libpurple/protocols/bonjour/jabber.c:685
 msgid "Cannot open socket"
 msgstr "Nu s-a putut deschide un socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:695
-msgid "Error setting socket options"
-msgstr "Eroare la introducerea opţiunilor socket-ului"
-
-#: ../libpurple/protocols/bonjour/jabber.c:721
 msgid "Could not bind socket to port"
 msgstr "Nu se poate face bind pentru socket pe port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:731
 msgid "Could not listen on socket"
 msgstr "Nu se poate asculta pe socket"
 
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Eroare de comunicare locală cu mDNSResponder."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "Opţiuni proxy invalide"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1908
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 "Numele serverului sau portul precizat pentru tipul proxy-ului sunt invalide."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Eroare verificare"
 
-#: ../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 "Nu se poate obţine o verificare.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Salvează lista de contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Lista de contacte e goală, nu s-a scris nimic în fişier."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Lista contactelor a fost salvată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "Nu s-a putut scrie lista de contacte pentru %s în %s"
 
-#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Nu s-a putut încărca lista de contacte"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Încarcă lista de contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Lista de contacte a fost încărcată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Salvează lista de contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:382
+msgid "Load buddylist from file..."
+msgstr "Încarcă lista de contacte din fişierul..."
+
 msgid "Fill in the registration fields."
 msgstr "Completaţi câmpurile de înregistrare."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Parolele nu se potrivesc."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare.\n"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Noul cont Gadu-Gadu a fost înregistrat"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Înregistrare terminată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "Parolă"
 
-#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Confirmare parolă"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Introduceţi verificarea curentă"
 
-#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Verificare curentă"
 
-#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Înregistrare cont nou Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Completaţi următoarele câmpuri:"
 
-#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/oscar/oscar.c:3828
-#: ../libpurple/protocols/oscar/oscar.c:3841
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Oraş"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "An naştere"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msnp9/msn.c:1600
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "Sex"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Masculin sau feminin"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Masculin"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Feminin"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Doar conectate"
 
-#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Căutare contacte"
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Introduceţi mai jos termenii căutării"
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Completaţi câmpurile."
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Parola curentă este diferită de cea specificată."
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Nu s-a putut schimba parola. A intervenit o eroare.\n"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Schimbare parolă cont Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Parola a fost schimbată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Parolă curentă"
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduceţi parola curentă şi pe cea nouă pentru UIN-ul: "
 
-#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Schimbare parolă Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Selectaţi un chat pentru contactul: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Adăugare în chat..."
 
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2084
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1086
 msgid "Available"
-msgstr "Disponibil(ă)"
+msgstr "Disponibil"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:358
-#: ../libpurple/protocols/jabber/buddy.c:2088
-#: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:734
-#: ../libpurple/protocols/oscar/oscar.c:5747
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3719
-#: ../libpurple/protocols/yahoo/yahoo.c:3793 ../libpurple/status.c:159
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2070
-#: ../pidgin/gtkstatusbox.c:1087
+#, c-format
 msgid "Away"
-msgstr "Absent(ă)"
+msgstr "Absent"
 
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2755
-#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2261
-#: ../libpurple/protocols/jabber/buddy.c:2447
-#: ../libpurple/protocols/oscar/oscar.c:3749
-#: ../libpurple/protocols/silc/ops.c:1004
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Prenume"
 
-#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "An naştere"
 
-#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3950
 msgid "Unable to display the search results."
 msgstr "Rezultatele căutării nu pot fi afişate."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Director public Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Rezultatele căutării"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Nu s-au găsit utilizatori care să corespundă"
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Nu există utilizatori care să se potrivească termenilor căutării."
 
-#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Nu se poate citi din socket"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista de contacte a fost descărcată"
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Lista de contacte a fost descărcată de pe server."
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Listă de contacte stocată"
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Lista de contacte v-a fost stocată pe server."
 
-#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Conexiunea a eşuat."
 
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Adaugă în chat"
 
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Eroare de chat"
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Există deja un chat cu acest nume"
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
-msgstr "Neconectat(ă) la server."
+msgstr "Neconectat la server."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Căutare contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Schimbare parolă..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Stochează lista de contacte pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Descarcă lista de contacte de pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Şterge lista de contacte de pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Salvează lista de contacte în fişierul..."
 
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr "Încarcă lista de contacte din fişierul..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -4339,152 +3120,81 @@ msgstr "Încarcă lista de contacte din fişierul..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Modul de protocol Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Protocol popular în Polonia"
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1853
-#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comandă necunoscută: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:509
-#: ../libpurple/protocols/jabber/chat.c:596
-#: ../libpurple/protocols/silc/silc.c:1561
-#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "subiectul curent este: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:513
-#: ../libpurple/protocols/jabber/chat.c:600
-#: ../libpurple/protocols/silc/silc.c:1565
-#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "Nu există topic"
 
-#: ../libpurple/protocols/irc/dcc_send.c:298
-#: ../libpurple/protocols/irc/dcc_send.c:339
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 msgid "File Transfer Failed"
 msgstr "Transferul fişierului a eşuat"
 
-#: ../libpurple/protocols/irc/dcc_send.c:299
-#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Nu s-a putut deschide un port pentru a asculta."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Eroare la afişarea MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Nu s-a găsit un MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Nu există un MOTD asociat cu această conexiune."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD pentru %s"
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Server has disconnected"
 msgstr "Serverul s-a deconectat"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Afişare MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "C_hat:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_Parolă:"
 
-#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "Pseudonimele IRC nu pot conţine spaţii"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1346
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:354
-#: ../libpurple/protocols/myspace/myspace.c:295
-#: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1335
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3778
-#: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:686
 msgid "Connecting"
 msgstr "Autentificare"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:674
-#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:313
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "Nu s-a putut crea un socket"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "Conectarea la server a eşuat"
 
-#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2533
 msgid "Read error"
 msgstr "Eroare la citire"
 
-#: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Utilizatori"
 
-#: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3426
-#: ../libpurple/protocols/silc/chat.c:1404
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Topic"
 
@@ -4496,50 +3206,27 @@ msgstr "Topic"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "Modul de protocol IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Modul îmbunătăţit de protocol IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:371
-#: ../libpurple/protocols/msn/msn.c:2357
-#: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6749
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5783
-#: ../libpurple/protocols/silc/ops.c:1262
-#: ../libpurple/protocols/silc/ops.c:1356
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2099
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6752
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5788
-#: ../libpurple/protocols/silc/silc.c:2143
-#: ../libpurple/protocols/silc10/silc.c:1867
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Codări"
 
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:365
-#: ../libpurple/protocols/silc/silc.c:1225
-#: ../libpurple/protocols/silc10/silc.c:926
+msgid "Auto-detect incoming UTF-8"
+msgstr "Detectare automată pentru mesajele UTF-8 primite"
+
 msgid "Real name"
 msgstr "Nume real"
 
@@ -4547,172 +3234,129 @@ msgstr "Nume real"
 #. 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:985
 msgid "Use SSL"
 msgstr "Utilizare SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Bad mode"
 msgstr "Mod greşit"
 
-#: ../libpurple/protocols/irc/msgs.c:214
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "Blocare în %s de către %s, iniţiată acum %ld secunde"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Blocare în %s de către %s, iniţiată acum %s"
 
-#: ../libpurple/protocols/irc/msgs.c:217
 #, c-format
 msgid "Ban on %s"
 msgstr "Blocat în %s"
 
-#: ../libpurple/protocols/irc/msgs.c:232
 msgid "End of ban list"
 msgstr "Sfârşitul listei de utilizatori blocaţi"
 
-#: ../libpurple/protocols/irc/msgs.c:246
 #, c-format
 msgid "You are banned from %s."
 msgstr "Vi s-a blocat accesul în %s."
 
-#: ../libpurple/protocols/irc/msgs.c:247
 msgid "Banned"
 msgstr "Blocat"
 
-#: ../libpurple/protocols/irc/msgs.c:264
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "%s nu poate fi blocat, lista de blocare e plină."
 
-#: ../libpurple/protocols/irc/msgs.c:349
 msgid " <i>(ircop)</i>"
 msgstr " <i>(operator IRC)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:350
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificat)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:351
-#: ../libpurple/protocols/oscar/oscar.c:3739
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Pseudonim"
 
-#: ../libpurple/protocols/irc/msgs.c:377
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Prezent în"
 
-#: ../libpurple/protocols/irc/msgs.c:382
 msgid "Idle for"
-msgstr "Inactiv(ă) de"
+msgstr "Inactiv de"
 
-#: ../libpurple/protocols/irc/msgs.c:385
 msgid "Online since"
-msgstr "Conectat(ă) din"
+msgstr "Conectat din"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Adjectiv definitoriu:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Glorious"
 msgstr "Glorios"
 
-#: ../libpurple/protocols/irc/msgs.c:473
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s a schimbat subiectul în: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:475
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s a şters subiectul."
 
-#: ../libpurple/protocols/irc/msgs.c:483
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Topicul pentru %s este: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:501
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mesaj necunoscut „%s”"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "Unknown message"
 msgstr "Mesaj necunoscut"
 
-#: ../libpurple/protocols/irc/msgs.c:502
 msgid "The IRC server received a message it did not understand."
 msgstr "S-a trimis un mesaj neînţeles de către serverul IRC."
 
-#: ../libpurple/protocols/irc/msgs.c:523
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utilizatori în %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Time Response"
 msgstr "Răspuns „time”"
 
-#: ../libpurple/protocols/irc/msgs.c:631
 msgid "The IRC server's local time is:"
 msgstr "Ora locală a serverului IRC este:"
 
-#: ../libpurple/protocols/irc/msgs.c:642
 msgid "No such channel"
 msgstr "Nu există un asemenea chat"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:653
 msgid "no such channel"
 msgstr "nu există un asemenea chat"
 
-#: ../libpurple/protocols/irc/msgs.c:656
 msgid "User is not logged in"
 msgstr "Utilizator neconectat"
 
-#: ../libpurple/protocols/irc/msgs.c:661
 msgid "No such nick or channel"
 msgstr "Nu există un asemenea pseudonim sau chat"
 
-#: ../libpurple/protocols/irc/msgs.c:681
 msgid "Could not send"
 msgstr "Nu s-a putut trimite"
 
-#: ../libpurple/protocols/irc/msgs.c:737
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Intrarea în %s necesită o invitaţie."
 
-#: ../libpurple/protocols/irc/msgs.c:738
 msgid "Invitation only"
 msgstr "Doar cu invitaţie"
 
-#: ../libpurple/protocols/irc/msgs.c:854
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Aţi fost dat afară din %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:859 ../libpurple/protocols/silc/ops.c:714
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Respins de %s: (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:882
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mod (%s %s) de către %s"
 
-#: ../libpurple/protocols/irc/msgs.c:970 ../libpurple/protocols/irc/msgs.c:971
 msgid "Invalid nickname"
 msgstr "Pseudonim invalid"
 
-#: ../libpurple/protocols/irc/msgs.c:972
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4720,7 +3364,6 @@ msgstr ""
 "Pseudonimul ales a fost respins de către server. Probabil conţine caractere "
 "invalide."
 
-#: ../libpurple/protocols/irc/msgs.c:977
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4728,53 +3371,40 @@ msgstr ""
 "Numele de cont ales a fost respins de către server. Probabil conţine "
 "caractere invalide."
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Cannot change nick"
 msgstr "Nu se reuşeşte schimbarea pseudonimului"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Could not change nick"
 msgstr "Nu s-a putut schimba pseudonimul"
 
-#: ../libpurple/protocols/irc/msgs.c:1041
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Aţi părăsit chat-ul%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1085
 msgid "Error: invalid PONG from server"
 msgstr "Eroare: PONG invalid de la server"
 
-#: ../libpurple/protocols/irc/msgs.c:1087
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Replică PING -- Întârziere: %lu secunde"
 
-#: ../libpurple/protocols/irc/msgs.c:1178
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Nu s-a putut intra în %s: E nevoie de înregistrare"
 
-#: ../libpurple/protocols/irc/msgs.c:1179
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nu s-a putut intra în chat"
 
-#: ../libpurple/protocols/irc/msgs.c:1213
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Pseudonimul sau chat-ul sunt temporar indisponibile."
 
-#: ../libpurple/protocols/irc/msgs.c:1225
 #, c-format
 msgid "Wallops from %s"
-msgstr "Mesaje sistem de la %s"
+msgstr "Mesaje de sistem de la %s"
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;acţiune de efectuat&gt;:  Efectuaţi o acţiune."
 
-#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4782,11 +3412,12 @@ msgstr ""
 "away [mesaj]:  Setaţi un mesaj în absenţă sau, dacă nu precizaţi un mesaj, "
 "reveniţi din absenţă."
 
-#: ../libpurple/protocols/irc/parse.c:126
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <pseudonim> <msg>: trimite un msg ctcp către pseudonimul ales."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:  Trimiteţi o comandă către „chanserv”."
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4794,7 +3425,6 @@ msgstr ""
 "deop &lt;pseudonim1&gt; [pseudonim2] ...:  Scoateţi din lista operatorilor "
 "un utilizator. Pentru aceasta e nevoie să fiţi operator."
 
-#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -4804,7 +3434,6 @@ msgstr ""
 "utilizatori să trimită mesaje într-un chat moderat (+m). Pentru aceasta e "
 "nevoie să fiţi operator."
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -4812,7 +3441,6 @@ msgstr ""
 "invite &lt;pseudonim&gt; [chat]:  Invitaţi pe cineva să vi se alăture în "
 "chat-ul curent sau într-altul specificat."
 
-#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4821,7 +3449,6 @@ msgstr ""
 "mai multe chat-uri, opţional precizând o cheie pentru fiecare, dacă e "
 "necesar."
 
-#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4830,7 +3457,6 @@ msgstr ""
 "sau mai multe chat-uri, opţional precizând o cheie pentru fiecare, dacă e "
 "necesar."
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -4838,7 +3464,6 @@ msgstr ""
 "kick &lt;pseudonim&gt; [mesaj]: Daţi pe cineva afară din chat. Pentru "
 "aceasta e nevoie să fiţi operator."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -4846,15 +3471,12 @@ msgstr ""
 "list:  Listează camerele de chat din reţea. <i>Atenţie! Anumite servere vă "
 "vor deconecta la executarea acestei comenzi.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:134
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acţiune de efectuat&gt;:  Efectuaţi o acţiune."
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:  Trimiteţi o comandă către „memoserv”."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4862,7 +3484,6 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;pseudonim|chat&gt;:  Setaţi sau resetaţi "
 "un chat sau un mod utilizator."
 
-#: ../libpurple/protocols/irc/parse.c:137
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4870,25 +3491,19 @@ msgstr ""
 "msg &lt;pseudonim&gt; &lt;mesaj&gt;:  Trimiteţi un mesaj privat către un "
 "utilizator (nu în camera de chat)."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [chat]:  Listaţi utilizatorii din chat."
 
-#: ../libpurple/protocols/irc/parse.c:139
-#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;pseudonim nou&gt;:  Schimbaţi pseudonimul propriu."
 
-#: ../libpurple/protocols/irc/parse.c:140
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  Trimiteţi o comandă către „nickserv”."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr ""
 "me &lt;acţiune&gt;:  Trimite o notificare către un contact sau un chat."
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4896,7 +3511,6 @@ msgstr ""
 "op &lt;pseudonim1&gt; [pseudonim2] ...:  Acordaţi status de operator unuia "
 "sau mai multor utilizatori. Pentru aceasta e nevoie să fiţi operator."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4904,11 +3518,9 @@ msgstr ""
 "operwall &lt;mesaj&gt;:  Dacă nu ştiţi ce face această comandă, mai bine nu "
 "o folosiţi."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:  Trimiteţi o comandă către „operserv”."
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4916,7 +3528,6 @@ msgstr ""
 "part [chat] [mesaj]: Ieşiţi din chat-ul curent (sau un altul specificat) cu "
 "un mesaj opţional."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4924,7 +3535,6 @@ msgstr ""
 "ping [pseudonim]:  Verificaţi latenţa conexiunii unui utilizator (sau a "
 "serverului, dacă nu specificaţi un utilizator)."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4932,15 +3542,12 @@ msgstr ""
 "query &lt;pseudonim&gt; %lt;mesaj&gt;:  Trimiteţi un mesaj privat către un "
 "utilizator (nu către un chat)."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [mesaj]:  Vă deconectaţi de la server cu un mesaj opţional."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Trimiteţi o comandă brută către server."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4948,25 +3555,20 @@ msgstr ""
 "remove &lt;pseudonim&gt; [mesaj]:  Scoateţi un utilizator din chat. Pentru "
 "aceasta trebuie să fiţi operator."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Arată ora locală a serverului IRC."
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [topic nou]:  Verificaţi sau schimbaţi subiectul chat-ului."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Setaţi sau resetaţi un mod utilizator."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
 "versiune [pseudonim]: trimite o cerere CTCP VERSION către un utilizator"
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4974,7 +3576,6 @@ msgstr ""
 "voice &lt;pseudonim1&gt; [pseudonim2] ...:  Acordaţi unui utilizator "
 "posibilitatea de a scrie ceva într-un chat moderat."
 
-#: ../libpurple/protocols/irc/parse.c:156
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4982,68 +3583,47 @@ msgstr ""
 "wallops &lt;mesaj&gt;:  Dacă nu ştiţi ce face această comandă, mai bine nu "
 "nu o folosiţi."
 
-#: ../libpurple/protocols/irc/parse.c:157
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 "whois [server] &lt;pseudonim&gt;:  Obţineţi detalii despre un utilizator."
 
-#: ../libpurple/protocols/irc/parse.c:158
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;pseudonim&gt;:  Obţineţi detalii despre un utilizator deconectat."
 
-#: ../libpurple/protocols/irc/parse.c:523
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Timp de reacţie de la %s: %lu secunde"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:524
 msgid "CTCP PING reply"
 msgstr "Replică CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:636
-#: ../libpurple/protocols/irc/parse.c:643 ../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 "Deconectat(ă)."
+msgstr "Deconectat."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:735
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "Eroare necunoscută"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Comandă Ad-Hoc eşuată"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
-msgstr ""
+msgstr "execută"
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un "
-"fel de suport TLS/SSL."
+msgstr ""
+"Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
+"suport TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:60
 msgid "You require encryption, but no TLS/SSL support found."
 msgstr "Aţi cerut criptare, dar nu s-a găsit nici un fel de suport TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Serverul necesită autentificare în clar printr-o conexiune necriptată"
 
-#: ../libpurple/protocols/jabber/auth.c:328
-#: ../libpurple/protocols/jabber/auth.c:535
-#: ../libpurple/protocols/jabber/auth.c:729
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -5052,139 +3632,74 @@ msgstr ""
 "%s necesită autentificare în clar printr-o conexiune necriptată. Permiteţi "
 "autentificarea în aceste condiţii?"
 
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:331
-#: ../libpurple/protocols/jabber/auth.c:537
-#: ../libpurple/protocols/jabber/auth.c:538
-#: ../libpurple/protocols/jabber/auth.c:731
-#: ../libpurple/protocols/jabber/auth.c:732
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"
 
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:662
-#: ../libpurple/protocols/jabber/auth.c:913
-#: ../libpurple/protocols/jabber/auth.c:1064
-#: ../libpurple/protocols/jabber/auth.c:1091
-#: ../libpurple/protocols/jabber/auth.c:1137
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Răspuns invalid de la server."
 
-#: ../libpurple/protocols/jabber/auth.c:551
-#: ../libpurple/protocols/jabber/auth.c:745
 msgid "Server does not use any supported authentication method"
 msgstr "Serverul nu utilizează o metodă cunoscută de autentificare"
 
-#: ../libpurple/protocols/jabber/auth.c:936
-#: ../libpurple/protocols/jabber/auth.c:961
 msgid "Invalid challenge from server"
 msgstr "Cerere invalidă de la server"
 
-#: ../libpurple/protocols/jabber/auth.c:1037
 msgid "SASL error"
 msgstr "Eroare SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:306
-#: ../libpurple/protocols/jabber/buddy.c:1257
-#: ../libpurple/protocols/sametime/sametime.c:4184
-#: ../libpurple/protocols/silc/ops.c:1000
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nume complet"
 
-#: ../libpurple/protocols/jabber/buddy.c:307
-#: ../libpurple/protocols/jabber/buddy.c:1269
-#: ../libpurple/protocols/silc/ops.c:1012
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nume de familie"
 
-#: ../libpurple/protocols/jabber/buddy.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1272
 msgid "Given Name"
 msgstr "Prenume"
 
-#: ../libpurple/protocols/jabber/buddy.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "Pagină Internet"
 
-#: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1320
 msgid "Street Address"
 msgstr "Adresă locală"
 
-#: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Extended Address"
 msgstr "Adresă completă"
 
-#: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1323
 msgid "Locality"
 msgstr "Localitate"
 
-#: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1326
 msgid "Region"
 msgstr "Regiune"
 
-#: ../libpurple/protocols/jabber/buddy.c:315
-#: ../libpurple/protocols/jabber/buddy.c:1329
 msgid "Postal Code"
 msgstr "Cod poştal"
 
-#: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1333
-#: ../libpurple/protocols/silc/silc.c:1231
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Ţară"
 
-#: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1344
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1388
 msgid "Organization Name"
 msgstr "Nume organizaţie"
 
-#: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1391
 msgid "Organization Unit"
 msgstr "Departament"
 
-#: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1400
 msgid "Role"
 msgstr "Funcţie"
 
-#: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1288
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1669
-#: ../libpurple/protocols/oscar/oscar.c:3788
 msgid "Birthday"
 msgstr "Zi de naştere"
 
-#: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1403
-#: ../libpurple/protocols/jabber/chat.c:780
-#: ../libpurple/protocols/jabber/usermood.c:190 ../pidgin/gtkblist.c:3427
-#: ../pidgin/gtkplugin.c:582 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Descriere"
 
-#: ../libpurple/protocols/jabber/buddy.c:753
-#: ../libpurple/protocols/jabber/buddy.c:754
 msgid "Edit XMPP vCard"
 msgstr "Editare vCard XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:755
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5192,398 +3707,244 @@ msgstr ""
 "Toţi itemii de mai jos sunt opţionali. Introduceţi doar informaţiile pe care "
 "doriţi să le faceţi publice."
 
-#: ../libpurple/protocols/jabber/buddy.c:826
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:830
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Operating System"
 msgstr "Sistem de operare"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/jabber/buddy.c:1006
 msgid "Last Activity"
 msgstr "Ultima activitate"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
-#: ../libpurple/protocols/jabber/buddy.c:1008
 msgid "Service Discovery Info"
 msgstr "Detalii servicii descoperite"
 
-#: ../libpurple/protocols/jabber/buddy.c:850
-#: ../libpurple/protocols/jabber/buddy.c:1010
 msgid "Service Discovery Items"
 msgstr "Servicii descoperite"
 
-#: ../libpurple/protocols/jabber/buddy.c:852
-#: ../libpurple/protocols/jabber/buddy.c:1012
 msgid "Extended Stanza Addressing"
 msgstr "Adresare „stanza” extinsă"
 
-#: ../libpurple/protocols/jabber/buddy.c:854
-#: ../libpurple/protocols/jabber/buddy.c:1014
 msgid "Multi-User Chat"
 msgstr "Chat cu mai mulţi utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1016
 msgid "Multi-User Chat Extended Presence Information"
 msgstr ""
 "Detalii suplimentare despre prezenţa într-un chat cu mai mulţi utilizatori."
 
-#: ../libpurple/protocols/jabber/buddy.c:858
-#: ../libpurple/protocols/jabber/buddy.c:1018
 msgid "In-Band Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:860
-#: ../libpurple/protocols/jabber/buddy.c:1020
 msgid "Ad-Hoc Commands"
 msgstr "Comenzi ad-hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:862
-#: ../libpurple/protocols/jabber/buddy.c:1022
 msgid "PubSub Service"
 msgstr "Serviciu PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:864
-#: ../libpurple/protocols/jabber/buddy.c:1024
 msgid "SOCKS5 Bytestreams"
 msgstr "Fluxuri de date SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:866
-#: ../libpurple/protocols/jabber/buddy.c:1026
 msgid "Out of Band Data"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:868
-#: ../libpurple/protocols/jabber/buddy.c:1028
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:870
-#: ../libpurple/protocols/jabber/buddy.c:1030
 #, fuzzy
 msgid "In-Band Registration"
 msgstr "Eroare la înregistrare"
 
-#: ../libpurple/protocols/jabber/buddy.c:872
-#: ../libpurple/protocols/jabber/buddy.c:1032
 msgid "User Location"
 msgstr "Loc utilizator"
 
-#: ../libpurple/protocols/jabber/buddy.c:874
-#: ../libpurple/protocols/jabber/buddy.c:1034
 msgid "User Avatar"
 msgstr "Avatar utilizator"
 
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/jabber/buddy.c:1036
 msgid "Chat State Notifications"
 msgstr "Notificări de stări pentru chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:878
-#: ../libpurple/protocols/jabber/buddy.c:1038
 msgid "Software Version"
 msgstr "Versiune de software"
 
-#: ../libpurple/protocols/jabber/buddy.c:880
-#: ../libpurple/protocols/jabber/buddy.c:1040
 msgid "Stream Initiation"
 msgstr "Iniţializare flux de date"
 
-#: ../libpurple/protocols/jabber/buddy.c:882
-#: ../libpurple/protocols/jabber/buddy.c:1042
-#: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "Transfer de fişiere"
 
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:1044
 msgid "User Mood"
 msgstr "Dispoziţia utilizatorului"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
-#: ../libpurple/protocols/jabber/buddy.c:1046
 msgid "User Activity"
 msgstr "Acitivatea utilizatorului"
 
-#: ../libpurple/protocols/jabber/buddy.c:888
-#: ../libpurple/protocols/jabber/buddy.c:1048
 msgid "Entity Capabilities"
 msgstr "Facilităţile entităţii"
 
-#: ../libpurple/protocols/jabber/buddy.c:890
-#: ../libpurple/protocols/jabber/buddy.c:1050
 msgid "Encrypted Session Negotiations"
 msgstr "Negocieri sesiuni criptate"
 
-#: ../libpurple/protocols/jabber/buddy.c:892
-#: ../libpurple/protocols/jabber/buddy.c:1052
 msgid "User Tune"
 msgstr "Piesă utilizator"
 
-#: ../libpurple/protocols/jabber/buddy.c:894
-#: ../libpurple/protocols/jabber/buddy.c:1054
 #, fuzzy
 msgid "Roster Item Exchange"
 msgstr "IM cu schimb de chei"
 
-#: ../libpurple/protocols/jabber/buddy.c:896
-#: ../libpurple/protocols/jabber/buddy.c:1056
 #, fuzzy
 msgid "Reachability Address"
 msgstr "Adresă de mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:898
-#: ../libpurple/protocols/jabber/buddy.c:1058
 msgid "User Profile"
 msgstr "Profil utilizator"
 
-#: ../libpurple/protocols/jabber/buddy.c:900
-#: ../libpurple/protocols/jabber/buddy.c:1060
 #, fuzzy
 msgid "Jingle"
 msgstr "Intră"
 
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:1062
 msgid "Jingle Audio"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:904
-#: ../libpurple/protocols/jabber/buddy.c:1064
 msgid "User Nickname"
 msgstr "Pseudonim utilizator"
 
-#: ../libpurple/protocols/jabber/buddy.c:906
-#: ../libpurple/protocols/jabber/buddy.c:1066
 msgid "Jingle ICE UDP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:908
-#: ../libpurple/protocols/jabber/buddy.c:1068
 msgid "Jingle ICE TCP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1070
 msgid "Jingle Raw UDP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:912
-#: ../libpurple/protocols/jabber/buddy.c:1072
 #, fuzzy
 msgid "Jingle Video"
 msgstr "Video în direct"
 
-#: ../libpurple/protocols/jabber/buddy.c:914
-#: ../libpurple/protocols/jabber/buddy.c:1074
 msgid "Jingle DTMF"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:916
-#: ../libpurple/protocols/jabber/buddy.c:1076
 #, fuzzy
 msgid "Message Receipts"
 msgstr "Aţi primit un mesaj"
 
-#: ../libpurple/protocols/jabber/buddy.c:918
-#: ../libpurple/protocols/jabber/buddy.c:1078
 #, fuzzy
 msgid "Public Key Publishing"
 msgstr "Amprentă silabică cheie publică"
 
-#: ../libpurple/protocols/jabber/buddy.c:920
-#: ../libpurple/protocols/jabber/buddy.c:1080
 #, fuzzy
 msgid "User Chatting"
 msgstr "Opţiuni personale"
 
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:1082
 #, fuzzy
 msgid "User Browsing"
 msgstr "Moduri utilizator"
 
-#: ../libpurple/protocols/jabber/buddy.c:924
-#: ../libpurple/protocols/jabber/buddy.c:1084
 #, fuzzy
 msgid "User Gaming"
 msgstr "Nume utilizator"
 
-#: ../libpurple/protocols/jabber/buddy.c:926
-#: ../libpurple/protocols/jabber/buddy.c:1086
 #, fuzzy
 msgid "User Viewing"
 msgstr "Limită utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:928
-#: ../libpurple/protocols/jabber/buddy.c:1088
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:930
-#: ../libpurple/protocols/jabber/buddy.c:1090
 #, fuzzy
 msgid "Stanza Encryption"
 msgstr "Criptare Trillian"
 
-#: ../libpurple/protocols/jabber/buddy.c:932
-#: ../libpurple/protocols/jabber/buddy.c:1092
 msgid "Entity Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:934
-#: ../libpurple/protocols/jabber/buddy.c:1094
 msgid "Delayed Delivery"
 msgstr "Livrare întârziată"
 
-#: ../libpurple/protocols/jabber/buddy.c:936
-#: ../libpurple/protocols/jabber/buddy.c:1096
 msgid "Collaborative Data Objects"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:938
-#: ../libpurple/protocols/jabber/buddy.c:1098
 msgid "File Repository and Sharing"
 msgstr "Repozitorii de fişiere şi partajare"
 
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:1100
 msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:942
-#: ../libpurple/protocols/jabber/buddy.c:1102
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "Negociere sesiune de criptare simplificată"
 
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/buddy.c:1104
 msgid "Hop Check"
-msgstr ""
+msgstr "Verificare hopuri"
 
-#: ../libpurple/protocols/jabber/buddy.c:952
-#: ../libpurple/protocols/jabber/buddy.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2962
 msgid "Capabilities"
 msgstr "Facilităţi"
 
-#: ../libpurple/protocols/jabber/buddy.c:964
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1098
-msgid "Resource"
-msgstr "Resursă"
-
-#: ../libpurple/protocols/jabber/buddy.c:966
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1638
-#: ../libpurple/protocols/jabber/jabber.c:1652
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Priority"
 msgstr "Prioritate"
 
-#: ../libpurple/protocols/jabber/buddy.c:1275
-#: ../libpurple/protocols/silc/ops.c:1008
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Resursă"
+
 msgid "Middle Name"
 msgstr "Iniţială"
 
-#: ../libpurple/protocols/jabber/buddy.c:1308
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/oscar/oscar.c:3827
-#: ../libpurple/protocols/oscar/oscar.c:3840
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1044
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresă"
 
-#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "P.O. Box"
 msgstr "Căsuţă poştală"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Photo"
 msgstr "Avatar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Logo"
 msgstr "Siglă"
 
-#: ../libpurple/protocols/jabber/buddy.c:1993
 msgid "Un-hide From"
 msgstr "Arată-mă din nou pentru"
 
-#: ../libpurple/protocols/jabber/buddy.c:1997
 msgid "Temporarily Hide From"
 msgstr "Ascunde-mă temporar de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:2005
 msgid "Cancel Presence Notification"
 msgstr "Anulează notificarea prezenţei"
 
-#: ../libpurple/protocols/jabber/buddy.c:2012
 msgid "(Re-)Request authorization"
 msgstr "Solicit (din nou) autorizare"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:2021
 msgid "Unsubscribe"
 msgstr "Desubscrie"
 
-#: ../libpurple/protocols/jabber/buddy.c:2036
 msgid "Log In"
 msgstr "Conectare"
 
-#: ../libpurple/protocols/jabber/buddy.c:2040
 msgid "Log Out"
 msgstr "Deconectare"
 
-#: ../libpurple/protocols/jabber/buddy.c:2086
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "Cu chef de vorbă"
 
-#: ../libpurple/protocols/jabber/buddy.c:2090
 msgid "Extended Away"
 msgstr "Demult absent"
 
-#: ../libpurple/protocols/jabber/buddy.c:2092
-#: ../libpurple/protocols/jabber/jabber.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5923
-#: ../libpurple/protocols/sametime/sametime.c:3349
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Nu deranjaţi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2259
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2263
-#: ../libpurple/protocols/jabber/buddy.c:2452
-#: ../libpurple/protocols/oscar/oscar.c:3750
 msgid "Last Name"
 msgstr "Nume de familie"
 
-#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid "The following are the results of your search"
 msgstr "Acestea sunt rezultatele căutării:"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2380
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5591,184 +3952,121 @@ msgstr ""
 "Căutaţi un contact prin introducerea unui criteriu de căutare în câmpurile "
 "date. Notă: Fiecare câmp suportă căutare cu caractere de tip „wildcard” (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2400
 msgid "Directory Query Failed"
 msgstr "Interogarea directorului a eşuat"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
 msgid "Could not query the directory server."
 msgstr "Nu s-a putut interoga serverul de directoare"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2435
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucţiuni server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2442
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Completaţi unul sau mai multe câmpuri pentru a specifica criterii de căutare "
 "a utilizatorilor XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3753
-#: ../libpurple/protocols/oscar/oscar.c:3762
 msgid "Email Address"
 msgstr "Adresă de mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2471
-#: ../libpurple/protocols/jabber/buddy.c:2472
 msgid "Search for XMPP users"
 msgstr "Căutare utilizator XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2473
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:177
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5667
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Caută"
 
-#: ../libpurple/protocols/jabber/buddy.c:2488
 msgid "Invalid Directory"
 msgstr "Director invalid"
 
-#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Enter a User Directory"
 msgstr "Introduceţi un director cu utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:2506
 msgid "Select a user directory to search"
 msgstr "Selectaţi pentru interogare un director cu utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:2509
 msgid "Search Directory"
 msgstr "Caută în acest director"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5403
-#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "Ca_meră:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "A_dministrare:"
 
-#: ../libpurple/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s nu este un nume valid de chat"
 
-#: ../libpurple/protocols/jabber/chat.c:227
 msgid "Invalid Room Name"
 msgstr "Nume invalid de chat"
 
-#: ../libpurple/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s nu este un nume valid de server"
 
-#: ../libpurple/protocols/jabber/chat.c:233
-#: ../libpurple/protocols/jabber/chat.c:234
 msgid "Invalid Server Name"
 msgstr "Nume invalid de contact"
 
-#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s nu este un nume valid de chat"
 
-#: ../libpurple/protocols/jabber/chat.c:239
-#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Room Handle"
 msgstr "Titlu invalid de chat"
 
-#: ../libpurple/protocols/jabber/chat.c:401
 msgid "Configuration error"
 msgstr "Eroare de configurare"
 
-#: ../libpurple/protocols/jabber/chat.c:410
-#: ../libpurple/protocols/jabber/chat.c:553
 msgid "Unable to configure"
 msgstr "Configurare nereuşită"
 
-#: ../libpurple/protocols/jabber/chat.c:425
 msgid "Room Configuration Error"
 msgstr "Eroare la configurarea chat-ului"
 
-#: ../libpurple/protocols/jabber/chat.c:426
 msgid "This room is not capable of being configured"
 msgstr "Această cameră de chat nu poate fi configurată"
 
-#: ../libpurple/protocols/jabber/chat.c:475
-#: ../libpurple/protocols/jabber/chat.c:544
 msgid "Registration error"
 msgstr "Eroare la înregistrare"
 
-#: ../libpurple/protocols/jabber/chat.c:632
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Schimbarea pseudonimului nu e suportată în camerele de chat non-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:683
-#: ../libpurple/protocols/jabber/chat.c:694
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Eroare la obţinerea listei camerelor de chat"
 
-#: ../libpurple/protocols/jabber/chat.c:742
 msgid "Invalid Server"
 msgstr "Server invalid"
 
-#: ../libpurple/protocols/jabber/chat.c:786
 msgid "Enter a Conference Server"
 msgstr "Conectare la un server de conferinţe"
 
-#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Select a conference server to query"
 msgstr "Selectaţi un server de conferinţe pentru interogare"
 
-#: ../libpurple/protocols/jabber/chat.c:790
 msgid "Find Rooms"
 msgstr "Caută camere de chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Aţi cerut criptare, dar serverul nu suportă criptare"
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Eroare la scriere"
 
-#: ../libpurple/protocols/jabber/jabber.c:401
 #, fuzzy
 msgid "Ping timeout"
 msgstr "Text simplu"
 
-#: ../libpurple/protocols/jabber/jabber.c:451
-#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "Eroare la citire"
 
-#: ../libpurple/protocols/jabber/jabber.c:528
-#: ../libpurple/protocols/oscar/flap_connection.c:403
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
-#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5777,554 +4075,377 @@ msgstr ""
 "Nu s-a putut face o conexiune cu serverul:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "Nu se poate crea un socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:635
-#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalid. Trebuie precizat domeniul."
 
-#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Înregistrarea %s@%s a reuşit"
 
-#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Înregistrarea la %s a reuşit"
 
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "Înregistrare reuşită"
 
-#: ../libpurple/protocols/jabber/jabber.c:737
-#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "Înregistrare eşuată"
 
-#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Înregistrarea de la %s a fost ştearsă cu succes"
 
-#: ../libpurple/protocols/jabber/jabber.c:758
-#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "Ştergere reuşită a înregistrării"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "Ştergere eşuată a înregistrării"
 
-#: ../libpurple/protocols/jabber/jabber.c:934
-#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "Este deja înregistrat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1022
-#: ../libpurple/protocols/oscar/oscar.c:3829
-#: ../libpurple/protocols/oscar/oscar.c:3842
 msgid "State"
 msgstr "Stat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "Cod poştal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1030
-#: ../libpurple/protocols/silc/ops.c:1049
-#: ../libpurple/protocols/silc/silc.c:988
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "Dată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "Ştergere înregistrare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Completaţi informaţiile de mai jos pentru schimbarea contului înregistrat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr "Completaţi informaţiile de mai jos pentru înregistrarea unui nou cont."
 
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "Înregistrare cont nou XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "Înregistrare cont"
 
-#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Modificare înregistrare cont la %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Înregistrare cont nou la %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "Modificare înregistrare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1180
-#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "Eroare la ştergerea contului înregistrat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1186
-#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "Contul a fost înregistrat cu succes"
 
-#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "Iniţializare flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "Iniţializare SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1359
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "Reiniţializare flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1462
-#: ../libpurple/protocols/jabber/jabber.c:1920
-#: ../libpurple/protocols/jabber/jabber.c:1963
-#: ../libpurple/protocols/jabber/jabber.c:2001
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5717
 msgid "Not Authorized"
-msgstr "Neautorizat(ă)"
+msgstr "Neautorizat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "Ambele"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "Expeditor (în aşteptare)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "Expeditor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "Destinatar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "Niciunul (în aşteptare)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Fără"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "Subscriere"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
-#: ../libpurple/protocols/jabber/jabber.c:1654
-#: ../libpurple/protocols/jabber/jabber.c:1668
-#: ../libpurple/protocols/jabber/usermood.c:181
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1225
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Dispoziţie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/msn/msn.c:656
 msgid "Now Listening"
 msgstr "Acum în audiţie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/jabber.c:1641
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/jabber/jabber.c:1669
 msgid "Mood Text"
 msgstr "Text dispoziţie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Allow Buzz"
 msgstr "Permite „buzz”"
 
-#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "Artist piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "Nume piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "Album piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "Gen piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "Comentariu piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "Pistă piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "Timp piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "An piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "URL piesă curentă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "Parola a fost schimbată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "Parola v-a fost schimbată."
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
-#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "Eroare la schimbarea parolei"
 
-#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "Confirmare parolă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1784
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "Schimbare parolă XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "Introduceţi noua parolă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:6504
-#: ../libpurple/protocols/silc/silc.c:1309
-#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Introducere detalii..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:6515
-#: ../libpurple/protocols/silc/silc.c:1305
-#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Schimbare parolă..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "Căutare utilizatori..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "Cerere invalidă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "Facilitate neimplementată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "Interzis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "Dus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1910
-#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "Eroare internă de server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "Elementul nu a fost găsit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "ID XMPP invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "Inacceptabil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "Nepermis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "Această facilitate se plăteşte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "Serviciu indisponibil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "E nevoie de înregistrare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "Serverul la distanţă nu a fost găsit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "Serverul la distanţă nu răspunde"
 
-#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "Server supraîncărcat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "Serviciu indisponibil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "E nevoie de subscriere"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "Cerere neaşteptată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "Autorizare întreruptă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "Codare incorectă la autorizare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "„Authzid” invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanism invalid de autorizare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "Mecanism de autorizare insuficient de sigur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "Eroare temporară de autentificare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "Eroare de autentificare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "Format greşit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "Prefixul pentru „namespace” este greşit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "Conflict de resurse"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Conexiunea a expirat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "Gazda a dispărut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "Gazdă necunoscută"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "Adresare neadecvată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "Identitate invalidă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "„Namespace” invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "XML invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "Gazdele nu se potrivesc"
 
-#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "Normele au fost încălcate"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "Conexiunea la distanţă a eşuat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "Resurse limitate"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "XML restrictiv"
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "Verificaţi cealaltă gazdă"
 
-#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "Închidere sistem"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "Condiţie nedefinită"
 
-#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "Codare nesuportată"
 
-#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "Tip nesuportat de „stanza”"
 
-#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "Versiune nesuportată"
 
-#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML malformat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "Eroare de flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nu se poate interzice accesul utilizatorului %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliere necunoscută: „%s”"
 
-#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Utilizatorul %s nu poate fi afiliat ca „%s”"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol necunoscut: „%s”"
 
-#: ../libpurple/protocols/jabber/jabber.c:2159
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Nu se poate seta rolul „%s” pentru utilizatorul: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nu se poate da afară utilizatorul %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Nu se poate da „ping” către utilizatorul %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2261
-#: ../libpurple/protocols/jabber/jabber.c:2272
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 "Nu se poate da „buzz” pentru că nu se ştie nimic despre utilizatorul %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2267
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 "Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi deconectat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2298
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
@@ -6333,50 +4454,36 @@ msgstr ""
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2318
-#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "Buzz"
 msgstr "Buzz!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s v-a dat „buzz”!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "Buzzing %s..."
 msgstr "„Buzz” la %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config:  Configuraţi o cameră de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configuraţi o cameră de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [chat]:  Ieşiţi dintr-un chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register:  Vă înregistraţi într-un chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [subiect nou]: Verificaţi sau schimbaţi subiectul."
 
-#: ../libpurple/protocols/jabber/jabber.c:2380
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 "ban &lt;nume utilizator&gt; [chat]:  Blocaţi accesul unui utilizator în chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6384,7 +4491,6 @@ msgstr ""
 "affiliate &lt;nume ales&gt; &lt;deţinător|administrator|membru|renegat|"
 "niciuna&gt;:  Setaţi afilierea unui utilizator faţă de camera de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2392
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6392,31 +4498,24 @@ msgstr ""
 "role &lt;nume ales&gt; &lt;moderator|participant|vizitator|niciunul&gt;:  "
 "Setaţi rolul unui utilizator în camera de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2398
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;nume ales&gt; [chat]:  Invitaţi un utilizator într-un chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2404
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr "join: &lt;chat&gt; [parolă]:  Intraţi într-un chat al unui server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2410
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;utilizator&gt; [motiv]:  Daţi afară din chat un utilizator."
 
-#: ../libpurple/protocols/jabber/jabber.c:2415
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;utilizator&gt; &lt;mesaj&gt;:  Trimiteţi un mesaj privat unui alt "
 "utilizator."
 
-#: ../libpurple/protocols/jabber/jabber.c:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tDaţi ping către utilizator/componentă/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2426
-#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz:  Sâcâiţi un utilizator pentru a-i atrage atenţia"
 
@@ -6430,96 +4529,70 @@ msgstr "buzz:  Sâcâiţi un utilizator pentru a-i atrage atenţia"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Modul de protocol XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Domeniu"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Necesită SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Impune utilizarea versiunii vechi de SSL (pe portul 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permite autentificarea în clar prin conexiuni necriptate"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3475
-#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Port de conectare"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3472
-#: ../libpurple/protocols/silc/silc.c:2139
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:811
 msgid "Connect server"
 msgstr "Server de conectare"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "Servere proxy pentru transfer de fişiere"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s a părăsit discuţia."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Mesaj de la %s"
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a schimbat subiectul în: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Topicul este: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Trimiterea mesajului către %s a eşuat: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Eroare de mesaj XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:408
-#, c-format
-msgid " (Code %s)"
+#, fuzzy, c-format
+msgid "(Code %s)"
 msgstr " (Cod %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Eroare la analiza XML"
 
-#: ../libpurple/protocols/jabber/presence.c:453
 msgid "Unknown Error in presence"
 msgstr "Eroare necunoscută în starea de prezenţă"
 
-#: ../libpurple/protocols/jabber/presence.c:534
-#: ../libpurple/protocols/jabber/presence.c:535
 msgid "Create New Room"
 msgstr "Creează o nouă cameră de chat"
 
-#: ../libpurple/protocols/jabber/presence.c:536
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6527,88 +4600,66 @@ msgstr ""
 "Sunteţi pe cale să creaţi o nouă cameră de chat. Doriţi să o configuraţi sau "
 "acceptaţi opţiunile implicite?"
 
-#: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
 msgstr "_Configurare cameră de chat"
 
-#: ../libpurple/protocols/jabber/presence.c:543
 msgid "_Accept Defaults"
 msgstr "_Opţiuni implicite"
 
-#: ../libpurple/protocols/jabber/presence.c:585
-#, c-format
-msgid "Error in chat %s"
-msgstr "Eroare în camera de chat %s"
-
-#: ../libpurple/protocols/jabber/presence.c:589
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Eroare la intrarea în camera de chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:1013
+#, c-format
+msgid "Error in chat %s"
+msgstr "Eroare în camera de chat %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Nu se poate trimite fişierul către %s, nu suportă transferul de fişiere"
 
-#: ../libpurple/protocols/jabber/si.c:1014
-#: ../libpurple/protocols/jabber/si.c:1015
-#: ../libpurple/protocols/jabber/si.c:1084
 msgid "File Send Failed"
 msgstr "Trimiterea fişierului a eşuat"
 
-#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Nu se poate trimite fişierul către %s, JID invalid"
 
-#: ../libpurple/protocols/jabber/si.c:1079
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Nu se poate trimite fişierul către %s, contactul nu este conectat"
 
-#: ../libpurple/protocols/jabber/si.c:1081
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "Nu se poate trimite fişierul către %s, nu e subscris pentru prezenţă"
 
-#: ../libpurple/protocols/jabber/si.c:1096
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 "Precizaţi cărei resurse a contactului %s doriţi să-i trimiteţi fişierul"
 
-#: ../libpurple/protocols/jabber/si.c:1112
 msgid "Select a Resource"
 msgstr "Selectaţi o resursă"
 
-#: ../libpurple/protocols/jabber/usermood.c:194
-#: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
 msgstr "Editare dispoziţie utilizator"
 
-#: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
 msgstr "Selectaţi dispoziţia de moment din listă."
 
-#: ../libpurple/protocols/jabber/usermood.c:198
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Utilizare"
 
-#: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
 msgstr "Alegere dispoziţie..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Introducere pseudonim utilizator"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Setaţi-vă un nou pseudonim."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -6616,30 +4667,22 @@ msgstr ""
 "Această informaţie este vizibilă tuturor contactelor, aşa că e preferabil să "
 "alegeţi un pseudonim decent"
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Introducere pseudonim..."
 
-#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Actions"
 msgstr "Acţiune"
 
-#: ../libpurple/protocols/jabber/xdata.c:383
 msgid "Select an action"
 msgstr "Selectaţi o acţiune"
 
-#: ../libpurple/protocols/msn/contact.c:782
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Nu s-a putut descărca cartea de adrese MSN"
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Probleme de sincronizare a liste de contacte în %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6648,8 +4691,6 @@ msgstr ""
 "%s din grupul „%s” e în lista contactelor, dar nu este în lista de pe "
 "server. Doriţi să adăugaţi acest contact?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6658,336 +4699,261 @@ msgstr ""
 "%s este în lista contactelor, dar nu şi în lista de pe server. Doriţi să "
 "adăugaţi acest contact?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Nu se poate prelucra mesajul"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Eroare de sintaxă (probabil o eroare de client)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr "Adresă de mail invalidă"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Utilizator inexistent"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Lipseşte numele complet al domeniului"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
-msgstr "Deja autentificat(ă)"
+msgstr "Deja autentificat"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
+#, c-format
 msgid "Invalid username"
 msgstr "Nume invalid de utilizator"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Pseudonimul propriu este invalid"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Listă plină"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Există deja"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Nu este în listă"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:760
+#, c-format
 msgid "User is offline"
 msgstr "Utilizatorul este deconectat"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Sunteţi deja în respectiva stare"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Există deja în cealaltă listă"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Prea multe grupuri"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Grup invalid"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Utilizatorul nu este în grup"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Nume de grup prea lung"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nu se poate şterge grupul zero"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "S-a încercat adăugarea unui contact într-un grup inexistent"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Comutare eşuată"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Notificarea transferului a eşuat"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Lipsesc unele câmpuri cerute"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Prea multe solicitări către FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:121
+#, c-format
 msgid "Not logged in"
-msgstr "Neautentificat(ă)"
+msgstr "Neautentificat"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Serviciu temporar indisponibil"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Eroare a serverului bazei de date"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Comandă dezactivată"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Eroare la manipularea fişierului"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Eroare la alocarea memoriei"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "O valoare CHL greşită a fost trimisă către server"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Server ocupat"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Server indisponibil"
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Serverul de notificare a contactelor este indisponibil"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Eroare la conectarea la baza de date"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Serverul va fi în curând indisponibil"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Eroare la stabilirea conexiunii"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametrii CVR sunt necunoscuţi sau nu sunt permişi"
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Nu se poate scrie"
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Sesiune supraîncărcată"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Utilizatorul este prea activ"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Prea multe sesiuni"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Cont „Passport” neverificat"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Fişier invalid"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Neaşteptat"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Pseudonimul a fost schimbat prea rapid"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Server prea încărcat"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1422
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
+#, c-format
 msgid "Authentication failed"
 msgstr "Autentificare eşuată"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Permis doar la autentificare"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Nu acceptă utilizatori noi"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Cont „Kids Passport” fără aprobare de la părinţi"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Cont „Passport” neverificat încă"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Bilet (ticket) greşit"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Cod de eroare necunoscut %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Eroare MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Buzz"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s v-a dat „buzz”!"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "„Buzz” la %s..."
 
-#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
+msgid "Email Address..."
+msgstr "Adresă de mail..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Noul pseudonim propriu MSN este prea lung."
 
-#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Alegeţi-vă un pseudonim propriu."
 
-#: ../libpurple/protocols/msn/msn.c:297 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Acesta este numele sub care veţi fi cunoscuţi de contactele MSN."
 
-#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Introduceţi numărul telefonului de acasă."
 
-#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Introduceţi numărul telefonului de la serviciu."
 
-#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Introduceţi numărul telefonului mobil."
 
-#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "Permit pagini „MSN Mobile”?"
 
-#: ../libpurple/protocols/msn/msn.c:365 ../libpurple/protocols/msnp9/msn.c:348
 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?"
@@ -6995,69 +4961,52 @@ msgstr ""
 "Vreţi să permiteţi persoanelor din lista de contacte să trimită pagini „MSN "
 "Mobile” către telefonul dumneavoastră mobil sau alte dispozitive portabile?"
 
-#: ../libpurple/protocols/msn/msn.c:371 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Permite"
 
-#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Refuză"
 
-#: ../libpurple/protocols/msn/msn.c:388 ../libpurple/protocols/msnp9/msn.c:371
-msgid "This Hotmail account may not be active."
-msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Text blocat pentru %s"
+
+msgid "No text is blocked for this account."
+msgstr "Nici un text nu este blocat pentru acest cont."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"Serverele MSN blochează în acest moment următoarele expresii regulare:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Acest cont nu are activat mailul."
 
-#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Trimiteţi un mesaj mobil."
 
-#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Pagină"
 
-#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "Număr de telefon acasă"
 
-#: ../libpurple/protocols/msn/msn.c:683 ../libpurple/protocols/msnp9/msn.c:571
 msgid "Work Phone Number"
 msgstr "Număr de telefon la serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msnp9/msn.c:575
 msgid "Mobile Phone Number"
 msgstr "Număr de telefon mobil"
 
-#: ../libpurple/protocols/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:594
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Be Right Back"
 msgstr "Vin imediat"
 
-#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:598
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "Busy"
-msgstr "Ocupat(ă)"
+msgstr "Ocupat"
 
-#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../libpurple/protocols/yahoo/yahoo.c:3842
 msgid "On the Phone"
 msgstr "La telefon"
 
-#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3148
-#: ../libpurple/protocols/yahoo/yahoo.c:3848
 msgid "Out to Lunch"
 msgstr "La masă"
 
@@ -7067,338 +5016,188 @@ msgstr "La masă"
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:745
-#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Artist"
 
-#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Introducere pseudonim..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Introducere număr telefon acasă..."
 
-#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Introducere număr telefon serviciu..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Introducere număr telefon mobil..."
 
-#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "(Dez)Activare dispozitive mobile..."
 
-#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitere/Refuzare pagini mobile..."
 
-#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
+msgid "View Blocked Text..."
+msgstr "Vizualizare text blocat..."
+
 msgid "Open Hotmail Inbox"
 msgstr "Deschidere mail Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Trimite către mobil"
 
-#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
-#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Iniţiază o _discuţie"
 
-#: ../libpurple/protocols/msn/msn.c:871 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Pentru MSN aveţi nevoie de suport SSL. Instalaţi bibliotecile SSL necesare. "
 
-#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "Conectarea la server a eşuat."
 
-#: ../libpurple/protocols/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
-#: ../libpurple/protocols/msnp9/msn.c:1526
-#: ../libpurple/protocols/msnp9/msn.c:1869
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Eroare la descărcarea profilului"
 
-#: ../libpurple/protocols/msn/msn.c:1751
-#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Generale"
 
-#: ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msnp9/msn.c:1599
-#: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
 msgid "Age"
 msgstr "Vârstă"
 
-#: ../libpurple/protocols/msn/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1601
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
 msgid "Occupation"
 msgstr "Ocupaţie"
 
-#: ../libpurple/protocols/msn/msn.c:1761
-#: ../libpurple/protocols/msnp9/msn.c:1602
-#: ../libpurple/protocols/myspace/user.c:133
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
-#: ../libpurple/protocols/zephyr/zephyr.c:802
-#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Loc"
 
-#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
-#: ../libpurple/protocols/msnp9/msn.c:1607
-#: ../libpurple/protocols/msnp9/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1812
 msgid "Hobbies and Interests"
 msgstr "Hobby-uri şi domenii de interes"
 
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
-#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
-#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msnp9/msn.c:1613
-#: ../libpurple/protocols/msnp9/msn.c:1733
-#: ../libpurple/protocols/msnp9/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1754
-#: ../libpurple/protocols/msnp9/msn.c:1761
 msgid "A Little About Me"
 msgstr "Câteva cuvinte despre mine"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1791
-#: ../libpurple/protocols/msnp9/msn.c:1632
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Marital Status"
 msgstr "Status marital"
 
-#: ../libpurple/protocols/msn/msn.c:1792
-#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "Domenii de interes"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "Animale de casă"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "Localitate natală"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "Foste domicilii"
 
-#: ../libpurple/protocols/msn/msn.c:1796
-#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "Modă"
 
-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "Umor"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Music"
 msgstr "Muzică"
 
-#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msn/msn.c:1986
-#: ../libpurple/protocols/msnp9/msn.c:1640
-#: ../libpurple/protocols/msnp9/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
 msgid "Favorite Quote"
 msgstr "Citat preferat"
 
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Contact Info"
 msgstr "Detalii contact"
 
-#: ../libpurple/protocols/msn/msn.c:1817
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal"
 msgstr "Personale"
 
-#: ../libpurple/protocols/msn/msn.c:1820
-#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "Partener"
 
-#: ../libpurple/protocols/msn/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "Telefon acasă"
 
-#: ../libpurple/protocols/msn/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "Telefon acasă 2"
 
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1664
-#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Home Address"
 msgstr "Adresă acasă"
 
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "Mobil privat"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "Fax acasă"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal Email"
 msgstr "Mail privat"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "IM privat"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "Aniversare"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "Serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1847
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/silc/ops.c:1024
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Titlu"
 
-#: ../libpurple/protocols/msn/msn.c:1848
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Company"
 msgstr "Companie"
 
-#: ../libpurple/protocols/msn/msn.c:1849
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departament"
 
-#: ../libpurple/protocols/msn/msn.c:1850
-#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "Profesie"
 
-#: ../libpurple/protocols/msn/msn.c:1851
-#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "Telefon serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1852
-#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "Telefon serviciu 2"
 
-#: ../libpurple/protocols/msn/msn.c:1853
-#: ../libpurple/protocols/msnp9/msn.c:1694
-#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Work Address"
 msgstr "Adresă serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1854
-#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "Mobil serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1855
-#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "Pager serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1856
-#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "Fax serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1857
-#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Email"
 msgstr "Mail serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "IM serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1859
-#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "Începând cu:"
 
-#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Favorite Things"
 msgstr "Lucruri favorite"
 
-#: ../libpurple/protocols/msn/msn.c:1994
-#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "Ultima actualizare"
 
-#: ../libpurple/protocols/msn/msn.c:2005
-#: ../libpurple/protocols/msnp9/msn.c:1846
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1040
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Pagină personală"
 
-#: ../libpurple/protocols/msn/msn.c:2029
-#: ../libpurple/protocols/msnp9/msn.c:1870
 msgid "The user has not created a public profile."
 msgstr "Utilizatorul nu şi-a creat un profil public."
 
-#: ../libpurple/protocols/msn/msn.c:2030
-#: ../libpurple/protocols/msnp9/msn.c:1871
 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 "
@@ -7408,8 +5207,6 @@ msgstr ""
 "înseamnă că utilizatorul fie nu există, fie există, dar nu şi-a creat un "
 "profil public."
 
-#: ../libpurple/protocols/msn/msn.c:2034
-#: ../libpurple/protocols/msnp9/msn.c:1875
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7417,9 +5214,6 @@ msgstr ""
 "Nu s-a găsit nici o informaţie în profilul utilizatorului. Probabil că "
 "utilizatorul nu există."
 
-#: ../libpurple/protocols/msn/msn.c:2042
-#: ../libpurple/protocols/msnp9/msn.c:1883
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "Adresă profil"
 
@@ -7433,130 +5227,81 @@ msgstr "Adresă profil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Modul de protocol Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2366
-#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Utilizează metoda HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2371
-#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "Server pentru metoda HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2376
-#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Arată iconiţe simbolice personalizate"
 
-#: ../libpurple/protocols/msn/msn.c:2384
-#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:  Sâcâiţi un utilizator pentru a-i atrage atenţia"
 
-#: ../libpurple/protocols/msn/nexus.c:71
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Autentificare Windows Live ID: Conectare eşuată"
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:124
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Autentificare Windows Live ID: nu s-a găsit un „token” de autentificare în "
-"răspunsul de la server"
-
-#: ../libpurple/protocols/msn/nexus.c:171
-msgid "Windows Live ID authentication Failed"
-msgstr "Autentificarea Windows Live ID a eşuat!"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Autentificare Windows Live ID: Răspuns invalid"
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s nu este un nume valid de grup."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:935
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Eroare necunoscută."
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:513
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vă sâcâie cu un „nudge”!"
 
-#: ../libpurple/protocols/msn/notification.c:840
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Eroare necunoscută (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:841
-#: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "Nu se poate adăuga utilizatorul"
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Nu se poate adăuga utilizatorul în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Nu se poate bloca utilizatorul în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:909
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Nu se poate permite utilizatorul în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:917
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s nu a putut fi adăugat pentru că lista de contacte vă e plină."
 
-#: ../libpurple/protocols/msn/notification.c:926
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s nu este un nume de cont „passport” valid."
 
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Serviciu temporar indisponibil."
 
-#: ../libpurple/protocols/msn/notification.c:1336
-#: ../libpurple/protocols/msnp9/notification.c:898
+msgid "Mobile message was not sent because it was too long."
+msgstr "Mesajul mobil nu a fost trimis pentru era prea lung."
+
 msgid "Unable to rename group"
 msgstr "Grupul nu poate fi redenumit"
 
-#: ../libpurple/protocols/msn/notification.c:1391
-#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "Grupul nu poate fi şters"
 
-#: ../libpurple/protocols/msn/notification.c:2008
-#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7589,40 +5334,32 @@ msgstr[2] ""
 "\n"
 "Veţi putea să vă autentificaţi din nou după încheierea operaţiunii."
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Mesajul nu a fost trimis pentru că sistemul este indisponibil. Asta se "
+"întâmplă de regulă când utilizatorul este blocat ori nu există."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Mesajul nu a fost trimis pentru că se trimit mesaje prea repede."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"Mesajul nu a fost trimis pentru că a apărut o eroare necunoscută de codare."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Mesajul nu a fost trimis pentru că apărut o eroare necunoscută."
+
 msgid "Unable to connect"
 msgstr "Conectare eşuată"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Eroare la scriere"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Eroare la citire"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7631,121 +5368,73 @@ msgstr ""
 "Eroare de conectare de la serverul %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "Protocolul utilizat nu este suportat de către server."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Eroare la prelucrarea datelor HTTP."
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "V-aţi autentificat din altă parte."
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Serverele MSN sunt temporar indisponibile. Reîncercaţi mai târziu."
 
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "Serverele MSN vor fi oprite momentan."
 
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Autentificare eşuată: %s"
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Lista contactelor MSN este momentan indisponibilă. Încercaţi mai târziu."
 
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Sincronizare"
 
-#: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Transfer"
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Iniţiere autentificare"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Obţinere cookie"
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Trimitere cookie"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Se descarcă lista de contacte"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
-msgstr "Absent(ă) din faţa calculatorului"
+msgstr "Absent din faţa calculatorului"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "La telefon"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "La masă"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "E posibil ca mesajul să nu fi fost trimis din cauza unui time-out:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Mesajul nu a putut fi trimis, nu se permite acest lucru în invizibilitate:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:423
 msgid "Message could not be sent because the user is offline:"
 msgstr "Mesajul nu a putut fi trimis pentru că utilizatorul este deconectat:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:427
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Mesajul nu a putut fi trimis din cauza unei erori de conectare:"
 
-#: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Mesajul nu a putut fi trimis pentru că se trimit prea multe date:"
 
-#: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:435
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7754,26 +5443,18 @@ msgstr ""
 "comunicare cu serverul. Aceasta este probabil o problemă de server, "
 "reîncercaţi în câteva minute:"
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:442
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Mesajul nu a putut fi trimis din cauza unei erori de comutare:"
 
-#: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:450
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "E posibil ca mesajul să nu fi fost trimis din cauza unei erori necunoscute:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s v-a adăugat în lista sa de contacte."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s v-a şters din lista sa de contacte."
@@ -7781,18 +5462,16 @@ msgstr "%s v-a şters din lista sa de contacte."
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:713
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "„%s” nu poate fi adăugat."
 
-#: ../libpurple/protocols/msn/userlist.c:716
-#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The username specified is invalid."
 msgstr "Numele de utilizator specificat este invalid."
 
-#: ../libpurple/protocols/msnp9/msn.c:546
+msgid "This Hotmail account may not be active."
+msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
+
 msgid "Has you"
 msgstr "Vă are în listă"
 
@@ -7806,20 +5485,15 @@ msgstr "Vă are în listă"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2170
-#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "Modul de protocol MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Cifru lipsă"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "Nu s-a găsit cifrul RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
@@ -7827,79 +5501,63 @@ msgstr ""
 "Actualizaţi libpurple pentru suport RC4 (versiune >= 2.0.1). Modulul "
 "MySpaceIM nu va încărcat."
 
-#: ../libpurple/protocols/myspace/myspace.c:345
-#, fuzzy
 msgid "Reading challenge"
-msgstr "Eroare la citire"
+msgstr "Se citeşte răspunsul"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "Cerere invalidă de la server"
+msgstr "Cerere neaşteptat de lungă de la server"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
 msgid "Logging in"
-msgstr "Înregistrare"
+msgstr "Autentificare..."
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "S-a pierdut conexiunea la server (nu s-au primit date de o secundă)"
+msgstr[1] ""
+"S-a pierdut conexiunea la server (nu s-au primit date de %d secunde)"
+msgstr[2] ""
+"S-a pierdut conexiunea la server (nu s-au primit date de %d de secunde)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1374
-#, fuzzy
 msgid "New mail messages"
-msgstr "Trimite un mesaj"
+msgstr "Mailuri noi"
 
-#: ../libpurple/protocols/myspace/myspace.c:1375
 msgid "New blog comments"
-msgstr ""
+msgstr "Comentarii noi pe blog"
 
-#: ../libpurple/protocols/myspace/myspace.c:1376
 msgid "New profile comments"
-msgstr ""
+msgstr "Comentarii noi în profil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New friend requests!"
-msgstr ""
+msgstr "Noi cereri de împrietenire!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New picture comments"
-msgstr ""
+msgstr "Noi comentarii la poze"
 
-#: ../libpurple/protocols/myspace/myspace.c:1408
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1594
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "Fără nume"
+msgstr "MySoaceIM - Fără nume"
 
-#: ../libpurple/protocols/myspace/myspace.c:1595
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "Se pare că nu aveţi un nume de utilizator MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1596
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
+"Doriţi să vă alegeţi unul acum? (Atenţie: ACESTA NU MAI POATE FI SCHIMBAT!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1620
-#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
-msgstr "Conectat(ă)"
+msgstr "Conectat"
 
-#: ../libpurple/protocols/myspace/myspace.c:1855
-#, fuzzy, c-format
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Procesul a returnat codul de eroare %d"
+msgstr "Eroare de protocol, codul %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1877
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7907,212 +5565,162 @@ msgid ""
 "myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
 "again."
 msgstr ""
+"%s Aveţi o parolă de %d caractere, mai mare decât lungimea maximă de %d în "
+"MySpaceIM. E necesar să introduceţi o parolă mai scurtă la http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"şi să încercaţi din onu."
 
-#: ../libpurple/protocols/myspace/myspace.c:1900
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "Eroare MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
-#: ../libpurple/protocols/myspace/myspace.c:2112
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "Intrarea în chat alături de acest contact a eşuat"
+msgstr "Adăugarea contactului a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2078
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "Încarcă lista de contacte din fişierul..."
+msgstr "Comanda „addbuddy” a eşuat."
 
-#: ../libpurple/protocols/myspace/myspace.c:2112
-#: ../libpurple/protocols/myspace/myspace.c:2357
-#, fuzzy
 msgid "persist command failed"
-msgstr "Comutare eşuată"
+msgstr "Comanda „persist” a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2217
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "Nu există utilizatorul %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2219
-#, fuzzy
 msgid "User lookup"
-msgstr "Camere de chat utilizatori"
+msgstr "Căutare utilizator"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2357
-#: ../libpurple/protocols/myspace/myspace.c:2379
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "Intrarea în chat alături de acest contact a eşuat"
+msgstr "Ştergerea contactului a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2338
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "Comanda „delbuddy” a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2379
-#, fuzzy
 msgid "blocklist command failed"
-msgstr "Comutare eşuată"
+msgstr "Comanda „blocklist” a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2493
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "Finalizare conexiune"
+msgstr "Condiţie de intrare invalidă"
 
-#: ../libpurple/protocols/myspace/myspace.c:2548
-#, fuzzy
 msgid "Read buffer full (2)"
-msgstr "Coadă plină"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2591
 #, fuzzy
 msgid "Unparseable message"
 msgstr "Nu se poate prelucra mesajul"
 
-#: ../libpurple/protocols/myspace/myspace.c:2662
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Conectarea la server a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2840
 #, fuzzy
 msgid "IM Friends"
 msgstr "Ferestrele de _discuţii"
 
-#: ../libpurple/protocols/myspace/myspace.c:2940
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2941
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "Răspuns invalid de la server."
 
-#: ../libpurple/protocols/myspace/myspace.c:2993
-#: ../libpurple/protocols/myspace/myspace.c:3057
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2994
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "activarea modulului a eşuat"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3050
 #, fuzzy
 msgid "Find people..."
 msgstr "Căutare contacte..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3053
 #, fuzzy
 msgid "Change IM name..."
 msgstr "Schimbare parolă..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3354
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3355
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3356
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3479
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3482
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3487
 #, fuzzy
 msgid "Send emoticons"
 msgstr "Opţiuni sunet"
 
-#: ../libpurple/protocols/myspace/myspace.c:3492
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3495
 #, fuzzy
 msgid "Base font size (points)"
 msgstr "Font mai mare"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:790
-#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Utilizator"
 
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:138
 #, fuzzy
 msgid "Headline"
 msgstr "A_dministrare:"
 
-#: ../libpurple/protocols/myspace/user.c:153
 #, fuzzy
 msgid "Song"
 msgstr "Sunete"
 
-#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:180
 #, fuzzy
 msgid "Client Version"
 msgstr "Încheie discuţia"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:570
 #, fuzzy
 msgid "No username set"
 msgstr "Fără nume"
 
-#: ../libpurple/protocols/myspace/user.c:577
-#: ../libpurple/protocols/myspace/user.c:671
 msgid "MySpaceIM - Please Set a Username"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:578
 msgid "Please enter a username to check its availability:"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:658
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Serviciu indisponibil"
 
-#: ../libpurple/protocols/myspace/user.c:659
 #, fuzzy
 msgid "This username is available. Would you like to set it?"
 msgstr ""
 "%s a trimis un mesaj pentru „whiteboard”. Doriţi să deschid un „whiteboard”?"
 
-#: ../libpurple/protocols/myspace/user.c:660
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:672
 #, fuzzy
 msgid "This username is unavailable."
 msgstr "Această temă nu are iconiţe disponibile."
 
-#: ../libpurple/protocols/myspace/user.c:673
 #, fuzzy
 msgid "Please try another username:"
 msgstr "Introduceţi noul nume pentru %s"
@@ -8123,32 +5731,25 @@ msgstr "Introduceţi noul nume pentru %s"
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:48
-#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, fuzzy, c-format
 msgid "%s has zapped you!"
 msgstr "%s v-a adăugat [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr ""
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, fuzzy, c-format
 msgid "%s has whacked you!"
 msgstr "%s v-a adăugat [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr ""
@@ -8156,79 +5757,64 @@ msgstr ""
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:58
 #, fuzzy
 msgid "Torch"
 msgstr "Topic"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, fuzzy, c-format
 msgid "%s has torched you!"
 msgstr "Utilizatorul v-a blocat"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr ""
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, fuzzy, c-format
 msgid "%s has smooched you!"
 msgstr "%s s-a autentificat."
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:66
 #, fuzzy, c-format
 msgid "%s has hugged you!"
 msgstr "%s s-a autentificat."
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr ""
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:70
 #, fuzzy
 msgid "Slap"
-msgstr "Adormit(ă)"
+msgstr "Adormit"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy, c-format
 msgid "%s has slapped you!"
 msgstr "%s v-a adăugat [%s]"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:74
 #, fuzzy
 msgid "Goose"
 msgstr "Dus"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, fuzzy, c-format
 msgid "%s has goosed you!"
 msgstr "%s a intrat în absenţă."
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, fuzzy, c-format
 msgid "Goosing %s..."
 msgstr "Caut %s"
@@ -8236,16 +5822,13 @@ msgstr "Caut %s"
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, fuzzy, c-format
 msgid "%s has high-fived you!"
 msgstr "%s s-a autentificat."
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
@@ -8253,16 +5836,13 @@ msgstr ""
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Ţeapă"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s v-a ţepuit!."
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Ţeapă pentru %s..."
@@ -8274,101 +5854,77 @@ msgstr "Ţeapă pentru %s..."
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Limbă scoasă"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s v-a arătat limba scoasă!"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Limbă scoasă la %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Parametrii ceruţi nu au fost precizaţi"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Nu se poate scrie în reţea"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Nu se poate citi din reţea"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Eroare de comunicare cu serverul"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Conferinţa nu a fost găsită"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Conferinţa nu există"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Un director cu acest nume există deja"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Nesuportat"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Parola a expirat"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Parolă greşită"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Utilizatorul nu a fost găsit"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Contul a fost dezactivat"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Serverul nu a putut accesa directorul"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Administratorul de sistem a dezactivat această operaţiune"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Serverul este indisponibil, încercaţi din nou mai tărziu"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Nu se poate adăuga de două ori un contact în acelaşi director"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Nu vă puteţi adăuga propria identitate"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Arhiva principală este configurată greşit"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect username or password"
 msgstr "Nume de utilizator sau parolă incorecte."
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nu s-a putut recunoaşte serverul din numele de utilizator introdus"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -8376,31 +5932,24 @@ msgstr ""
 "Contul v-a fost dezactivat deoarece au fost introduse prea multe parole "
 "greşite"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Nu puteţi adăuga aceeaşi persoană de două ori într-o conversaţie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Aţi atins numărul maxim permis de contacte"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect username"
 msgstr "Aţi introdus un nume greşit de utilizator"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "A apărut o eroare la actualizarea directorului"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Versiune incompatibilă de protocol"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Utilizatorul v-a blocat"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -8408,56 +5957,45 @@ msgstr ""
 "Această versiune de evaluare nu permite mai mult de zece utilizatori "
 "autentificaţi în acelaşi timp"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Utilizatorul este deconectat sau sunteţi blocat(ă)"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Eroare necunoscută: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Autentificare eşuată (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Mesajul nu poate fi trimis. Nu se pot obţine detalii pentru acest utilizator "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "„%s” nu poate fi adăugat în lista de contacte (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Nu se poate trimite mesajul (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Utilizatorul nu poate fi invitat (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Nu se poate trimite mesajul către %s. Nu se poate crea conferinţa (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Nu se poate trimite mesajul. Nu se poate crea conferinţa (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8466,71 +6004,54 @@ msgstr ""
 "Utilizatorul %s nu poate fi mutat în directorul %s în lista de pe server. "
 "Eroare la crearea directorului (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"„%s” nu poate fi adăugat(ă) în lista de contacte. Eroare la crearea "
+"„%s” nu poate fi adăugat în lista de contacte. Eroare la crearea "
 "directorului în lista de pe server (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Nu se pot obţine detalii despre utilizatorul %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Utilizatorul nu poate fi adăugat în lista privată (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "„%s” nu poate fi adăugat(ă) în lista celor blocaţi (%s)."
+msgstr "„%s” nu poate fi adăugat în lista celor blocaţi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "„%s” nu poate fi adăugat în lista celor permişi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "„%s” nu poate fi şters din lista privată (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Nu se pot schimba opţiunile private pe server (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Nu se poate crea o conferinţă (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Eroare de comunicare cu serverul. Conexiunea va fi închisă."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Titlu"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4178
 msgid "User ID"
 msgstr "ID utilizator"
 
@@ -8540,37 +6061,29 @@ msgstr "ID utilizator"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nume complet"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferinţă GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Conectarea la server a eşuat."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Se aşteaptă un răspuns..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s a fost invitat în această discuţie."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Invitaţie într-o discuţie"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8581,22 +6094,18 @@ msgstr ""
 "\n"
 "Către: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Doriţi să vă alăturaţi discuţiei?"
 
-#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Aţi fost deconectat(ă) pentru că v-aţi autentificat de pe o altă staţie."
 
-#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s pare să fie deconectat(ă) şi nu a primit mesajul ce i l-aţi trimis."
+msgstr "%s pare să fie deconectat şi nu a primit mesajul ce i l-aţi trimis."
 
-#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8604,11 +6113,10 @@ msgstr ""
 "Conectarea la server a eşuat. Introduceţi adresa serverului la care doriţi "
 "să vă conectaţi."
 
-#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Eroare: suportul SSL nu este instalat."
 
-#: ../libpurple/protocols/novell/novell.c:2522
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Această conferinţă a fost închisă. Nu mai pot fi trimise mesaje."
 
@@ -8622,41 +6130,24 @@ msgstr "Această conferinţă a fost închisă. Nu mai pot fi trimise mesaje."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3536
-#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Modul de protocol Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Adresă server"
 
-#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Port server"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:62
 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra în camera de chat"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Invalid chat room name"
 msgstr "Nume invalid de cameră de chat"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2505
-#: ../libpurple/protocols/yahoo/yahoo.c:2673
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
-#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
-#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
 msgid "Server closed the connection."
 msgstr "Serverul a închis conexiunea."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
-#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
-#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8665,10 +6156,6 @@ msgstr ""
 "S-a pierdut conexiunea cu serverul:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:401
-#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
-#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
-#: ../libpurple/proxy.c:1554
 msgid "Received invalid data on connection with server."
 msgstr "S-au primit date invalide de la server."
 
@@ -8682,8 +6169,6 @@ msgstr "S-au primit date invalide de la server."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Modul de protocol AIM"
 
@@ -8697,43 +6182,31 @@ msgstr "Modul de protocol AIM"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Modul de protocol ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4456
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "Codare"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Utilizatorul la distanţă a închis conexiunea."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Utilizatorul la distanţă v-a refuzat cererea."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "S-a pierdut conexiunea cu utilizatorul la distanţă:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "S-au primit date invalide la conectarea la utilizatorul la distanţă."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Nu s-a putut deschide o conexiune cu utilizatorul la distanţă."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Discuţia directă a fost iniţializată"
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
@@ -8743,108 +6216,82 @@ msgstr ""
 "de fişiere mai mici de %s în discuţiile directe. Încercaţi transferul de "
 "fişiere.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Fişierul %s are %s, care depăşeşte mărimea maximă de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Eroare invalidă"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "SNAC invalid"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Limitare către server"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Limitare către client"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Serviciu indisponibil"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Serviciu nedefinit"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "SNAC învechit"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "Nesuportat de către server"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "Nesuportat de către client"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Refuzat de către client"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Răspuns supradimensionat"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "Răspunsuri pierdute"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "Cerere respinsă"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Încărcătură SNAC invalidă"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Drepturi insuficiente"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "În lista permişi/refuzaţi locală"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (sender)"
-msgstr "Prea periculos (expeditorul)"
+msgid "Warning level too high (sender)"
+msgstr "Nivel de avertizare prea ridicat (pentru expeditor)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
-msgid "Too evil (receiver)"
-msgstr "Prea periculos (destinatarul)"
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de avertizare prea ridicat (pentru destinatar)"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "Utilizatorul este temporar indisponibil."
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "Nici o potrivire"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "Listă suprasaturată"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Cerere ambiguă"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Coadă plină"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "Nu (cât timp e pe AOL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:349
 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 "
@@ -8856,7 +6303,6 @@ msgstr ""
 "codare este aceasta, o puteţi specifica în opţiunile avansate ale contului "
 "AIM/ICQ utilizat.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8866,135 +6312,101 @@ msgstr ""
 "potriveşte cu cea aleasă de %s sau %s utilizează un client problematic)."
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2446
-#: ../pidgin/gtkutils.c:2476
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "Avatar"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "Voce"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "Discuţie directă AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
-#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "Get File"
 msgstr "Ia fişierul"
 
-#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "Jocuri"
 
-#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "Adăugiri"
 
-#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "Trimite lista de contacte"
 
-#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "Conectare directă ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "Utilizator AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "Schimb de server ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "UTF8 ICQ (vechi)"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "Criptare Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "UTF8 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "Securitate activată"
 
-#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "Videochat"
 
-#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "Video în direct"
 
-#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "Cameră"
 
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5895
+msgid "Screen Sharing"
+msgstr "Partajare ecran"
+
+#, c-format
 msgid "Free For Chat"
-msgstr "Disponibil(ă)"
+msgstr "Disponibil"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#, c-format
 msgid "Not Available"
-msgstr "Indisponibil(ă)"
+msgstr "Indisponibil"
 
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5916
+#, c-format
 msgid "Occupied"
-msgstr "Ocupat(ă)"
+msgstr "Ocupat"
 
-#: ../libpurple/protocols/oscar/oscar.c:736
+#, c-format
 msgid "Web Aware"
-msgstr "Prezent(ă) online"
+msgstr "Prezent online"
 
-#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1089
+#, c-format
 msgid "Invisible"
-msgstr "Invizibil(ă)"
+msgstr "Invizibil"
 
-#: ../libpurple/protocols/oscar/oscar.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3746
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1210
 msgid "IP Address"
 msgstr "Adresă IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:846
-#: ../libpurple/protocols/oscar/oscar.c:2947
 msgid "Warning Level"
 msgstr "Nivel de avertizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "Comentariu contact"
 
-#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -9003,7 +6415,6 @@ msgstr ""
 "Conectarea pentru serverul de autentificare a eşuat:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -9012,20 +6423,16 @@ msgstr ""
 "Conectarea la serverul BOS a eşuat:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1044
 msgid "Username sent"
 msgstr "S-a trimit numele de utilizator"
 
-#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "Conexiune iniţializată, cookie trimis"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "Finalizare conexiune"
 
-#: ../libpurple/protocols/oscar/oscar.c:1306
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the username is invalid.  "
@@ -9038,32 +6445,22 @@ msgstr ""
 "spaţii sau să conţină doar numere."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1392
-#: ../libpurple/protocols/yahoo/yahoo.c:2127
 msgid "Invalid username."
 msgstr "Nume invalid de utilizator"
 
-#: ../libpurple/protocols/oscar/oscar.c:1398
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "Parolă incorectă."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "Contul dumneavoastră este momentan suspendat."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1410
-#: ../libpurple/protocols/oscar/oscar.c:1419
 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."
@@ -9071,44 +6468,31 @@ msgstr ""
 "V-aţi conectat şi deconectat prea des. Aşteptaţi zece minute şi încercaţi "
 "din nou. Dacă continuaţi să încercaţi, va trebui să aşteptaţi mai mult."
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versiunea clientului folosit este prea veche. Actualizaţi-l la %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "Conectare eşuată"
 
-#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "Autorizarea a fost primită"
 
-#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "Cheia SecurID introdusă este invalidă."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "Introducere SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1493
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduceţi numărul de şase cifre afişat digital."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2337
-#: ../libpurple/protocols/oscar/oscar.c:6000
-#: ../libpurple/protocols/oscar/oscar.c:6282 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9117,58 +6501,42 @@ msgstr ""
 "S-ar putea să fiţi rapid deconectat(ă). Poate doriţi să încercaţi TOC până "
 "ce se rezolvă această problemă. Vizitaţi %s pentru actualizări."
 
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nu s-a putut obţine un hash valid pentru autentificarea AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1578
-#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "S-ar putea să fiţi în scurt timp deconectat(ă). Vizitaţi %s pentru "
 "actualizări."
 
-#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "Nu s-a putut obţine un hash valid pentru autentificare."
 
-#: ../libpurple/protocols/oscar/oscar.c:1710
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Parola a fost trimisă"
 
-#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "Nu se poate iniţializa o nouă conexiune"
 
-#: ../libpurple/protocols/oscar/oscar.c:2258
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
 "contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
 msgid "Authorization Request Message:"
 msgstr "Mesaj cerere de autorizare:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2288
 msgid "Please authorize me!"
 msgstr "Am nevoie de autorizare..."
 
-#: ../libpurple/protocols/oscar/oscar.c:2328
-#: ../libpurple/protocols/oscar/oscar.c:2336
-#: ../libpurple/protocols/oscar/oscar.c:2463
-#: ../libpurple/protocols/oscar/oscar.c:5372
-#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Fără motiv."
 
-#: ../libpurple/protocols/oscar/oscar.c:2335
 msgid "Authorization Denied Message:"
 msgstr "Mesajul de autorizare refuzată:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2463
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9179,18 +6547,15 @@ msgstr ""
 "motivând astfel:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2464
 msgid "ICQ authorization denied."
 msgstr "Autorizarea ICQ a fost refuzată."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2471
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Utilizatorul %u v-a acordat dreptul de a-l adăuga la lista de contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:2479
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9203,7 +6568,6 @@ msgstr ""
 "Expeditor: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9216,7 +6580,6 @@ msgstr ""
 "Expeditor: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9229,24 +6592,19 @@ msgstr ""
 "Mesajul este:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2516
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Utilizatorul ICQ %u v-a trimis un contact: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2522
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Doriţi să adăugaţi acest contact în lista de contacte?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2527 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Adaugă"
 
-#: ../libpurple/protocols/oscar/oscar.c:2528
 msgid "_Decline"
 msgstr "_Refuz"
 
-#: ../libpurple/protocols/oscar/oscar.c:2652
 #, 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."
@@ -9254,7 +6612,6 @@ msgstr[0] "Aţi pierdut %hu mesaj de la %s deoarece era invalid."
 msgstr[1] "Aţi pierdut %hu mesaje de la %s deoarece erau invalide."
 msgstr[2] "Aţi pierdut %hu de mesaje de la %s deoarece erau invalide."
 
-#: ../libpurple/protocols/oscar/oscar.c:2661
 #, 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."
@@ -9262,7 +6619,6 @@ msgstr[0] "Aţi pierdut %hu mesaj de la %s pentru că era prea mare."
 msgstr[1] "Aţi pierdut %hu mesaje de la %s pentru că erau prea mari."
 msgstr[2] "Aţi pierdut %hu de mesaje de la %s pentru că erau prea mari."
 
-#: ../libpurple/protocols/oscar/oscar.c:2670
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9273,27 +6629,35 @@ msgstr[1] "Aţi pierdut %hu mesaje de la %s pentru că au depăşit limita fixat
 msgstr[2] ""
 "Aţi pierdut %hu de mesaje de la %s pentru că au depăşit limita fixată."
 
-#: ../libpurple/protocols/oscar/oscar.c:2679
 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"Aţi pierdut %hu mesaj de la %s pentru că expeditorul era prea periculos."
+"Aţi pierdut %hu mesaj de la %s deoarece are un nivel de avertizare prea "
+"ridicat"
 msgstr[1] ""
-"Aţi pierdut %hu mesaje de la %s pentru că expeditorul era prea periculos."
+"Aţi pierdut %hu mesaje de la %s deoarece are un nivel de avertizare prea "
+"ridicat."
 msgstr[2] ""
-"Aţi pierdut %hu de mesaje de la %s pentru că expeditorul era prea periculos."
+"Aţi pierdut %hu de mesaje de la %s pentru că are un nivel de avertizare prea "
+"ridicat."
 
-#: ../libpurple/protocols/oscar/oscar.c:2688
 #, 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] "Aţi pierdut %hu mesaj de la %s pentru că aţi fost prea periculos."
-msgstr[1] "Aţi pierdut %hu mesaje de la %s pentru că aţi fost prea periculos."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Aţi pierdut %hu mesaj de la %s deoarece aveţi un nivel de avertizare prea "
+"ridicat."
+msgstr[1] ""
+"Aţi pierdut %hu mesaje de la %s deoarece aveţi un nivel de avertizare prea "
+"ridicat."
 msgstr[2] ""
-"Aţi pierdut %hu de mesaje de la %s pentru că aţi fost prea periculos."
+"Aţi pierdut %hu de mesaje de la %s deoarece aveţi un nivel de avertizare "
+"prea ridicat."
 
-#: ../libpurple/protocols/oscar/oscar.c:2697
 #, 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."
@@ -9302,47 +6666,31 @@ msgstr[1] "Aţi pierdut %hu mesaje de la %s din motive necunoscute."
 msgstr[2] "Aţi pierdut %hu de mesaje de la %s din motive necunoscute."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2852
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Mesajul nu poate fi trimis: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Unknown reason."
 msgstr "Motiv necunoscut."
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
-#: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Nu se poate trimite mesajul către %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2921
 #, c-format
 msgid "User information not available: %s"
 msgstr "Detaliile utilizatorului nu sunt disponibile: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Online Since"
-msgstr "Conectat(ă) din"
+msgstr "Conectat din"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "Membru din"
 
-#: ../libpurple/protocols/oscar/oscar.c:2992
-msgid "Available Message"
-msgstr "Mesaj ce arată disponibilitatea"
-
-#: ../libpurple/protocols/oscar/oscar.c:3096
 msgid "Your AIM connection may be lost."
 msgstr "S-ar putea să fi pierdut conexiunea AIM."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3284
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9350,7 +6698,6 @@ msgstr ""
 "[Nu se poate afişa mesajul acestui utilizator deoarece conţine caractere "
 "invalide]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3448
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9358,53 +6705,39 @@ msgstr ""
 "Ultima acţiune cerută nu a fost îndeplinită pentru că aţi depăşit limitarea "
 "fixată. Aşteptaţi 10 secunde şi încercaţi din nou."
 
-#: ../libpurple/protocols/oscar/oscar.c:3533
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Aţi fost deconectat(ă) din camera de chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3768
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
 msgid "Personal Web Page"
 msgstr "Pagină personală"
 
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Alte informaţii"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
-#: ../libpurple/protocols/oscar/oscar.c:3843
 msgid "Zip Code"
 msgstr "Cod poştal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
+msgid "Work Information"
+msgstr "Informaţii serviciu"
+
 msgid "Division"
 msgstr "Departament"
 
-#: ../libpurple/protocols/oscar/oscar.c:3855
 msgid "Position"
 msgstr "Poziţie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3857
 msgid "Web Page"
 msgstr "Adresă Internet"
 
-#: ../libpurple/protocols/oscar/oscar.c:3860
-msgid "Work Information"
-msgstr "Informaţii serviciu"
-
-#: ../libpurple/protocols/oscar/oscar.c:3916
 msgid "Pop-Up Message"
 msgstr "Mesaj popup"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
@@ -9412,21 +6745,17 @@ msgstr[0] "Următorul nume de utilizator e asociat cu %s:"
 msgstr[1] "Următoarele nume de utilizatori sunt asociate cu %s:"
 msgstr[2] "Următoarele nume de utilizatori sunt asociate cu %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Nu s-a găsit nici un rezultat pentru adresa de mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Ar trebui să primiţi un mail care să vă ceară confirmarea %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
 msgid "Account Confirmation Requested"
 msgstr "Vi s-a cerut confirmarea contului"
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
@@ -9435,14 +6764,12 @@ msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de utilizator pentru că numele "
 "cerut este diferit de cel original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de utilizator pentru că este "
 "invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
@@ -9451,7 +6778,6 @@ msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de utilizator pentru că numele "
 "cerut este prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -9460,7 +6786,6 @@ msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că există deja o "
 "cerere în aşteptare pentru acest nume de utilizator."
 
-#: ../libpurple/protocols/oscar/oscar.c:4051
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -9469,7 +6794,6 @@ msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
 "are prea multe nume de utilizatori asociate."
 
-#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -9478,36 +6802,29 @@ msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
 "este invalidă."
 
-#: ../libpurple/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Eroare 0x%04x: Eroare necunoscută."
 
-#: ../libpurple/protocols/oscar/oscar.c:4057
 msgid "Error Changing Account Info"
 msgstr "Eroare la schimbarea detaliilor contului"
 
-#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Adresa de mail pentru %s este %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4065
 msgid "Account Info"
 msgstr "Detalii cont"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Nu s-a trimis imaginea IM. Trebuie să vă conectaţi direct pentru a fi "
 "posibilă trimiterea de imagini IM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM profile."
 msgstr "Nu se poate seta profilul AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4523
 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 "
@@ -9517,7 +6834,6 @@ msgstr ""
 "Profilul vă va rămâne la fel. Încercaţi să-l setaţi din nou când veţi fi "
 "conectat(ă) 100%."
 
-#: ../libpurple/protocols/oscar/oscar.c:4537
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9535,11 +6851,9 @@ msgstr[2] ""
 "Aţi depăşit lungimea maximă de %d de octeţi a profilului. A fost trunchiat "
 "automat."
 
-#: ../libpurple/protocols/oscar/oscar.c:4542
 msgid "Profile too long."
 msgstr "Profil prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4586
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9557,11 +6871,9 @@ msgstr[2] ""
 "Mesajul în absenţă depăşeşte lungimea maximă de %d de octeţi. S-a trunchiat "
 "mesajul şi aţi fost trecut(ă) în absenţă."
 
-#: ../libpurple/protocols/oscar/oscar.c:4591
 msgid "Away message too long."
 msgstr "Mesaj în absenţă prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4664
 #, c-format
 msgid ""
 "Could not add the buddy %s because the username is invalid.  Usernames must "
@@ -9572,17 +6884,12 @@ msgstr ""
 "Un nume valid trebuie să fie o adresă de mail validă sau să înceapă cu o "
 "literă şi să conţină doar litere, numere şi spaţii sau doar numere."
 
-#: ../libpurple/protocols/oscar/oscar.c:4666
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5156
 msgid "Unable To Add"
 msgstr "Adăugare eşuată"
 
-#: ../libpurple/protocols/oscar/oscar.c:4785
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nu se poate descărca lista de contacte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4786
 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 minutes."
@@ -9590,15 +6897,9 @@ msgstr ""
 "Nu s-a putut descărca deocamdată lista de contacte de pe serverele AIM. "
 "Lista nu este pierdută, dar va fi probabil disponibilă abia în câteva minute."
 
-#: ../libpurple/protocols/oscar/oscar.c:4982
-#: ../libpurple/protocols/oscar/oscar.c:4984
-#: ../libpurple/protocols/oscar/oscar.c:5223
-#: ../libpurple/protocols/oscar/oscar.c:5224
-#: ../libpurple/protocols/oscar/oscar.c:5229
 msgid "Orphans"
 msgstr "Orfani"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9607,17 +6908,13 @@ msgstr ""
 "Nu s-a putut adăuga contactul %s deoarece aveţi prea multe contacte în lista "
 "de contacte. Ştergeţi unul şi încercaţi din nou."
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
-#: ../libpurple/protocols/oscar/oscar.c:5154
 msgid "(no name)"
 msgstr "(fără nume)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Din motive necunoscute nu s-a putut adăuga contactul %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5287
 #, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
@@ -9626,23 +6923,19 @@ msgstr ""
 "Utilizatorul %s v-a autorizat să-l adăugaţi în lista de contacte. Doriţi să-"
 "l adăugaţi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5295
 msgid "Authorization Given"
 msgstr "Autorizare acordată"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5368
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Utilizatorul %s v-a acordat permisiunea de a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:5369
 msgid "Authorization Granted"
 msgstr "Autorizare acordată"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5372
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9653,49 +6946,31 @@ msgstr ""
 "următorul motiv:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5373
 msgid "Authorization Denied"
 msgstr "Autorizare refuzată"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Cheie numerică (e_xchange):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Imaginea IM nu a fost trimisă. Nu puteţi trimite imagini IM în chat-urile "
 "AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "Away Message"
-msgstr "Mesaj în absenţă"
-
-#: ../libpurple/protocols/oscar/oscar.c:5689
-msgid "<i>(retrieving)</i>"
-msgstr "<i>(se descarcă)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5889
 msgid "iTunes Music Store Link"
 msgstr "Link către magazinul iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5997
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentariu contact pentru %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Buddy Comment:"
 msgstr "Comentariu contact:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6045
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Aţi ales să deschideţi o discuţie directă cu %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:6049
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9703,66 +6978,50 @@ msgstr ""
 "Pentru că adresa IP vă va fi vizibilă, vă rugăm să evaluaţi riscurile la "
 "care vă expuneţi. Doriţi să continuaţi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6055
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onectare"
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Get AIM Info"
 msgstr "Detalii AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6096
 msgid "Edit Buddy Comment"
 msgstr "Editare comentariu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get Status Msg"
 msgstr "Arată mesajul de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:6117
 msgid "Direct IM"
 msgstr "Discuţie directă"
 
-#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Re-request Authorization"
 msgstr "Solicit din nou autorizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid "Require authorization"
 msgstr "Solicit autorizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:6201
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Prezenţă online (activarea vă expune la spam!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6206
 msgid "ICQ Privacy Options"
 msgstr "Opţiuni de securitate ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6226
 msgid "The new formatting is invalid."
 msgstr "Formatul nou este invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6227
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 "Formatarea numelor de utilizatori nu poate schimba decât spaţiile goale şi "
 "capitalizarea."
 
-#: ../libpurple/protocols/oscar/oscar.c:6280
 msgid "Change Address To:"
 msgstr "Schimbă adresa în:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6326
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>nu aşteptaţi nici o autorizare</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Lista contactelor de la care aşteptaţi autorizarea"
 
-#: ../libpurple/protocols/oscar/oscar.c:6330
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9770,65 +7029,50 @@ msgstr ""
 "Puteţi solicita din nou autorizarea de la aceste contacte selectând „Solicit "
 "din nou autorizare” după un click dreapta pe nume în lista contactelor."
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Find Buddy by Email"
 msgstr "Căutare contact după adresa de mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6348
 msgid "Search for a buddy by email address"
 msgstr "Căutare contact după adresa de mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Introduceţi adresa de mail a contactului căutat:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6352
 msgid "_Search"
 msgstr "C_aută"
 
-#: ../libpurple/protocols/oscar/oscar.c:6510
 msgid "Set User Info (web)..."
 msgstr "Introducere detalii (online)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Change Password (web)"
 msgstr "Schimbare parolă (online)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6525
 msgid "Configure IM Forwarding (web)"
 msgstr "Configurare înaintare mesaje (online)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6535
 msgid "Set Privacy Options..."
 msgstr "Opţiuni de securitate..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6542
 msgid "Confirm Account"
 msgstr "Confirmare cont"
 
-#: ../libpurple/protocols/oscar/oscar.c:6546
 msgid "Display Currently Registered Email Address"
 msgstr "Afişare adresă de mail înregistrată curent"
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Change Currently Registered Email Address..."
 msgstr "Schimbare adresă de mail înregistrată curent..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6557
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afişare contacte ce aşteaptă autorizarea"
 
-#: ../libpurple/protocols/oscar/oscar.c:6563
 msgid "Search for Buddy by Email Address..."
 msgstr "Căutare contact după adresa de mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6568
 msgid "Search for Buddy by Information"
 msgstr "Căutare contact după detalii"
 
-#: ../libpurple/protocols/oscar/oscar.c:6756
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9838,26 +7082,25 @@ msgstr ""
 "AIM/ICQ pentru transferul de fişiere\n"
 "(mai încet, dar nu se dezvăluie adresa IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
+msgid "Allow multiple simultaneous logins"
+msgstr "Permite autentificări multiple simultane"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Cerere către %s pentru a ne conecta la %s:%hu pentru discuţie directă."
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Încercare de conectare la %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Încercare de conectare prin serverul proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s tocmai a cerut o conexiune directă cu %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1039
 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 "
@@ -9867,168 +7110,126 @@ msgstr ""
 "necesară pentru imaginile IM. Pentru că adresa IP vă va fi expusă, luaţi în "
 "considerare riscurile la care vă expuneţi."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Informaţii de bază"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Introducere personală"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Număr QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Ţară/Regiune"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provincie/Stat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Simbol horoscop"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Semn zodiacal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Grupă sanguină"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Colegiu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Cod poştal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Telefon mobil"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Vărsător"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Peşti"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Vărsător"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Taur"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Gemeni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Rac"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Leu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Fecioară"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Balanţă"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Scorpion"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Săgetător"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Capricorn"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Şobolan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Bou"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigru"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Iepure"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Dragon"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Şarpe"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Cal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Capră"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Maimuţă"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Cocoş"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Câine"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Porc"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Altceva"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Editare detalii proprii"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Actualizare detalii proprii"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Detaliile v-au fost actualizate"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -10037,216 +7238,151 @@ msgstr ""
 "Alegerea unui avatar personalizat nu este suportată deocamdată. Alegeţi o "
 "imagine de la %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Avatar QQ invalid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Aţi respins cererea făcută de %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Precizaţi motivul:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Respinge cererea"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Scuze, nu eşti genul meu..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Adaugă contactul cu cereri eşuate de autorizare"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Aţi şters cu succes utilizatorul"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "V-aţi şters cu succes din lista contactului"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Utilizatorul %d are nevoie de autorizare"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Introduceţi aici cererea"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Vrei să fim prieteni?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Trimite"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "Aţi adăugat contactul %d în lista de contacte"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Eroare QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid invalid"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID grup:"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Iniţiator"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Descriere grup"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Autorizare"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Introduceţi ID-ul grupului extern"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Puteţi căuta doar grupuri QQ permanente\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Motiv: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:281
-#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "Operaţie QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprobă"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Cererea de a vă alătura grupului %d v-a fost respinsă de adminul %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Cererea de a vă alătura grupului %d v-a fost aprobată de adminul %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "[%d] a părăsit grupul „%d”"
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Aţi fost adăugat cu identitatea %d în grupul „%d”"
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Acest grup a fost adăugat la lista dumneavoastră de contacte"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Nu sunt un membru"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Sunt un membru"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Solicit înscrierea"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Sunt admin"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Status necunoscut"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Acest grup nu permite înscrierea altor contacte"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Aţi părăsit cu succes grupul"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autorizare grup QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Operaţiunea de autorizare a fost acceptată de serverul QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Aţi introdus un ID de grup prea mic sau prea mare"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Sigur doriţi să părăsiţi acest Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -10254,160 +7390,126 @@ msgstr ""
 "Notaţi că, dacă dumneavoastră sunteţi iniţiatorul, \n"
 "această acţiune va elimina acest Qun."
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Cod [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr "Eroare de operare asupra grupului"
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:99
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Doriţi să aprobaţi cererea?"
 
-#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Precizaţi motivul:"
 
-#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Aţi modificat cu succes membrul Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Aţi modificat cu succes detaliile Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Aţi creat cu succes un Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "Doriţi să setaţi detaliile Qun acum?"
 
-#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Opţiuni"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Mesaj de sistem"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Nu s-a putut trimite mesajul."
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-msgid "Keep alive error"
-msgstr "Eroare „keep alive”"
+#, c-format
+msgid "Unknown-%d"
+msgstr "%d-necunoscut"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
-msgstr "Eroare la cererea unui „token” de autentificare"
+msgid "Level"
+msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/login_logout.c:490
-msgid "Unable to login. Check debug log."
-msgstr "Autentificare eşuată. Verificaţi înregistrările de depanare"
+msgid "Member"
+msgstr "Membru"
 
-#: ../libpurple/protocols/qq/login_logout.c:493
-msgid "Unable to login"
-msgstr "Autentificare eşuată."
+msgid " VIP"
+msgstr " VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "Nu se poate deschide o conexiune."
+msgid " TCP"
+msgstr " TCP"
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
-msgstr "%d-necunoscut(ă)"
+#, fuzzy
+msgid " FromMobile"
+msgstr "Mobil"
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "Adresă TCP"
+#, fuzzy
+msgid " BindMobile"
+msgstr "Mobil"
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "Adresă UDP"
+#, fuzzy
+msgid " Video"
+msgstr "Video în direct"
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
-msgstr "Nivel"
+#, fuzzy
+msgid " Space"
+msgstr "Salvează"
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr "Ver"
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Nume invalid"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Conectaţi:</b> %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Ultima actualizare:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#, fuzzy, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>IP server</b>: %s: %d<br>\n"
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Mod de conectare</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
-#, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
+#, fuzzy, c-format
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
 msgstr "<b>IP server</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>IP-ul meu public</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Autentificat la</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>IP-ul ultimei autentificări</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Ultima autentificare</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Informaţii de autentificare"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Introducere detalii proprii"
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Schimbare parolă"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Arată informaţiile de autentificare"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Ieşire din acest QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Blochează acest contact"
 
@@ -10421,223 +7523,254 @@ msgstr "Blochează acest contact"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Modul pentru protocolul QQ"
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Conectare folosind TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr ""
+
+#, fuzzy
+msgid "Keep alive interval(s)"
+msgstr "Eroare „keep alive”"
+
+msgid "Update interval(s)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "Titlu invalid"
+
+msgid "Keep alive error"
+msgstr "Eroare „keep alive”"
+
+#, fuzzy
+msgid "Failed to connect server"
+msgstr "Conectarea la server a eşuat."
+
 msgid "Socket error"
 msgstr "Eroare de socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, fuzzy, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"S-a pierdut conexiunea cu serverul:\n"
+"%s"
+
 msgid "Unable to read from socket"
 msgstr "Nu se poate citi din socket"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr "Eroare la scriere"
+
+msgid "Connection lost"
+msgstr "Conexiune pierdută"
+
+msgid "Couldn't resolve host"
+msgstr "Nu s-a putut rezolva numele calculatorului"
+
+msgid "hostname is NULL or port is 0"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Connecting server %s, retries %d"
+msgstr ""
+"Eroare de conectare de la serverul %s:\n"
+"%s"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Nu se poate deschide o conexiune."
+
+msgid "Could not resolve hostname"
+msgstr "Nu s-a putut rezolva numele calculatorului"
+
+msgid "Unable to login. Check debug log."
+msgstr "Autentificare eşuată. Verificaţi înregistrările de depanare"
+
+msgid "Unable to login"
+msgstr "Autentificare eşuată."
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Autentificare eşuată, nici un răspuns"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Aţi fost adăugat cu identitatea %d în grupul „%d”"
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d a refuzat fişierul %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Trimitere fişier"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d a anulat transferul fişierului %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Conexiune pierdută"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Autentificare eşuată, nici un răspuns"
-
-#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "Doriţi să adăugaţi acest contact?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Aţi fost adăugat de %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Doriţi să îl adăugaţi?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s v-a adăugat în lista sa de contacte cu identitatea %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "%s v-a respins cererea"
 
-#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "%s v-a aprobat cererea"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s doreşte să vă adauge în listă cu identitatea %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaj: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s nu este în lista dumneavoastră de contacte"
 
-#: ../libpurple/protocols/sametime/sametime.c:420
+#, c-format
+msgid "Notice from: %s"
+msgstr "Anunţ de la: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Conexiune terminată (la scriere)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titlu Grup:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID Grup Notes:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 #, c-format
 msgid "Info for Group %s"
 msgstr "Detalii pentru grupul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1299
 msgid "Notes Address Book Information"
 msgstr "Detalii agendă Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1331
 msgid "Invite Group to Conference..."
 msgstr "Invită un grup într-o conferinţă..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1341
 msgid "Get Notes Address Book Info"
 msgstr "Obţine detalii despre agenda Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1508
 msgid "Sending Handshake"
 msgstr "Se iniţiază negocierea"
 
-#: ../libpurple/protocols/sametime/sametime.c:1513
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Se aşteaptă confirmarea negocierii"
 
-#: ../libpurple/protocols/sametime/sametime.c:1518
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Negociere confirmată, se trimit informaţiile de autentificare"
 
-#: ../libpurple/protocols/sametime/sametime.c:1523
 msgid "Waiting for Login Acknowledgement"
 msgstr "Se aşteaptă confirmarea autentificării"
 
-#: ../libpurple/protocols/sametime/sametime.c:1528
 msgid "Login Redirected"
 msgstr "Autentificare redirectată"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Forcing Login"
 msgstr "Se forţează autentificarea"
 
-#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Login Acknowledged"
 msgstr "Autentificare confirmată"
 
-#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Starting Services"
 msgstr "Se pornesc serviciile"
 
-#: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Un administrator Sametime a făcut următorul anunţ pe serverul %s:"
 
-#: ../libpurple/protocols/sametime/sametime.c:1685
 msgid "Sametime Administrator Announcement"
 msgstr "Anunţ din partea administratorului Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1738
 msgid "Connection reset"
 msgstr "Conexiune resetată"
 
-#: ../libpurple/protocols/sametime/sametime.c:1750
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Eroare la citirea din socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1775
-#: ../libpurple/protocols/sametime/sametime.c:3782
 msgid "Unable to connect to host"
 msgstr "Conectarea la server a eşuat"
 
-#: ../libpurple/protocols/sametime/sametime.c:1816
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anunţ de la %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1990
 msgid "Conference Closed"
 msgstr "Conferinţă închisă"
 
-#: ../libpurple/protocols/sametime/sametime.c:2455
 msgid "Unable to send message: "
 msgstr "Nu se poate trimite mesajul: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3011
 msgid "Place Closed"
 msgstr "Loc închis"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Microphone"
 msgstr "Microfon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Speakers"
 msgstr "Difuzoare"
 
-#: ../libpurple/protocols/sametime/sametime.c:3283
 msgid "Video Camera"
 msgstr "Cameră video"
 
-#: ../libpurple/protocols/sametime/sametime.c:3321
-#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "Supports"
 msgstr "Suportă:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3326
-#: ../libpurple/protocols/sametime/sametime.c:4175
 msgid "External User"
 msgstr "Utilizator extern"
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "Create conference with user"
 msgstr "Iniţializaţi o conferinţă cu acest utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:3433
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10646,27 +7779,21 @@ msgstr ""
 "Introduceţi un topic pentru noua conferinţă şi un mesaj pentru invitarea "
 "utilizatorului %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
 msgstr "Conferinţă nouă"
 
-#: ../libpurple/protocols/sametime/sametime.c:3439
 msgid "Create"
 msgstr "Creează"
 
-#: ../libpurple/protocols/sametime/sametime.c:3504
 msgid "Available Conferences"
 msgstr "Conferinţe disponibile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3510
 msgid "Create New Conference..."
 msgstr "Creează o nouă conferinţă..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3517
 msgid "Invite user to a conference"
 msgstr "Invită utilizatorul într-o conferinţă"
 
-#: ../libpurple/protocols/sametime/sametime.c:3518
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10677,27 +7804,21 @@ msgstr ""
 "utilizatorului %s. Selectaţi „Creează o nouă conferinţă” dacă doriţi să "
 "creaţi o nouă conferinţă în care să invitaţi acest utilizator."
 
-#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
 msgstr "Invită într-o conferinţă"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Invite to Conference..."
 msgstr "Invită într-o conferinţă..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3619
 msgid "Send TEST Announcement"
 msgstr "Trimite un anunţ TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3638 ../pidgin/gtkconv.c:4524
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3666
 msgid "No Sametime Community Server specified"
 msgstr "Nu s-a specificat un server de comunitate Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3691
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10706,42 +7827,31 @@ msgstr ""
 "Nici un nume de server sau adresă IP nu au fost configurate pentru contul "
 "Meanwhile %s. Introduceţi una mai jos pentru a continua autentificarea."
 
-#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "Meanwhile Connection Setup"
 msgstr "Opţiuni conexiune Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
 msgstr "Nu s-a specificat un server de comunitate Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
 msgstr "Conectare"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Necunoscut (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
 msgstr "Ultim client cunoscut"
 
-#: ../libpurple/protocols/sametime/sametime.c:4357
-#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "User Name"
 msgstr "Nume utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:4360
-#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4384
 msgid "An ambiguous user ID was entered"
 msgstr "S-a introdus un ID ambiguu de utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:4385
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10750,15 +7860,12 @@ msgstr ""
 "Identificatorul „%s” s-ar putea referi la oricare din utilizatorii următori. "
 "Selectaţi utilizatorul corect pentru a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
 msgstr "Selectaţi utilizatorul"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
 msgid "Unable to add user: user not found"
 msgstr "Nu se poate adăuga utilizatorul: nu a fost găsit"
 
-#: ../libpurple/protocols/sametime/sametime.c:4476
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10767,7 +7874,6 @@ msgstr ""
 "Identificatorul „%s” nu corespunde nici unui utilizator din comunitatea "
 "Sametime. Această intrare v-a fost ştearsă din lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5067
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10776,63 +7882,48 @@ msgstr ""
 "Eroare la citirea fişierului %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Remotely Stored Buddy List"
 msgstr "Listă de contacte stocată pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5207
 msgid "Buddy List Storage Mode"
 msgstr "Stocare listă de contacte"
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Local Buddy List Only"
 msgstr "Doar listă de contacte locală"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge List from Server"
 msgstr "Combină cu lista de contacte de pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Merge and Save List to Server"
 msgstr "Combină şi stochează lista pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Synchronize List with Server"
 msgstr "Sincronizez lista cu serverul"
 
-#: ../libpurple/protocols/sametime/sametime.c:5271
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Import lista Sametime pentru contul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Export lista Sametime pentru contul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5365
 msgid "Unable to add group: group exists"
 msgstr "Nu se poate adăuga grupul: grupul există."
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grup numit „%s” există deja în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5369
-#: ../libpurple/protocols/sametime/sametime.c:5499
 msgid "Unable to add group"
 msgstr "Nu se poate adăuga grupul"
 
-#: ../libpurple/protocols/sametime/sametime.c:5428
 msgid "Possible Matches"
 msgstr "Potriviri posibile"
 
-#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Notes Address Book group results"
 msgstr "Rezultate grup agendă Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5445
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10843,15 +7934,12 @@ msgstr ""
 "din agenda Notes. Selectaţi grupul corect din lista de mai jos şi adăugaţi-l "
 "în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Select Notes Address Book"
 msgstr "Selectaţi agenda Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group not found"
 msgstr "Nu se poate adăuga grupul: nu a fost găsit"
 
-#: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10860,11 +7948,9 @@ msgstr ""
 "Identificatorul „%s” nu se potriveşte cu nici un grup din agenda Notes a "
 "comunităţii Sametime din care faceţi parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5536
 msgid "Notes Address Book Group"
 msgstr "Grup agendă Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5537
 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."
@@ -10872,12 +7958,10 @@ msgstr ""
 "Introduceţi numele unei agende Notes în câmpul de mai jos şi adăugaţi grupul "
 "şi membrii săi în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultatele căutării după „%s”"
 
-#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10888,30 +7972,24 @@ msgstr ""
 "utilizatori. Puteţi adăuga aceşti utilizatori la lista de contacte ori le "
 "puteţi trimite mesaje utilizând acţiunile de mai jos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5594 ../pidgin/gtknotify.c:794
 msgid "Search Results"
 msgstr "Rezultatele căutării"
 
-#: ../libpurple/protocols/sametime/sametime.c:5619
 msgid "No matches"
 msgstr "Nici o potrivire"
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Identificatorul „%s” nu corespunde nici unui utilizator din comunitatea "
 "Sametime din care faceţi parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "No Matches"
 msgstr "Nici o potrivire"
 
-#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid "Search for a user"
 msgstr "Caută un utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:5662
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10919,115 +7997,59 @@ msgstr ""
 "Introduceţi numele or parte din ID în câmpul de mai jos pentru a căuta "
 "utilizatori care să corespundă în comunitatea Sametime din care faceţi parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "User Search"
 msgstr "Căutare utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:5678
 msgid "Import Sametime List..."
 msgstr "Import listă Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Export Sametime List..."
 msgstr "Export listă Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Add Notes Address Book Group..."
 msgstr "Adaugă grupul agendei Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "User Search..."
 msgstr "Căutare utilizatori..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Force login (ignore server redirects)"
 msgstr "Autentificare forţată (ignoră redirectările serverului)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5806
 msgid "Hide client identity"
 msgstr "Ascunde identitatea clientului"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Utilizatorul %s nu este prezent în reţea"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Schimb de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Nu s-a reuşit schimbul de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "A intervenit o eroare în cursul schimbului de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Schimbul de chei a eşuat"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Time-out la schimbul de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Schimbul de chei a fost abandonat"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Schimbul de chei a început deja"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Schimbul de chei nu poate fi iniţiat cu propria identitate"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Celălalt utilizator nu mai este prezent în reţea"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -11036,8 +8058,6 @@ msgstr ""
 "Cerere de schimb de chei primită de la %s. Doriţi să acceptaţi schimbul de "
 "chei?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -11048,99 +8068,40 @@ msgstr ""
 "Calculator la distanţă: %s\n"
 "Portul la distanţă: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Cerere de schimb de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM parolat"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Nu se poate seta cheia IM"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Introducere parolă IM"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc/ops.c:1527
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obţine cheia publică"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1517
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Nu se poate obţine cheia publică"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Arată cheia publică"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Nu s-a putut încărca cheia publică"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1066
-#: ../libpurple/protocols/silc/ops.c:1181
-#: ../libpurple/protocols/silc/ops.c:1303
-#: ../libpurple/protocols/silc/ops.c:1304
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Detalii utilizator"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1182
-#: ../libpurple/protocols/silc/ops.c:1323
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Nu s-au putut obţine detalii despre utilizator"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Contactul %s nu este de încredere"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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."
@@ -11149,19 +8110,13 @@ msgstr ""
 "sa publică. Utilizaţi comanda „Obţine cheia publică” pentru a o importa."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Deschide..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Utilizatorul %s nu este prezent în reţea"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -11169,18 +8124,12 @@ msgstr ""
 "Pentru a adăuga contactul trebuie să importaţi cheia sa publică. Utilizaţi "
 "pentru aceasta comandă „Importă”."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importă..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Selectaţi utilizatorul corect"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
 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."
@@ -11188,8 +8137,6 @@ msgstr ""
 "Mai mulţi utilizatori par să aibă aceeaşi cheie publică. Selectaţi-l pe cel "
 "corect din listă pentru a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -11197,312 +8144,154 @@ msgstr ""
 "Mai mulţi utilizatori par să aibă acelaşi nume. Selectaţi utilizatorul "
 "corect pentru a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
-msgstr "Detaşat(ă)"
+msgstr "Detaşat"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
-msgstr "Prost dispus(ă)"
+msgstr "Prost dispus"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Trezeşte-mă!"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
-msgstr "Hiperactiv(ă)"
+msgstr "Hiperactiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Roboţel"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
-msgstr "Fericit(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:517
+msgstr "Fericit"
+
 msgid "Sad"
-msgstr "Trist(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:963
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:519
+msgstr "Trist"
+
 msgid "Angry"
-msgstr "Supărat(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:666
-#: ../libpurple/protocols/silc10/util.c:521
+msgstr "Supărat"
+
 msgid "Jealous"
 msgstr "Gelos/Geloasă"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:967
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
-msgstr "Ruşinat(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:969
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:525
+msgstr "Ruşinat"
+
 msgid "Invincible"
-msgstr "Invincibil(ă)"
+msgstr "Invincibil"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
-msgstr "Îndrăgostit(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:973
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:529
+msgstr "Îndrăgostit"
+
 msgid "Sleepy"
-msgstr "Adormit(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:975
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:676
-#: ../libpurple/protocols/silc10/util.c:531
+msgstr "Adormit"
+
 msgid "Bored"
-msgstr "Plictisit(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:977
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:678
-#: ../libpurple/protocols/silc10/util.c:533
+msgstr "Plictisit"
+
 msgid "Excited"
-msgstr "Entuziast(ă)"
-
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:979
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:680
-#: ../libpurple/protocols/silc10/util.c:535
+msgstr "Entuziast"
+
 msgid "Anxious"
-msgstr "Stresat(ă)"
+msgstr "Stresat"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1220
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Moduri utilizator"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1237
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contact preferat"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1242
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Limbă preferată"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispozitiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1252
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:728
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Fus orar"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1257
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Poziţie geografică"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Reiniţializează cheia IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "IM cu schimb de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "IM parolat"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Obţine cheia publică..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1625
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Elimină utilizatorul"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:1000
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Desenează în „whiteboard”"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Frază secretă:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Chat-ul %s nu există în reţea"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:176
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Detalii chat"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Nu s-au putut obţine detalii despre chat"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nume chat:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Contor utilizatori:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Iniţiator chat:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifru chat:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Chat HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Topic chat:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Moduri chat:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Amprenta cheii fondatorului:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Amprentă silabică a cheii fondatorului:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Adaugă cheia publică a chat-ului"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:305
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Deschide cheia publică..."
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Frază secretă pentru chat"
 
-#: ../libpurple/protocols/silc/chat.c:431
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Listă chei publice chat"
 
-#: ../libpurple/protocols/silc/chat.c:436
-#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11516,124 +8305,68 @@ msgstr ""
 "În cel de-al doilea, doar utilizatorii ale căror semnături digitale sunt "
 "listate pot intra în chat."
 
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:934
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autentificare în chat"
 
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Adaugă/Şterge"
 
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: ../libpurple/protocols/silc/chat.c:604
-#: ../libpurple/protocols/silc/ops.c:1830
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Frază secretă"
 
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Introduceţi numele grupului chat-ului privat %s şi fraza secretă."
 
-#: ../libpurple/protocols/silc/chat.c:617
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adaugă grupul chat-ului privat"
 
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Limită utilizatori"
 
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Setaţi numărul maxim de utilizatori în chat. Zero pentru număr nelimitat."
 
-#: ../libpurple/protocols/silc/chat.c:914
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Listă invitaţii"
 
-#: ../libpurple/protocols/silc/chat.c:919
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Listă interdicţii"
 
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Adaugă grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:940
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Reiniţialiază permanent"
 
-#: ../libpurple/protocols/silc/chat.c:945
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Iniţializează permanent"
 
-#: ../libpurple/protocols/silc/chat.c:953
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Introducere limită utilizatori"
 
-#: ../libpurple/protocols/silc/chat.c:959
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Anulează blocarea subiectului"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Blochează subiectul"
 
-#: ../libpurple/protocols/silc/chat.c:971
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Reiniţializează chat-ul privat"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Iniţializează chat-ul privat"
 
-#: ../libpurple/protocols/silc/chat.c:983
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Reiniţializează chat-ul secret"
 
-#: ../libpurple/protocols/silc/chat.c:988
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Iniţializează chat-ul secret"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
@@ -11641,322 +8374,178 @@ msgstr ""
 "Trebuie să intraţi în chat-ul %s înainte de a vă putea alătura grupului "
 "privat."
 
-#: ../libpurple/protocols/silc/chat.c:1051
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Intră în grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:1052
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Nu se poate intra în grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1433
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Iniţiază comanda"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1434
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "Nu se poate iniţia comanda"
 
-#: ../libpurple/protocols/silc/chat.c:1249
-#: ../libpurple/protocols/silc/silc.c:1435
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Comandă necunoscută"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transfer securizat de fişiere"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Eroare la transferul fişierului"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Deconectat la distanţă"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Cerere refuzată"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Schimbul de chei a eşuat"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Conexiunea a expirat"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Nu s-a putut deschide conexiunea"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Nu există sesiunea de transfer de fişiere"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nici o sesiune de transfer de fişiere nu e activă"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Transferul fişierului a început deja"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Nu s-au putut verifica cheile pentru transferul de fişiere"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Nu s-a putut iniţia transferul de fişiere"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Nu s-a putut trimite fişierul"
 
-#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "A intervenit o eroare"
 
-#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
-#: ../libpurple/protocols/silc/ops.c:566
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s a schimbat subiectul pentru <I>%s</I> în: %s"
 
-#: ../libpurple/protocols/silc/ops.c:632
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> a setat modurile chat-ului <I>%s</I> astfel: %s"
 
-#: ../libpurple/protocols/silc/ops.c:636
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> a înlăturat toate modurile chat-ului <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:669
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> a setat modurile pentru <I>%s</I> astfel: %s"
 
-#: ../libpurple/protocols/silc/ops.c:677
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> a înlăturat toate modurile pentru <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:706
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Aţi fost dat afară din <I>%s</I> de <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
-#: ../libpurple/protocols/silc/ops.c:743
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Aţi fost eliminat de %s: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
-#: ../libpurple/protocols/silc/ops.c:774
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Eliminat de %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:811
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Deconectare server"
 
-#: ../libpurple/protocols/silc/ops.c:997
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Detalii personale"
 
-#: ../libpurple/protocols/silc/ops.c:1020
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Zi de naştere"
 
-#: ../libpurple/protocols/silc/ops.c:1028
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Funcţie"
 
-#: ../libpurple/protocols/silc/ops.c:1032
-#: ../libpurple/protocols/silc/silc.c:1229
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organizaţie"
 
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unitate"
 
-#: ../libpurple/protocols/silc/ops.c:1060
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Notă"
 
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Intră într-un chat"
 
-#: ../libpurple/protocols/silc/ops.c:1140
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sunteţi iniţiatorul chat-ului <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1144
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Iniţiatorul chat-ului în <I>%s</I> este <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1203
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "Nume real"
 
-#: ../libpurple/protocols/silc/ops.c:1231
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Text status"
 
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1367
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Amprentă cheie publică"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1368
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Amprentă silabică cheie publică"
 
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mai mult..."
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc/silc.c:1293
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Detaşare de server"
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Detaşarea nu a reuşit"
 
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Nu se poate schimba subiectul"
 
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Schimbarea pseudonimului a eşuat"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Listă camere de chat"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Nu se poate obţine lista camerelor de chat"
 
-#: ../libpurple/protocols/silc/ops.c:1485
 msgid "Network is empty"
 msgstr "Reţeaua este goală"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nu s-a primit nici o cheie publică"
 
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc/ops.c:1554
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informaţii server"
 
-#: ../libpurple/protocols/silc/ops.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Nu s-au putut obţine detalii despre server"
 
-#: ../libpurple/protocols/silc/ops.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Statistici server"
 
-#: ../libpurple/protocols/silc/ops.c:1566
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Nu s-au putut obţine statisticile serverului"
 
-#: ../libpurple/protocols/silc/ops.c:1573
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11991,59 +8580,36 @@ msgstr ""
 "Total operatori servere: %d\n"
 "Total operatori routere: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistici reţea"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping eşuat"
 
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Replică ping primită de la server"
 
-#: ../libpurple/protocols/silc/ops.c:1626
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Utilizatorul nu a putut fi eliminat"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "WATCH"
 msgstr "WATCH"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "Cannot watch user"
 msgstr "Nu se poate face watch pentru acest utilizator"
 
-#: ../libpurple/protocols/silc/ops.c:1741
-#: ../libpurple/protocols/silc/ops.c:1792
-#: ../libpurple/protocols/silc/silc.c:394
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Se reia sesiunea"
 
-#: ../libpurple/protocols/silc/ops.c:1743
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Se autentifică conexiunea"
 
-#: ../libpurple/protocols/silc/ops.c:1794
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Se verifică cheia publică a serverului"
 
-#: ../libpurple/protocols/silc/ops.c:1831
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Se cere fraza secretă"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -12052,13 +8618,11 @@ msgstr ""
 "S-a primit o cheie publică de la %s. Copia locală a cheii sale nu se "
 "potriveşte cu aceasta. Doriţi să acceptaţi această cheie publică?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 "S-a primit cheia publică de la %s. Doriţi să acceptaţi această cheie publică?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12071,104 +8635,69 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verifică cheia publică"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Arată..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tip nesuportat de cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
-msgstr "Deconectat(ă) de server"
+msgstr "Deconectat de server"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Eroare la conectarea la serverul SILC"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Schimbul de chei a eşuat"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Reluarea sesiunii detaşate a eşuat. Încercaţi „Reconectare” pentru a crea o "
 "nouă conexiune."
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Conexiunea a eşuat"
 
-#: ../libpurple/protocols/silc/silc.c:397
-#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Se efectuează schimbul de chei"
 
-#: ../libpurple/protocols/silc/silc.c:449
-#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "Nu se poate crea o nouă conexiune"
 
-#: ../libpurple/protocols/silc/silc.c:492
-#: ../libpurple/protocols/silc/silc.c:508
-#: ../libpurple/protocols/silc/silc.c:537
-#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "Nu s-a putut încărca perechea de chei SILC"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:522
-#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Conectare în progres la serverul SILC"
 
-#: ../libpurple/protocols/silc/silc.c:568
-#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Nu mai există memorie disponibilă"
 
-#: ../libpurple/protocols/silc/silc.c:619
-#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Nu s-a putut iniţializa protocolul SILC"
 
-#: ../libpurple/protocols/silc/silc.c:632
-#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Eroare la încărcarea perechii de chei SILC"
 
-#: ../libpurple/protocols/silc/silc.c:955
-#: ../libpurple/protocols/silc10/silc.c:656
+#, c-format
+msgid "Download %s: %s"
+msgstr "Descărcare %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Propria dispoziţie"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1795
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:971
-#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
-msgstr "Îndrăgostit(ă)"
+msgstr "Îndrăgostit"
 
-#: ../libpurple/protocols/silc/silc.c:982
-#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12176,63 +8705,36 @@ msgstr ""
 "\n"
 "Metode de contactare preferate"
 
-#: ../libpurple/protocols/silc/silc.c:990
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:992
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:994
-#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Videoconferinţă"
 
-#: ../libpurple/protocols/silc/silc.c:999
-#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Propriul status curent"
 
-#: ../libpurple/protocols/silc/silc.c:1006
-#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Servicii de conectare"
 
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "Permite altora să vadă serviciile utilizate"
 
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "Permite altora să vadă calculatorul utilizat"
 
-#: ../libpurple/protocols/silc/silc.c:1022
-#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Propriul fişier VCard"
 
-#: ../libpurple/protocols/silc/silc.c:1028
 msgid "Timezone (UTC)"
 msgstr "Fus orar (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:1032
-#: ../libpurple/protocols/silc/silc.c:1033
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Atribute status utilizator"
 
-#: ../libpurple/protocols/silc/silc.c:1034
-#: ../libpurple/protocols/silc10/silc.c:737
 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 "
@@ -12242,217 +8744,128 @@ msgstr ""
 "informaţiile personale. Completaţi datele pe care doriţi să le faceţi "
 "accesibile."
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc/silc.c:1702
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:784
-#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Mesajul zilei"
 
-#: ../libpurple/protocols/silc/silc.c:1075
-#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "Nu s-a găsit un mesaj al zilei pe server"
 
-#: ../libpurple/protocols/silc/silc.c:1076
-#: ../libpurple/protocols/silc/silc.c:1697
-#: ../libpurple/protocols/silc10/silc.c:779
-#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nu există un mesaj al zilei asociat acestei conexiuni."
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc/silc.c:1244
-#: ../libpurple/protocols/silc/silc.c:1245
-#: ../libpurple/protocols/silc10/silc.c:830
-#: ../libpurple/protocols/silc10/silc.c:874
-#: ../libpurple/protocols/silc10/silc.c:945
-#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Creează o nouă pereche de chei SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Frazele secrete nu se potrivesc"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Generarea perechii de chei a eşuat"
 
-#: ../libpurple/protocols/silc/silc.c:1212
-#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Lungime cheie"
 
-#: ../libpurple/protocols/silc/silc.c:1214
-#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Fişier cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Fişier cheie privată"
 
-#: ../libpurple/protocols/silc/silc.c:1239
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Confirmare frază-parolă"
 
-#: ../libpurple/protocols/silc/silc.c:1246
-#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Generează pereche de chei"
 
-#: ../libpurple/protocols/silc/silc.c:1289
-#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Status conectare"
 
-#: ../libpurple/protocols/silc/silc.c:1297
-#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Arată mesajul zilei"
 
-#: ../libpurple/protocols/silc/silc.c:1301
-#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Creare pereche de chei SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1393
-#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Utilizatorul <I>%s</I> nu este prezent în reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1573
-#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Topic prea lung"
 
-#: ../libpurple/protocols/silc/silc.c:1654
-#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Trebuie să specificaţi un pseudonim"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "chat-ul %s nu a fost găsit"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modurile de chat pentru %s sunt: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1763
-#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "chat-ul %s nu are setat nici un mod"
 
-#: ../libpurple/protocols/silc/silc.c:1776
-#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Nu s-au putut seta modurile chat-ului %s"
 
-#: ../libpurple/protocols/silc/silc.c:1806
-#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comandă necunoscută: %s (poate fi o problemă de client)"
 
-#: ../libpurple/protocols/silc/silc.c:1869
-#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [chat]:  Părăseşte un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1873
-#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [chat]:  Părăseşte un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nou topic&gt;]: Arată sau schimbă subiectul"
 
-#: ../libpurple/protocols/silc/silc.c:1882
-#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;chat&gt; [&lt;parolă&gt;]:  Intră într-un chat din această reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1886
-#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  Listează chat-urile din această reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1890
-#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;pseudonim&gt;:  Arată detaliile utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1894
-#: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudonim&gt; &lt;message&gt;:  Trimite un mesaj privat "
 "utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1898
-#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;pseudonim&gt; [&lt;mesaj&gt;]:  Trimite un mesaj privat "
 "utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1902
-#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Arată mesajul zilei de pe server"
 
-#: ../libpurple/protocols/silc/silc.c:1906
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  Detaşează această sesiune"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mesaj]:  Deconectare de la server cu mesajul precizat"
 
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comandă&gt;:  Iniţiază o comandă client SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;pseudonim&gt;  [-cheie|&lt;motiv&gt;]:  Elimină utilizatorul"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;pseudonim nou&gt;:  Schimbare pseudonim propriu"
 
-#: ../libpurple/protocols/silc/silc.c:1928
-#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowah &lt;pseudonim&gt;:  Arată detaliile utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1932
-#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12460,8 +8873,6 @@ msgstr ""
 "cmode &lt;chat&gt; [+|-&lt;moduri&gt;] [argumente]:   Schimbă sau arată "
 "modurile chat-ului."
 
-#: ../libpurple/protocols/silc/silc.c:1936
-#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12469,18 +8880,12 @@ msgstr ""
 "cumode &lt;chat&gt; +|-&lt;moduri&gt; &lt;pseudonim&gt;:  Schimbă modurile "
 "respectivului utilizator în chat"
 
-#: ../libpurple/protocols/silc/silc.c:1940
-#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt:moduri_utilizator&gt;:  Alegeţi-vă modurile în reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;pseudonim&gt; [-cheie]:  Cere privilegii de utilizator"
 
-#: ../libpurple/protocols/silc/silc.c:1948
-#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12488,49 +8893,33 @@ msgstr ""
 "invite &lt;chat&gt; [-|+]&lt;pseudonim&gt;:  invită respectivul utilizator "
 "sau adaugă-l/şterge-l din lista invitaţilor chat-ului"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;chat&gt; &lt;pseudonim&gt; [comentariu]: Dă afară din chat un "
 "utilizator."
 
-#: ../libpurple/protocols/silc/silc.c:1956
-#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Arată detalii administrative despre server"
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;chat&gt; +|-&lt;pseudonim&gt]:  Interzice utilizatorului respectiv "
 "accesul la acest chat"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;pseudonim|server&gt;:  Regăseşte cheia publică a clientului sau a "
 "serverului"
 
-#: ../libpurple/protocols/silc/silc.c:1968
-#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Arată statisticile serverului şi ale reţelei"
 
-#: ../libpurple/protocols/silc/silc.c:1972
-#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  PING către serverul curent"
 
-#: ../libpurple/protocols/silc/silc.c:1977
-#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "user &lt;chat&gt;:  Listează utilizatorii dintr-un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1981
-#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12547,141 +8936,91 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2092
-#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "Modul de protocol SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2094
-#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocol SILC (Secure Internet Live Conferencing)"
 
-#: ../libpurple/protocols/silc/silc.c:2135
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2150
 msgid "Network"
 msgstr "Reţea"
 
-#: ../libpurple/protocols/silc/silc.c:2146
-#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Fişier cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:2150
-#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Fişier cheie privată"
 
-#: ../libpurple/protocols/silc/silc.c:2160
-#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Cifru"
 
-#: ../libpurple/protocols/silc/silc.c:2170
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2173
 msgid "Use Perfect Forward Secrecy"
 msgstr "Utilizează „Perfect Forward Secrecy”"
 
-#: ../libpurple/protocols/silc/silc.c:2177
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Autentificare cu cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:2180
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Blochează mesajele fără schimb de chei"
 
-#: ../libpurple/protocols/silc/silc.c:2183
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Blochează mesajele către „whiteboard”"
 
-#: ../libpurple/protocols/silc/silc.c:2186
-#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Deschide automat un „whiteboard”"
 
-#: ../libpurple/protocols/silc/silc.c:2189
-#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Semnează digital şi verifică toate mesajele"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Nu s-a putut crea perechea de chei SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:363
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nume real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nume utilizator: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "Adresă de mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nume calculator: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:371
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizaţie: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:373
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Ţară: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Lungime cheie: \t%d octeţi\n"
 
-#: ../libpurple/protocols/silc/util.c:377
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versiune: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12692,8 +9031,6 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12702,45 +9039,29 @@ msgstr ""
 "Cheie publică silabică:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Detalii cheie publică"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Pager"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Videoconferinţă"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Calculator"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s a trimis un mesaj pentru „whiteboard”. Doriţi să deschid un „whiteboard”?"
 
-#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12749,99 +9070,77 @@ msgstr ""
 "%s a trimis un mesaj către „whiteboard” în chat-ul %s. Doriţi să deschid un "
 "whiteboard?"
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "„Whiteboard”"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Nici o statistică nu e disponibilă pentru server"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Eroare: Nepotrivire de versiune, încercaţi o versiune mai nouă de client"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Eroare: Partenerul nu vă suportă tipul de cheie publică sau nu are încredere "
 "în ea."
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Eroare: Partenerul nu suportă grupul KE propus"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Eroare: Partenerul nu suportă cifrul propus"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Eroare: Partenerul nu suport PKCS-ul propus"
 
-#: ../libpurple/protocols/silc10/ops.c:1952
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Eroare: Partenerul nu suportă funcţia hash propusă"
 
-#: ../libpurple/protocols/silc10/ops.c:1955
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Eroare: Partenerul nu suporta HMAC-ul propus"
 
-#: ../libpurple/protocols/silc10/ops.c:1957
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Eroare: Semnătură incorectă"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Eroare: Cookie invalid"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Eroare: Autentificare eşuată"
 
-#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "Nu s-a putut iniţializa conexiunea ca client SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Ion Fărănume"
 
-#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Nu s-a putut încărca perechea de chei SILC: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Nu s-a putut scrie"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "Conectare eşuată"
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Răspuns necunoscut de la server."
 
-#: ../libpurple/protocols/simple/simple.c:1749
-#: ../libpurple/protocols/simple/simple.c:1795
-#: ../libpurple/protocols/simple/simple.c:1810
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "Nu s-a putut crea un socket de ascultare"
 
-#: ../libpurple/protocols/simple/simple.c:1774
-msgid "Couldn't resolve host"
-msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#: ../libpurple/protocols/simple/simple.c:1875
-msgid "Could not resolve hostname"
-msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Numele de utilizatori SIP nu pot conţine spaţii sau simbolul @"
 
@@ -12853,159 +9152,138 @@ msgstr "Numele de utilizatori SIP nu pot conţine spaţii sau simbolul @"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Modul de protocol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Modulul de protocol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publică statusul (atenţie: oricine vă poate vedea)"
 
-#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Utilizează UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Utilizează proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Autentificare utilizator"
 
-#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Autentificare domeniu"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Caut %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Conectarea la %s a eşuat"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Autentificare: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Nu se poate scrie fişierul %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Nu se poate citi fişierul %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mesaj prea lung, ultimii %s octeţi au fost trunchiaţi."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s nu este autentificat momentan."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Atenţionarea lui %s nu este permisă."
 
-#: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Un mesaj s-a pierdut, aţi depăşit limita de viteză fixată de server."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat-ul în %s nu este disponibil."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Trimiteţi mesajele prea rapid pentru %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Aţi pierdut un mesaj de la %s pentru că era prea mare."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Aţi pierdut un mesaj de la %s pentru că a fost trimis prea repede."
 
-#: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Eşec."
 
-#: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Prea multe potriviri."
 
-#: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "E nevoie de mai multe atribute."
 
-#: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Serviciul „Dir” este temporar indisponibil."
 
-#: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "Email lookup restricted."
 msgstr "Căutarea după adresa de mail este restricţionată."
 
-#: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Cuvântul-cheie a fost ignorat."
 
-#: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Fără cuvinte-cheie."
 
-#: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Nu există informaţii detaliate în director."
 
-#: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Nu există suport de ţară."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Eşec necunoscut: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Nume de utilizator sau parolă incorecte."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Serviciul este temporar indisponibil."
 
-#: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Nivelul propriu de avertizare este prea ridicat pentru a vă putea "
 "autentifica."
 
-#: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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."
@@ -13014,72 +9292,55 @@ msgstr ""
 "încercaţi din nou. Dacă veţi continua să încercaţi, va trebui să aşteptaţi "
 "chiar mai mult."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Eroare necunoscută la autentificare: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Eroare necunoscută: %d. Detalii: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Grup invalid"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Conectare terminată"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Aştept răspunsul..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC a revenit din aşteptare. Puteţi trimite mesaje din nou."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Parola a fost schimbată cu succes"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6847
 msgid "_Group:"
 msgstr "_Grup:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Descărcare detalii „Dir”"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Introducere detalii „Dir”"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Nu s-a putut deschide %s pentru scriere!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Transferul fişierului a eşuat, celălalt utilizator probabil l-a anulat."
 
-#: ../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 "Conectarea pentru transfer a eşuat."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Nu s-a putut scrie antetul fişierului. Fişierul nu va fi transferat."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Salvare ca..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
@@ -13087,7 +9348,6 @@ msgstr[0] "%s cere lui %s să accepte %d fişier: %s (%.2f %s)%s%s"
 msgstr[1] "%s cere lui %s să accepte %d fişiere: %s (%.2f %s)%s%s"
 msgstr[2] "%s cere lui %s să accepte %d de fişiere: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s vă cere să-i trimiteţi un fişier"
@@ -13102,31 +9362,25 @@ msgstr "%s vă cere să-i trimiteţi un fişier"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Modul de protocol TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s v-a trimis o invitaţie de a-i vedea webcam-ul, invitaţie ce nu este încă "
 "suportată"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Mesajul dumneavoastră Yahoo! nu a fost trimis."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr "Mesaj sistem Yahoo! de la %s:"
+msgstr "Mesaj de sistem Yahoo! de la %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Mesaj de autorizare refuzată:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -13135,18 +9389,15 @@ msgstr ""
 "Utilizatorul %s v-a refuzat retroactiv cererea de a-l adăuga la lista de "
 "contacte, din următorul motiv: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Utilizatorul %s v-a refuzat retroactiv cererea de a-l adăuga la lista de "
 "contacte."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "Adăugarea contactului a fost refuzată"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13157,11 +9408,9 @@ msgstr ""
 "Probabil nu vă veţi putea autentifica cu succes pe Yahoo!, căutaţi versiuni "
 "mai noi la %s ."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Autentificarea Yahoo! a eşuat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13170,52 +9419,37 @@ msgstr ""
 "Doriţi să ignoraţi utilizatorul %s, dar e prezent în lista de contacte. "
 "Alegeţi „Da” pentru a-l şterge din listă şi a-l ignora de acum înainte."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "Ignor contactul?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Contul vă este blocat, autentificaţi-vă la www.yahoo.com !"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
 "rezolva această problemă."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server pentru "
 "contul %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "Contactul nu a putut fi adăugat în lista de pe server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audibil %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "S-a primit un răspuns HTTP neaşteptat de la server."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2718
-#: ../libpurple/protocols/yahoo/yahoo.c:2906
-#: ../libpurple/protocols/yahoo/yahoo.c:3011
-#: ../libpurple/protocols/yahoo/yahoo.c:3022
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Probleme la conectare"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13224,7 +9458,6 @@ msgstr ""
 "S-a pierdut conexiunea cu %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13233,103 +9466,72 @@ msgstr ""
 "Nu s-a putut face o conexiune cu %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/protocols/yahoo/yahoo.c:3833
 msgid "Not at Home"
 msgstr "Nu-s acasă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3140
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
 msgid "Not at Desk"
 msgstr "Nu-s la birou"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3839
 msgid "Not in Office"
 msgstr "Nu-s la serviciu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3146
-#: ../libpurple/protocols/yahoo/yahoo.c:3845
 msgid "On Vacation"
 msgstr "În vacanţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3150
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "Stepped Out"
-msgstr "Ieşit(ă) afară"
+msgstr "Ieşit afară"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "Nu este în lista de pe server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "Apar autentificat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
-#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "Par totdeauna deconectat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "Prezenţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "Apar deconectat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "Nu par totdeauna deconectat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "Intră în chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "Iniţiază o conferinţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "Opţiuni de prezenţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "Mâzgălituri"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3561
 msgid "Activate which ID?"
 msgstr "Ce identitate doriţi să activaţi?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3572
 msgid "Join whom in chat?"
 msgstr "Cui doriţi să vă alăturaţi în chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Activate ID..."
 msgstr "Activare identitate..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3588
 msgid "Join User in Chat..."
 msgstr "Chat cu un utilizator..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3593
 msgid "Open Inbox"
 msgstr "Deschidere mail"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4182
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;room&gt;:  Intraţi într-un chat din reţeaua Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Listează chat-urile din reţeaua Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle:  Cereţi unui utilizator să iniţie o sesiune de mâzgălituri"
 
@@ -13343,92 +9545,64 @@ msgstr "doodle:  Cereţi unui utilizator să iniţie o sesiune de mâzgălituri"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Yahoo Protocol Plugin"
 msgstr "Modul de protocol Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Pager server"
 msgstr "Server pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Japan Pager server"
 msgstr "Server pager Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Pager port"
 msgstr "Port pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4441
 msgid "File transfer server"
 msgstr "Server transfer de fişiere"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4444
 msgid "Japan file transfer server"
 msgstr "Server transfer de fişiere Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4447
 msgid "File transfer port"
 msgstr "Port transfer de fişiere"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4450
 msgid "Chat room locale"
 msgstr "Opţiuni locale chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4453
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoră invitaţiile la conferinţe şi chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4461
 msgid "Chat room list URL"
 msgstr "Adresă listă camere de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4464
 msgid "Yahoo Chat server"
 msgstr "Server Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4467
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "S-a trimis o cerere de mâzgăleală."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1111
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1515
 msgid "Unable to establish file descriptor."
 msgstr "Nu se poate evalua descriptorul fişierului."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1410
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s se oferă să vă trimită un grup de %d fişiere.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Eroare la scriere"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -13436,7 +9610,6 @@ msgstr ""
 "Ne cerem scuze, profilurile ce conţin materiale pentru adulţi nu sunt "
 "suportate deocamdată."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -13444,47 +9617,34 @@ msgstr ""
 "Dacă doriţi să vedeţi acest profil va trebui să deschideţi această adresă în "
 "navigator:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "Identitate Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "Hobbyuri"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "Noutăţi"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "Pagină personală"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "Adresă interesantă 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "Adresă interesantă 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "Adresă interesantă 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "Ultima actualizare"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Detaliile utilizatorului %s nu sunt disponibile"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -13492,7 +9652,6 @@ msgstr ""
 "Scuze, acest profil pare să fie într-o limbă sau într-un format nesuportate "
 "deocamdată."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13500,7 +9659,6 @@ msgstr ""
 "Nu s-a putut descărca profilul utilizatorului, probabil din cauza unei "
 "disfuncţionalităţi temporare a serverului. Încercaţi din nou mai târziu."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 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 "
@@ -13511,41 +9669,33 @@ msgstr ""
 "profilul unui utilizator valid. Mai încercaţi o dată dacă ştiţi sigur că "
 "acest utilizator există."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "Profilul utilizatorului este gol."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s a declinat invitaţia la conferinţa din camera de chat „%s” din următorul "
 "motiv: „%s”."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Invitaţie respinsă"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "Intrarea în chat a eşuat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Cameră de chat necunoscută"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Camera de chat e probabil plină"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
-msgstr "Indisponibil(ă)"
+msgstr "Indisponibil"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13553,46 +9703,34 @@ msgstr ""
 "Eroare necunoscută. S-ar putea să trebuiască să vă deconectaţi pentru cinci "
 "minute înainte de a reintra în camera de chat."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Aţi intrat în camera de chat %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Intrarea în chat alături de acest contact a eşuat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Poate nu e sau nu sunt în nici un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Obţinerea listei camerelor de chat a eşuat."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Audio"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Video"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Nu se poate obţine lista camerelor de chat."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Probleme de conectare la serverul YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13601,7 +9739,6 @@ msgstr ""
 "S-a pierdut conexiunea cu serverul\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13609,79 +9746,60 @@ msgstr ""
 "(Eroare la conversia mesajului.\t Verificaţi opţiunea „Codare” în editorul "
 "de conturi)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Nu s-a putut trimite către chat-ul %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:795
-#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
-msgstr "Invizibil(ă) sau deconectat(ă)"
+msgstr "Invizibil sau deconectat"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>În %s din %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1510
-#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Oricine"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_Clasă:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_Instanţă:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "_Destinatar:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Încercarea de subscriere la %s,%s,%s a eşuat"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nume ales&gt;:  Localizaţi un utilizator"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nume ales&gt;:  Localizaţi un utilizator"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instanţă&gt;:  Setaţi instanţa de utilizat în această clasă"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instanţă&gt;:  Setaţi instanţa de utilizat în această clasă"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2725
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instanţă&gt;:  Setaţi instanţa de utilizat în această clasă"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clasă&gt; &lt;instanţă&gt; &lt;destinatar&gt;:  Intraţi într-un chat "
 "nou"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2736
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instanţă&gt;:  Trimiteţi un mesaj către &lt;mesaj,<i>instanţă</i>,"
 "*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2742
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13689,7 +9807,6 @@ msgstr ""
 "zci &lt;clasă&gt; &lt;instanţă&gt;:  Trimiteţi un mesaj către &lt;<i>clasă</"
 "i>,<i>instanţă</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2748
 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;"
@@ -13697,7 +9814,6 @@ msgstr ""
 "zcir &lt;clasă&gt; &lt;instanţă&gt; &lt;destinatar&gt;:  Trimiteţi un mesaj "
 "către &lt;<i>clasă</i>,<i>instanţă</i>,<i>destinatar</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13705,16 +9821,13 @@ msgstr ""
 "zir &lt;instanţă&gt; &lt;destinatar&gt;:  Trimiteţi un mesaj către &lt;MESAJ,"
 "<i>instanţă</i>,<i>destinatar</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2759
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;clasă&gt;:  Trimiteţi un mesaj către &lt;<i>clasă</i>,PERSONAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "Reînregistrare"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "Descarcă subscrierile de pe server"
 
@@ -13728,45 +9841,33 @@ msgstr "Descarcă subscrierile de pe server"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2931
-#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "Modul de protocol Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "Utilizează tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "Comandă tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "Exportă în .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "Exportă în .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "Importă din .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "Importă din .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "Domeniu"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "Expunere"
 
-#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
-#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13775,76 +9876,61 @@ msgstr ""
 "Nu s-a putut crea un socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:687
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
-#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Eroare la conectarea la serverul proxy HTTP: %d"
 
-#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Acces interzis: serverul proxy nu permite tunelarea portului %d."
 
-#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "Eroare la rezolvarea %s"
 
-#: ../libpurple/proxy.c:1793
 msgid "Could not resolve host name"
 msgstr "Nu s-a putut rezolva numele serverului"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Se cere atenţie din partea contactului %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s v-a cerut puţină atenţie!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_No"
 msgstr "_Nu"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "_Acceptă"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Lipsesc momentan"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "statusuri salvate"
 
-#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s este cunoscut acum ca %s.\n"
 
-#: ../libpurple/server.c:356
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "Se cere atenţie din partea contactului %s..."
-
-#: ../libpurple/server.c:401
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s v-a cerut puţină atenţie!"
-
-#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13853,98 +9939,96 @@ msgstr ""
 "%s a invitat utilizatorul %s în camera de chat %s\n"
 "%s"
 
-#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invitat utilizatorul %s în camera de chat %s\n"
 
-#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "Acceptaţi invitaţia la chat?"
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+msgid "Shortcut"
+msgstr "Combinaţie de semne"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Combinaţia de semne pentru iconiţa simbolică"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Imagine stocată"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Imagine stocată (mai bine decât nimic deocamdată)."
+
 msgid "SSL Connection Failed"
 msgstr "Conexiunea SSL a eşuat"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Conexiunea SSL a eşuat"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "Partenerul SSL a prezentat un certificat invalid"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Eroare SSL necunoscută"
 
-#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Nesetat"
 
-#: ../libpurple/status.c:157 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1088
 msgid "Do not disturb"
 msgstr "Nu deranjaţi"
 
-#: ../libpurple/status.c:160
 msgid "Extended away"
 msgstr "Absenţă prelungită"
 
-#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:162
 msgid "Listening to music"
 msgstr "Audiţie muzicală"
 
-#: ../libpurple/status.c:611
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) şi-a schimbat statusul din %s în %s"
 
-#: ../libpurple/status.c:622
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) este acum %s"
 
-#: ../libpurple/status.c:628
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) nu mai este %s"
 
-#: ../libpurple/status.c:1243
 #, c-format
 msgid "%s became idle"
 msgstr "%s a intrat în inactivitate"
 
-#: ../libpurple/status.c:1263
 #, c-format
 msgid "%s became unidle"
 msgstr "%s a revenit din inactivitate"
 
-#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s a intrat în inactivitate"
 
-#: ../libpurple/status.c:1331
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s a revenit din inactivitate"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x la %X"
 
-#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Eroare la citirea %s"
 
-#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13953,15 +10037,12 @@ msgstr ""
 "A apărut o eroare la citirea fişierului %s. Încărcarea datelor a eşuat şi "
 "vechiul fişier a fost redenumit „%s~”."
 
-#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Se calculează..."
 
-#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Necunoscut."
 
-#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13969,7 +10050,6 @@ msgstr[0] "o secundă"
 msgstr[1] "%d secunde"
 msgstr[2] "%d de secunde"
 
-#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13977,7 +10057,6 @@ msgstr[0] "o zi"
 msgstr[1] "%d zile"
 msgstr[2] "%d de zile"
 
-#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13985,7 +10064,6 @@ msgstr[0] "%s, o oră"
 msgstr[1] "%s, %d ore"
 msgstr[2] "%s, %d de ore"
 
-#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13993,7 +10071,6 @@ msgstr[0] "o oră"
 msgstr[1] "%d ore"
 msgstr[2] "%d de ore"
 
-#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -14001,7 +10078,6 @@ msgstr[0] "%s, un minut"
 msgstr[1] "%s, %d minute"
 msgstr[2] "%s, %d de minute"
 
-#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -14009,17 +10085,14 @@ msgstr[0] "un minut"
 msgstr[1] "%d minute"
 msgstr[2] "%d de minute"
 
-#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Nu s-a putut deschide %s: prea multe redirectări"
 
-#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Conectarea la %s a eşuat"
 
-#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -14028,137 +10101,116 @@ msgstr ""
 "Nu se poate aloca suficientă memorie pentru a păstra datele de la %s. S-ar "
 "putea ca serverul web să încerce ceva rău intenţionat."
 
-#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Eroare la citirea din %s: %s"
 
-#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Eroare la scrierea %s: %s"
 
-#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nu s-a reuşit conectarea la %s: %s"
 
-#: ../libpurple/util.c:4696
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4702
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:322
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Conexiunea a fost întreruptă de un alt program pornit."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:325
+#, c-format
 msgid "Remote host closed connection."
 msgstr "Conexiunea a fost închisă la distanţă."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:328
+#, c-format
 msgid "Connection timed out."
 msgstr "Conexiunea a expirat."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:331
+#, c-format
 msgid "Connection refused."
 msgstr "Conexiune resetată."
 
-#: ../pidgin.desktop.in.h:1
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Adresa este deja utilizată."
+
 msgid "Internet Messenger"
 msgstr "Mesagerie instant"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Mesagerul Pidgin"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Trimiteţi mesaje instant prin orice protocol IM"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientare"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Orientare zonă de notificare."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Opţiuni de autentificare"
 
-#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tocol:"
 
-#: ../pidgin/gtkaccount.c:411 ../pidgin/gtkaccount.c:1039
 msgid "_Username:"
 msgstr "Nume _utilizator:"
 
-#: ../pidgin/gtkaccount.c:501
 msgid "Remember pass_word"
 msgstr "_Salvare parolă"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:555
 msgid "User Options"
 msgstr "Opţiuni personale"
 
-#: ../pidgin/gtkaccount.c:568
 msgid "_Local alias:"
 msgstr "_Alias local:"
 
-#: ../pidgin/gtkaccount.c:572
 msgid "New _mail notifications"
 msgstr "Notificare la _mail nou"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:577
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizează această _iconiţă pentru acest cont:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:705
 #, c-format
 msgid "%s Options"
 msgstr "Opţiuni %s"
 
-#: ../pidgin/gtkaccount.c:910
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizează opţiunile GNOME"
 
-#: ../pidgin/gtkaccount.c:911
 msgid "Use Global Proxy Settings"
 msgstr "Utilizează opţiunile generice"
 
-#: ../pidgin/gtkaccount.c:917
 msgid "No Proxy"
 msgstr "Fără proxy"
 
-#: ../pidgin/gtkaccount.c:923
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:929
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:935
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:941 ../pidgin/gtkprefs.c:1340
 msgid "Use Environmental Settings"
 msgstr "Utilizează opţiunile de mediu"
 
@@ -14167,69 +10219,52 @@ msgstr "Utilizează opţiunile de mediu"
 #. 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:980
 msgid "If you look real closely"
 msgstr "Dacă vă uitaţi cu atenţie"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:983
 msgid "you can see the butterflies mating"
 msgstr "veţi puteţi vedea cum se scurg secundele..."
 
-#: ../pidgin/gtkaccount.c:1004
 msgid "Proxy Options"
 msgstr "Opţiuni proxy"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1334
 msgid "Proxy _type:"
 msgstr "_Tip proxy:"
 
-#: ../pidgin/gtkaccount.c:1027 ../pidgin/gtkprefs.c:1355
 msgid "_Host:"
 msgstr "Ser_ver:"
 
-#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:1373
 msgid "_Port:"
 msgstr "P_ort:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1410
 msgid "Pa_ssword:"
 msgstr "Pa_rolă:"
 
-#: ../pidgin/gtkaccount.c:1171
 msgid "Unable to save new account"
 msgstr "Nu se poate salva noul cont"
 
-#: ../pidgin/gtkaccount.c:1172
 msgid "An account already exists with the specified criteria."
 msgstr "Există deja un cont cu aceste proprietăţi."
 
-#: ../pidgin/gtkaccount.c:1449
 msgid "Add Account"
 msgstr "Adăugare cont"
 
-#: ../pidgin/gtkaccount.c:1466
 msgid "_Basic"
 msgstr "S_tandard"
 
-#: ../pidgin/gtkaccount.c:1473
-msgid "Create this new account on the server"
-msgstr "Creează acest nou cont pe server"
+msgid "Create _this new account on the server"
+msgstr "Creează acest _nou cont pe server"
 
-#: ../pidgin/gtkaccount.c:1487
 msgid "_Advanced"
 msgstr "_Avansat"
 
-#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtkplugin.c:753
-#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
-msgstr "Activat"
+msgstr "Activare"
 
-#: ../pidgin/gtkaccount.c:1936
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2139
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14253,7 +10288,6 @@ msgstr ""
 "conturi utilizând <b>Conturi->Adăugare/Editare</b> în fereastra listei de "
 "contacte."
 
-#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -14262,7 +10296,6 @@ msgstr[0] "Aveţi deja %d contact numit %s. Doriţi să le uniţi?"
 msgstr[1] "Aveţi deja %d contacte numite %s. Doriţi să le uniţi?"
 msgstr[2] "Aveţi deja %d de contacte numite %s. Doriţi să le uniţi?"
 
-#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
@@ -14272,126 +10305,96 @@ msgstr ""
 "contacte şi să folosească o singură fereastră de conversaţie. Le puteţi "
 "separa din nou alegând „Desfă” din meniul contextual al contactului."
 
-#: ../pidgin/gtkblist.c:683
 msgid "Please update the necessary fields."
 msgstr "Trebuie să actualizaţi câmpurile cerute."
 
-#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkblist.c:6794
 msgid "Room _List"
 msgstr "_Listă de camere"
 
-#: ../pidgin/gtkblist.c:1058
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduceţi detaliile chat-ului în care doriţi să intraţi.\n"
 
-#: ../pidgin/gtkblist.c:1070 ../pidgin/gtkblist.c:6829
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "C_ont:"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkprivacy.c:549
-#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Blochează"
 
-#: ../pidgin/gtkblist.c:1349
 msgid "Un_block"
 msgstr "De_blochează"
 
-#: ../pidgin/gtkblist.c:1392
 msgid "Move to"
 msgstr "Mută în"
 
-#: ../pidgin/gtkblist.c:1432
 msgid "Get _Info"
 msgstr "_Detalii"
 
-#: ../pidgin/gtkblist.c:1435 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Mesaj"
 
-#: ../pidgin/gtkblist.c:1441
 msgid "_Send File..."
 msgstr "_Trimitere fişier..."
 
-#: ../pidgin/gtkblist.c:1448
 msgid "Add Buddy _Pounce..."
 msgstr "Adăugare întâm_pinare..."
 
-#: ../pidgin/gtkblist.c:1453 ../pidgin/gtkblist.c:1457
-#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1602
 msgid "View _Log"
 msgstr "Arată în_registrările"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Hide when offline"
 msgstr "Ascunde la deconectare"
 
-#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Show when offline"
 msgstr "Arată la deconectare"
 
-#: ../pidgin/gtkblist.c:1477 ../pidgin/gtkblist.c:1486
-#: ../pidgin/gtkblist.c:1587 ../pidgin/gtkblist.c:1608
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkblist.c:1488
-#: ../pidgin/gtkblist.c:1589 ../pidgin/gtkblist.c:1610
 msgid "_Remove"
 msgstr "Şter_ge"
 
-#: ../pidgin/gtkblist.c:1538
+msgid "Set Custom Icon"
+msgstr "Alegere iconiţă personalizată"
+
+msgid "Remove Custom Icon"
+msgstr "Şterge iconiţă personalizată"
+
 msgid "Add _Buddy..."
 msgstr "Adaugă _contact..."
 
-#: ../pidgin/gtkblist.c:1541
 msgid "Add C_hat..."
 msgstr "Adaugă un c_hat..."
 
-#: ../pidgin/gtkblist.c:1544
 msgid "_Delete Group"
 msgstr "Şter_gere grup"
 
-#: ../pidgin/gtkblist.c:1546
 msgid "_Rename"
 msgstr "_Redenumire"
 
 #. join button
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Intră"
 
-#: ../pidgin/gtkblist.c:1573
 msgid "Auto-Join"
 msgstr "Intră automat"
 
-#: ../pidgin/gtkblist.c:1575
 msgid "Persistent"
 msgstr "Persistent"
 
-#: ../pidgin/gtkblist.c:1585
 msgid "_Edit Settings..."
 msgstr "_Editare opţiuni..."
 
-#: ../pidgin/gtkblist.c:1615 ../pidgin/gtkblist.c:1638
 msgid "_Collapse"
 msgstr "_Strânge"
 
-#: ../pidgin/gtkblist.c:1643
 msgid "_Expand"
 msgstr "Des_fă"
 
-#: ../pidgin/gtkblist.c:1894 ../pidgin/gtkblist.c:1906
-#: ../pidgin/gtkblist.c:5493 ../pidgin/gtkblist.c:5506
 msgid "/Tools/Mute Sounds"
 msgstr "/Unelte/Fără sunete"
 
-#: ../pidgin/gtkblist.c:2366 ../pidgin/gtkconv.c:4926
-#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -14401,148 +10404,116 @@ msgstr ""
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2717
 msgid "Unknown node type"
 msgstr "Tip necunoscut de nod"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3153
 msgid "/_Buddies"
 msgstr "/Contact_e"
 
-#: ../pidgin/gtkblist.c:3154
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacte/Trimite un nou _mesaj..."
 
-#: ../pidgin/gtkblist.c:3155
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacte/Intră într-un _chat..."
 
-#: ../pidgin/gtkblist.c:3156
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacte/Caută deta_lii..."
 
-#: ../pidgin/gtkblist.c:3157
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacte/Caută în în_registrări..."
 
-#: ../pidgin/gtkblist.c:3159
 msgid "/Buddies/Sh_ow"
 msgstr "/Contacte/Ara_tă"
 
-#: ../pidgin/gtkblist.c:3160
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Contacte/Arată/Contactele dec_onectate"
 
-#: ../pidgin/gtkblist.c:3161
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Contacte/Arată/Grupurile _fără contacte"
 
-#: ../pidgin/gtkblist.c:3162
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Contacte/Arată/_Detaliile contactelor"
 
-#: ../pidgin/gtkblist.c:3163
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Contacte/Arată/Inac_tivitatea contactelor"
 
-#: ../pidgin/gtkblist.c:3164
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Contacte/Arată/Iconiţele de _protocol"
 
-#: ../pidgin/gtkblist.c:3165
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacte/_Sortează contactele"
 
-#: ../pidgin/gtkblist.c:3167
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacte/_Adaugă un contact..."
 
-#: ../pidgin/gtkblist.c:3168
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacte/Adaugă un c_hat..."
 
-#: ../pidgin/gtkblist.c:3169
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacte/Adaugă un _grup..."
 
-#: ../pidgin/gtkblist.c:3171
 msgid "/Buddies/_Quit"
 msgstr "/Contacte/_Ieşire"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3174
 msgid "/_Accounts"
 msgstr "/_Conturi"
 
-#: ../pidgin/gtkblist.c:3175 ../pidgin/gtkblist.c:7514
-msgid "/Accounts/Manage"
-msgstr "/Conturi/Administrare"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Conturi/Administrare conturi"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3178
 msgid "/_Tools"
-msgstr "/Unel_te"
+msgstr "/_Unelte"
 
-#: ../pidgin/gtkblist.c:3179
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Unelte/Î_ntâmpinări contacte"
 
-#: ../pidgin/gtkblist.c:3180
 msgid "/Tools/_Certificates"
 msgstr "/Unelte/_Certificate"
 
-#: ../pidgin/gtkblist.c:3181
 msgid "/Tools/Plu_gins"
 msgstr "/Unelte/_Module"
 
-#: ../pidgin/gtkblist.c:3182
 msgid "/Tools/Pr_eferences"
 msgstr "/Unelte/_Preferinţe"
 
-#: ../pidgin/gtkblist.c:3183
 msgid "/Tools/Pr_ivacy"
 msgstr "/Unelte/S_ecuritate"
 
-#: ../pidgin/gtkblist.c:3185
+msgid "/Tools/Smile_y"
+msgstr "/Unelte/_Iconiţe simbolice"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Unelte/_Transfer de fişiere"
 
-#: ../pidgin/gtkblist.c:3186
 msgid "/Tools/R_oom List"
 msgstr "/Unelte/_Listă camere de chat"
 
-#: ../pidgin/gtkblist.c:3187
 msgid "/Tools/System _Log"
 msgstr "/Unelte/În_registrări de sistem"
 
-#: ../pidgin/gtkblist.c:3189
 msgid "/Tools/Mute _Sounds"
 msgstr "/Unelte/Fără _sunete"
 
 #. Help
-#: ../pidgin/gtkblist.c:3191
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: ../pidgin/gtkblist.c:3192
 msgid "/Help/Online _Help"
 msgstr "/Ajutor/Ajutor _online"
 
-#: ../pidgin/gtkblist.c:3193
 msgid "/Help/_Debug Window"
 msgstr "/Ajutor/_Fereastră de depanare"
 
-#: ../pidgin/gtkblist.c:3195 ../pidgin/gtkblist.c:3197
 msgid "/Help/_About"
 msgstr "/Ajutor/_Despre"
 
-#: ../pidgin/gtkblist.c:3228
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Cont:</b> %s"
 
-#: ../pidgin/gtkblist.c:3247
 #, c-format
 msgid ""
 "\n"
@@ -14551,7 +10522,6 @@ msgstr ""
 "\n"
 "<b>Ocupanţi:</b> %d"
 
-#: ../pidgin/gtkblist.c:3252
 #, c-format
 msgid ""
 "\n"
@@ -14560,87 +10530,66 @@ msgstr ""
 "\n"
 "<b>Subiect:</b> %s"
 
-#: ../pidgin/gtkblist.c:3252
 msgid "(no topic set)"
 msgstr "(fără subiect)"
 
-#: ../pidgin/gtkblist.c:3331
 msgid "Buddy Alias"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkblist.c:3360
 msgid "Logged In"
-msgstr "Autentificat(ă)"
+msgstr "Autentificat"
 
-#: ../pidgin/gtkblist.c:3406
 msgid "Last Seen"
 msgstr "Ultima apariţie"
 
-#: ../pidgin/gtkblist.c:3427
 msgid "Spooky"
 msgstr "Fantomatic"
 
-#: ../pidgin/gtkblist.c:3429
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3431
 msgid "Rockin'"
 msgstr "Beton"
 
-#: ../pidgin/gtkblist.c:3462
 msgid "Total Buddies"
 msgstr "Contacte în total"
 
-#: ../pidgin/gtkblist.c:3824
 #, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "Inactiv(ă) de: %dd %dh %02dm"
+msgstr "Inactiv de: %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3826
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "Inactiv(ă) de: %do %02dm"
+msgstr "Inactiv de: %do %02dm"
 
-#: ../pidgin/gtkblist.c:3828
 #, c-format
 msgid "Idle %dm"
-msgstr "Inactiv(ă) de: %dm"
+msgstr "Inactiv de: %dm"
 
-#: ../pidgin/gtkblist.c:3982
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacte/Trimite un nou mesaj..."
 
-#: ../pidgin/gtkblist.c:3983 ../pidgin/gtkblist.c:4016
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacte/Intră într-un chat..."
 
-#: ../pidgin/gtkblist.c:3984
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacte/Caută detalii..."
 
-#: ../pidgin/gtkblist.c:3985
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacte/Adaugă un contact..."
 
-#: ../pidgin/gtkblist.c:3986 ../pidgin/gtkblist.c:4019
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacte/Adaugă un chat..."
 
-#: ../pidgin/gtkblist.c:3987
 msgid "/Buddies/Add Group..."
 msgstr "/Contacte/Adaugă un grup..."
 
-#: ../pidgin/gtkblist.c:4022
 msgid "/Tools/Privacy"
 msgstr "/Unelte/Securitate"
 
-#: ../pidgin/gtkblist.c:4025
 msgid "/Tools/Room List"
 msgstr "/Unelte/Listă camere de chat"
 
-#: ../pidgin/gtkblist.c:4157 ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -14648,41 +10597,32 @@ msgstr[0] "%d mesaj necitit de la %s\n"
 msgstr[1] "%d mesaje necitite de la %s\n"
 msgstr[2] "%d de mesaje necitite de la %s\n"
 
-#: ../pidgin/gtkblist.c:4320
 msgid "Manually"
 msgstr "Manual"
 
-#: ../pidgin/gtkblist.c:4323
 msgid "By status"
 msgstr "După status"
 
-#: ../pidgin/gtkblist.c:4324
 msgid "By log size"
 msgstr "După mărimea înregistrărilor"
 
-#: ../pidgin/gtkblist.c:4662
 #, c-format
 msgid "%s disconnected"
 msgstr "%s s-a deconectat"
 
-#: ../pidgin/gtkblist.c:4664
 #, c-format
 msgid "%s disabled"
-msgstr "%s dezactivat(ă)"
+msgstr "%s dezactivat"
 
-#: ../pidgin/gtkblist.c:4668
 msgid "Reconnect"
 msgstr "Reconectare"
 
-#: ../pidgin/gtkblist.c:4668 ../pidgin/gtkblist.c:4787
 msgid "Re-enable"
 msgstr "Reactivare"
 
-#: ../pidgin/gtkblist.c:4785
 msgid "Welcome back!"
 msgstr "Bine aţi revenit!"
 
-#: ../pidgin/gtkblist.c:4821
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14695,82 +10635,66 @@ msgstr[2] ""
 "%d de conturi v-au fost dezactivate pentru că v-aţi autentificat din altă "
 "parte:"
 
-#: ../pidgin/gtkblist.c:5100
 msgid "<b>Username:</b>"
 msgstr "<b>Nume utilizator:</b>"
 
-#: ../pidgin/gtkblist.c:5107
 msgid "<b>Password:</b>"
 msgstr "<b>Parolă:</b>"
 
-#: ../pidgin/gtkblist.c:5118
 msgid "_Login"
 msgstr "_Autentificare"
 
-#: ../pidgin/gtkblist.c:5202
 msgid "/Accounts"
 msgstr "/Conturi"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5216
 #, 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Bun venit în %s!</span>\n"
 "\n"
 "Nu aveţi nici un cont activ. Activaţi-vă conturile de mesagerie instant în "
-"fereastra <b>Conturi</b>, accesibilă pe calea <b>Conturi->Administrare</b>. "
-"Abia după activare veţi putea utiliza conturile definite."
+"fereastra <b>Conturi</b>, accesibilă pe calea <b>Conturi->Administrare "
+"conturi</b>. Abia după activare veţi putea utiliza conturile definite."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5487
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Contacte/Arată/Contactele deconectate"
 
-#: ../pidgin/gtkblist.c:5490
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Contacte/Arată/Grupurile fără contacte"
 
-#: ../pidgin/gtkblist.c:5496
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Contacte/Arată/Detaliile contactelor"
 
-#: ../pidgin/gtkblist.c:5499
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Contacte/Arată/Inactivitatea contactelor"
 
-#: ../pidgin/gtkblist.c:5502
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Contacte/Arată/Iconiţele de protocol"
 
-#: ../pidgin/gtkblist.c:6455
 msgid "Add a buddy.\n"
 msgstr "Adaugă un contact.\n"
 
-#: ../pidgin/gtkblist.c:6470
 msgid "Buddy's _username:"
 msgstr "Nume de _utilizator:"
 
-#: ../pidgin/gtkblist.c:6492
 msgid "(Optional) A_lias:"
 msgstr "A_lias (opţional):"
 
-#: ../pidgin/gtkblist.c:6510
 msgid "Add buddy to _group:"
 msgstr "Adaugă contactul în _grupul:"
 
-#: ../pidgin/gtkblist.c:6759
 msgid "This protocol does not support chat rooms."
 msgstr "Acest protocol nu suportă camere de chat."
 
-#: ../pidgin/gtkblist.c:6775
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14778,7 +10702,6 @@ msgstr ""
 "Nu sunteţi autentificat(ă) cu vreun protocol prin care să puteţi iniţia un "
 "chat."
 
-#: ../pidgin/gtkblist.c:6819
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14786,80 +10709,62 @@ msgstr ""
 "Introduceţi un alias şi informaţiile necesare pentru acel chat pe care "
 "doriţi să-l adăugaţi în lista de contacte.\n"
 
-#: ../pidgin/gtkblist.c:6842
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6849
 msgid "Auto_join when account becomes online."
 msgstr "Intră a_utomat când contul e online."
 
-#: ../pidgin/gtkblist.c:6850
 msgid "_Hide chat when the window is closed."
 msgstr "Ascunde acest c_hat când fereastra e închisă."
 
-#: ../pidgin/gtkblist.c:6876
 msgid "Please enter the name of the group to be added."
 msgstr "Introduceţi numele grupului de adăugat."
 
-#: ../pidgin/gtkblist.c:7534
+msgid "Enable Account"
+msgstr "Activare cont"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Conturi/Activare cont"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Conturi/"
 
-#: ../pidgin/gtkblist.c:7558
 msgid "_Edit Account"
 msgstr "_Editare cont"
 
-#: ../pidgin/gtkblist.c:7571 ../pidgin/gtkconv.c:3220
 msgid "No actions available"
 msgstr "Nici o acţiune nu e disponibilă"
 
-#: ../pidgin/gtkblist.c:7579
 msgid "_Disable"
 msgstr "_Dezactivare"
 
-#: ../pidgin/gtkblist.c:7591
-msgid "Enable Account"
-msgstr "Activare cont"
-
-#: ../pidgin/gtkblist.c:7597
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Conturi/Activare cont"
-
-#: ../pidgin/gtkblist.c:7646
 msgid "/Tools"
 msgstr "/Unelte"
 
-#: ../pidgin/gtkblist.c:7716
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacte/Sortează contactele"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "Servere SSL"
 
-#: ../pidgin/gtkconv.c:487
 msgid "Unknown command."
 msgstr "Comandă necunoscută."
 
-#: ../pidgin/gtkconv.c:771 ../pidgin/gtkconv.c:798
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Contactul nu este în acelaşi protocol cu acest chat."
 
-#: ../pidgin/gtkconv.c:792
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Nu sunteţi autentificat(ă) cu nici un protocol prin care care să puteţi "
 "invita acel contact."
 
-#: ../pidgin/gtkconv.c:846
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invită contactul în camera de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:876
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14867,187 +10772,138 @@ msgstr ""
 "Introduceţi numele utilizatorului pe care doriţi să-l invitaţi. Puteţi "
 "adăuga un mesaj de invitare opţional."
 
-#: ../pidgin/gtkconv.c:897
 msgid "_Buddy:"
 msgstr "_Contact:"
 
-#: ../pidgin/gtkconv.c:910 ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Mesaj:"
 
-#: ../pidgin/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Discuţie cu %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1011
 msgid "Save Conversation"
 msgstr "Salvează discuţia"
 
-#: ../pidgin/gtkconv.c:1157 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Caută"
 
-#: ../pidgin/gtkconv.c:1183 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "Cau_tă:"
 
-#: ../pidgin/gtkconv.c:1684
 msgid "Un-Ignore"
 msgstr "Nu ignora"
 
-#: ../pidgin/gtkconv.c:1687
 msgid "Ignore"
 msgstr "Ignoră"
 
-#: ../pidgin/gtkconv.c:1707
 msgid "Get Away Message"
 msgstr "Obţine mesajul în absenţă"
 
-#: ../pidgin/gtkconv.c:1730
 msgid "Last said"
 msgstr "Ultima replică"
 
-#: ../pidgin/gtkconv.c:2715
 msgid "Unable to save icon file to disk."
 msgstr "Nu se poate salva pe disc avatarul."
 
-#: ../pidgin/gtkconv.c:2793
 msgid "Save Icon"
 msgstr "Salvare avatar"
 
-#: ../pidgin/gtkconv.c:2851
 msgid "Animate"
 msgstr "Animare"
 
-#: ../pidgin/gtkconv.c:2856
 msgid "Hide Icon"
 msgstr "Ascundere avatar"
 
-#: ../pidgin/gtkconv.c:2859
 msgid "Save Icon As..."
 msgstr "Salvare avatar ca..."
 
-#: ../pidgin/gtkconv.c:2863
 msgid "Set Custom Icon..."
 msgstr "Iconiţă personalizată..."
 
-#: ../pidgin/gtkconv.c:2867
 msgid "Change Size"
 msgstr "Schimbare mărime"
 
-#: ../pidgin/gtkconv.c:2880
-msgid "Remove Custom Icon"
-msgstr "Iconiţă implicită"
-
-#: ../pidgin/gtkconv.c:3005
 msgid "Show All"
 msgstr "Arată tot"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:3024
 msgid "/_Conversation"
 msgstr "/_Discuţie"
 
-#: ../pidgin/gtkconv.c:3026
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Discuţie/_Mesaj nou..."
 
-#: ../pidgin/gtkconv.c:3031
 msgid "/Conversation/_Find..."
 msgstr "/Discuţie/C_aută..."
 
-#: ../pidgin/gtkconv.c:3033
 msgid "/Conversation/View _Log"
 msgstr "/Discuţie/Arată în_registrările"
 
-#: ../pidgin/gtkconv.c:3034
 msgid "/Conversation/_Save As..."
 msgstr "/Discuţie/_Salvează ca..."
 
-#: ../pidgin/gtkconv.c:3036
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Discuţie/G_oleşte fereastra"
 
-#: ../pidgin/gtkconv.c:3040
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuţie/_Trimite un fişier..."
 
-#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Discuţie/Adaugă î_ntâmpinare..."
 
-#: ../pidgin/gtkconv.c:3043
 msgid "/Conversation/_Get Info"
 msgstr "/Discuţie/D_etalii"
 
-#: ../pidgin/gtkconv.c:3045
 msgid "/Conversation/In_vite..."
 msgstr "/Discuţie/_Invită..."
 
-#: ../pidgin/gtkconv.c:3047
 msgid "/Conversation/M_ore"
 msgstr "/Discuţie/Mai m_ult"
 
-#: ../pidgin/gtkconv.c:3051
 msgid "/Conversation/Al_ias..."
 msgstr "/Discuţie/Al_ias..."
 
-#: ../pidgin/gtkconv.c:3053
 msgid "/Conversation/_Block..."
 msgstr "/Discuţie/_Blochează..."
 
-#: ../pidgin/gtkconv.c:3055
 msgid "/Conversation/_Unblock..."
 msgstr "/Discuţie/Deblochea_ză..."
 
-#: ../pidgin/gtkconv.c:3057
 msgid "/Conversation/_Add..."
 msgstr "/Discuţie/A_daugă..."
 
-#: ../pidgin/gtkconv.c:3059
 msgid "/Conversation/_Remove..."
 msgstr "/Discuţie/Şter_ge..."
 
-#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Discuţie/Inserează o a_dresă..."
 
-#: ../pidgin/gtkconv.c:3066
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Discuţie/Inserea_ză o imagine..."
 
-#: ../pidgin/gtkconv.c:3072
 msgid "/Conversation/_Close"
 msgstr "/Discuţie/În_chide"
 
 #. Options
-#: ../pidgin/gtkconv.c:3076
 msgid "/_Options"
 msgstr "/_Opţiuni"
 
-#: ../pidgin/gtkconv.c:3077
 msgid "/Options/Enable _Logging"
 msgstr "/Opţiuni/Activează în_registrarea"
 
-#: ../pidgin/gtkconv.c:3078
 msgid "/Options/Enable _Sounds"
 msgstr "/Opţiuni/Activează _sunetul"
 
-#: ../pidgin/gtkconv.c:3080
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opţiuni/Arată bara cu _unelte"
 
-#: ../pidgin/gtkconv.c:3081
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opţiuni/Arată _marcaje de timp"
 
-#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/More"
 msgstr "/Discuţie/Mai mult"
 
-#: ../pidgin/gtkconv.c:3264
 msgid "/Options"
 msgstr "/Opţiuni"
 
@@ -15056,79 +10912,60 @@ msgstr "/Opţiuni"
 #. 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:3299 ../pidgin/gtkconv.c:3331
 msgid "/Conversation"
 msgstr "/Discuţie"
 
-#: ../pidgin/gtkconv.c:3339
 msgid "/Conversation/View Log"
 msgstr "/Discuţie/Arată înregistrările"
 
-#: ../pidgin/gtkconv.c:3345
 msgid "/Conversation/Send File..."
 msgstr "/Discuţie/Trimite un fişier..."
 
-#: ../pidgin/gtkconv.c:3349
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Discuţie/Adaugă o întâmpinare..."
 
-#: ../pidgin/gtkconv.c:3355
 msgid "/Conversation/Get Info"
 msgstr "/Discuţie/Caută detalii"
 
-#: ../pidgin/gtkconv.c:3359
 msgid "/Conversation/Invite..."
 msgstr "/Discuţie/Invită..."
 
-#: ../pidgin/gtkconv.c:3365
 msgid "/Conversation/Alias..."
 msgstr "/Discuţie/Alias..."
 
-#: ../pidgin/gtkconv.c:3369
 msgid "/Conversation/Block..."
 msgstr "/Discuţie/Blochează..."
 
-#: ../pidgin/gtkconv.c:3373
 msgid "/Conversation/Unblock..."
 msgstr "/Discuţie/Deblochează..."
 
-#: ../pidgin/gtkconv.c:3377
 msgid "/Conversation/Add..."
 msgstr "/Discuţie/Adaugă..."
 
-#: ../pidgin/gtkconv.c:3381
 msgid "/Conversation/Remove..."
 msgstr "/Discuţie/Şterge..."
 
-#: ../pidgin/gtkconv.c:3387
 msgid "/Conversation/Insert Link..."
 msgstr "/Discuţie/Inserează o adresă..."
 
-#: ../pidgin/gtkconv.c:3391
 msgid "/Conversation/Insert Image..."
 msgstr "/Discuţie/Inserează o imagine..."
 
-#: ../pidgin/gtkconv.c:3397
 msgid "/Options/Enable Logging"
 msgstr "/Opţiuni/Activează înregistrarea"
 
-#: ../pidgin/gtkconv.c:3400
 msgid "/Options/Enable Sounds"
 msgstr "/Opţiuni/Activează sunetul"
 
-#: ../pidgin/gtkconv.c:3413
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opţiuni/Arată bara cu unelte"
 
-#: ../pidgin/gtkconv.c:3416
 msgid "/Options/Show Timestamps"
 msgstr "/Opţiuni/Arată marcaje de timp"
 
-#: ../pidgin/gtkconv.c:3494
 msgid "User is typing..."
 msgstr "Utilizatorul vă scrie..."
 
-#: ../pidgin/gtkconv.c:3568
 #, c-format
 msgid ""
 "\n"
@@ -15138,20 +10975,16 @@ msgstr ""
 "%s a încetat să vă scrie"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3748 ../pidgin/gtkconv.c:8472
 msgid "S_end To"
-msgstr "Trimite cătr_e"
+msgstr "_Trimite către"
 
-#: ../pidgin/gtkconv.c:4431 ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "T_rimite"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4590
 msgid "0 people in room"
 msgstr "Nici o persoană în chat"
 
-#: ../pidgin/gtkconv.c:5932 ../pidgin/gtkconv.c:6053
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -15159,505 +10992,360 @@ msgstr[0] "o persoană în chat"
 msgstr[1] "%d persoane în chat"
 msgstr[2] "%d de persoane în chat"
 
-#: ../pidgin/gtkconv.c:6687 ../pidgin/gtkstatusbox.c:684
 msgid "Typing"
 msgstr "Scriu"
 
-#: ../pidgin/gtkconv.c:6691
 msgid "Stopped Typing"
 msgstr "M-am oprit din scris"
 
-#: ../pidgin/gtkconv.c:6694
 msgid "Nick Said"
 msgstr "Pseudonim spus"
 
-#: ../pidgin/gtkconv.c:6697 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Mesaje necitite"
 
-#: ../pidgin/gtkconv.c:6703
 msgid "New Event"
 msgstr "Eveniment nou"
 
-#: ../pidgin/gtkconv.c:7944
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Goleşte conţinutul ferestrei de discuţii."
 
-#: ../pidgin/gtkconv.c:8148
 msgid "Confirm close"
 msgstr "Confirmare închidere"
 
-#: ../pidgin/gtkconv.c:8180
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Aveţi mesaje necitite. Sigur doriţi să închideţi fereastra?"
 
-#: ../pidgin/gtkconv.c:8813
 msgid "Close other tabs"
 msgstr "Închide celelalte taburi"
 
-#: ../pidgin/gtkconv.c:8819
 msgid "Close all tabs"
 msgstr "Închide toate taburile"
 
-#: ../pidgin/gtkconv.c:8827
 msgid "Detach this tab"
 msgstr "Desprinde acest tab"
 
-#: ../pidgin/gtkconv.c:8833
 msgid "Close this tab"
 msgstr "Închide acest tab"
 
-#: ../pidgin/gtkconv.c:9355
 msgid "Close conversation"
 msgstr "Încheie discuţia"
 
-#: ../pidgin/gtkconv.c:9959
 msgid "Last created window"
 msgstr "În ultima fereastră creată"
 
-#: ../pidgin/gtkconv.c:9961
 msgid "Separate IM and Chat windows"
 msgstr "Nu în fereastra chat-urilor"
 
-#: ../pidgin/gtkconv.c:9963 ../pidgin/gtkprefs.c:1576
 msgid "New window"
 msgstr "În fereastră nouă"
 
-#: ../pidgin/gtkconv.c:9965
 msgid "By group"
 msgstr "După grup"
 
-#: ../pidgin/gtkconv.c:9967
 msgid "By account"
 msgstr "După cont"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Salvează mesajele de depanare"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Inversează"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Evidenţiază potrivirile"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "_Doar iconiţe"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Doar _text"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Iconiţe şi text"
 
-#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filtru"
 
-#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Click dreapta pentru mai multe opţiuni."
 
-#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Nivel "
 
-#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Selectare nivel filtru de depanare"
 
-#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Tot"
 
-#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Altele"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Avertizări"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Erori "
 
-#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Erori fatale"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:120
-msgid "lead developer"
-msgstr "programator principal"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../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:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "programator"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "suport"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "suport şi asigurare a calităţii"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:115
 msgid "developer & webmaster"
 msgstr "programator şi editor web"
 
-#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "Contributori majori/CTC"
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "win32 port"
 msgstr "portare win32"
 
-#: ../pidgin/gtkdialogs.c:112 ../pidgin/gtkdialogs.c:113
 msgid "maintainer"
 msgstr "coordonator"
 
-#: ../pidgin/gtkdialogs.c:114
 msgid "libfaim maintainer"
 msgstr "coordonator libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:117
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker şi şofer de serviciu"
 
-#: ../pidgin/gtkdialogs.c:118
 msgid "XMPP developer"
 msgstr "programator XMPP"
 
-#: ../pidgin/gtkdialogs.c:119
 msgid "original author"
 msgstr "autorul iniţial"
 
-#: ../pidgin/gtkdialogs.c:135
+msgid "lead developer"
+msgstr "programator principal"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:231
 msgid "Arabic"
 msgstr "Arabă"
 
-#: ../pidgin/gtkdialogs.c:137
 msgid "Belarusian Latin"
 msgstr "Bielorusă (alfabet latin)"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:232
 msgid "Bulgarian"
 msgstr "Bulgară"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:144
 msgid "Bosnian"
 msgstr "Bosniacă"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
 msgid "Catalan"
 msgstr "Catalană"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147
 msgid "Valencian-Catalan"
 msgstr "Valenciană"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
 msgid "Czech"
 msgstr "Cehă"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
 msgid "Danish"
 msgstr "Daneză"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:237
 msgid "German"
 msgstr "Germană"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:155
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Greek"
 msgstr "Greacă"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "Australian English"
 msgstr "Engleză Australiană"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Canadian English"
 msgstr "Engleză Canadiană"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "British English"
 msgstr "Engleză Britanică"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "Spanish"
 msgstr "Spaniolă"
 
-#: ../pidgin/gtkdialogs.c:163
 msgid "Estonian"
 msgstr "Estonă"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Euskera(Basque)"
 msgstr "Euskera (Bască)"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:168
 msgid "Persian"
 msgstr "Persană"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
 msgid "Finnish"
 msgstr "Finlandeză"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:244
-#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247
 msgid "French"
 msgstr "Franceză"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:248
 msgid "Galician"
 msgstr "Galiciană"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Gujarati Language Team"
 msgstr "Echipa de localizare Gujarati"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:249
 msgid "Hebrew"
 msgstr "Ebraică"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:250
 msgid "Hungarian"
 msgstr "Maghiară"
 
-#: ../pidgin/gtkdialogs.c:178
 msgid "Indonesian"
 msgstr "Indoneziană"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Italian"
 msgstr "Italiană"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
 msgid "Japanese"
 msgstr "Japoneză"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:255
 msgid "Georgian"
 msgstr "Georgiană"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducătorii Ubuntu din Georgia"
 
-#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada Translation team"
 msgstr "Echipa de localizare Kannada"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
 msgid "Korean"
 msgstr "Coreeană"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
-#: ../pidgin/gtkdialogs.c:186
 msgid "Kurdish"
 msgstr "Kurdă"
 
-#: ../pidgin/gtkdialogs.c:187
 msgid "Lao"
 msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Lithuanian"
 msgstr "Lituaniană"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:260
 msgid "Macedonian"
 msgstr "Macedoneană"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:194
 msgid "Dutch, Flemish"
 msgstr "Flamandă"
 
-#: ../pidgin/gtkdialogs.c:195
 msgid "Norwegian Nynorsk"
 msgstr "Norvegiană (Nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:196
+msgid "Occitan"
+msgstr "Occitană"
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:263
 msgid "Polish"
 msgstr "Poloneză"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese"
 msgstr "Portugheză"
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Portuguese-Brazil"
 msgstr "Portugheză Braziliană"
 
-#: ../pidgin/gtkdialogs.c:202
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:203
 msgid "Romanian"
 msgstr "Română"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Russian"
 msgstr "Rusă"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
-#: ../pidgin/gtkdialogs.c:268
 msgid "Slovak"
 msgstr "Slovacă"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:269
 msgid "Slovenian"
 msgstr "Slovenă"
 
-#: ../pidgin/gtkdialogs.c:208
 msgid "Albanian"
 msgstr "Albaneză"
 
-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:270 ../pidgin/gtkdialogs.c:271
 msgid "Serbian"
 msgstr "Sârbă"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Sinhala"
 msgstr "Sinhala"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:272
-#: ../pidgin/gtkdialogs.c:273
 msgid "Swedish"
 msgstr "Suedeză"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:214
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "Thai"
 msgstr "Thailandeză"
 
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:274
 msgid "Turkish"
 msgstr "Turcă"
 
-#: ../pidgin/gtkdialogs.c:217
 msgid "Urdu"
 msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:218
 msgid "Vietnamese"
 msgstr "Vietnameză"
 
-#: ../pidgin/gtkdialogs.c:218
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M. Thanh şi echipa „Gnome Vi”"
 
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:275
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"
 
-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:222
 msgid "Hong Kong Chinese"
 msgstr "Chineză Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:276
 msgid "Traditional Chinese"
 msgstr "Chineză tradiţională"
 
-#: ../pidgin/gtkdialogs.c:230
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:361
 #, c-format
 msgid "About %s"
 msgstr "Despre %s"
 
-#: ../pidgin/gtkdialogs.c:397
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15680,57 +11368,43 @@ msgstr ""
 "„COPYRIGHT” pentru o listă completă a celor ce au contribuit. Nu se oferă "
 "nici un fel de garanţie pentru acest program.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:415
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:420
 msgid "Current Developers"
 msgstr "Programatori activi"
 
-#: ../pidgin/gtkdialogs.c:435
 msgid "Crazy Patch Writers"
 msgstr "Autori de patch-uri"
 
-#: ../pidgin/gtkdialogs.c:450
 msgid "Retired Developers"
 msgstr "Programatori inactivi"
 
-#: ../pidgin/gtkdialogs.c:465
 msgid "Retired Crazy Patch Writers"
 msgstr "Autori inactivi de patch-uri"
 
-#: ../pidgin/gtkdialogs.c:480
 msgid "Artists"
 msgstr "Designeri"
 
-#: ../pidgin/gtkdialogs.c:495
 msgid "Current Translators"
 msgstr "Traducători activi"
 
-#: ../pidgin/gtkdialogs.c:515
 msgid "Past Translators"
 msgstr "Traducători inactivi"
 
-#: ../pidgin/gtkdialogs.c:533
 msgid "Debugging Information"
 msgstr "Informaţii de depanare"
 
-#: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:888
-#: ../pidgin/gtkdialogs.c:969
 msgid "_Name"
 msgstr "_Nume"
 
-#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
-#: ../pidgin/gtkdialogs.c:974
 msgid "_Account"
 msgstr "_Cont"
 
-#: ../pidgin/gtkdialogs.c:901
 msgid "Get User Info"
 msgstr "Caută detalii"
 
-#: ../pidgin/gtkdialogs.c:903
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
@@ -15738,36 +11412,28 @@ msgstr ""
 "Introduceţi numele de utilizator sau aliasul persoanei căreia vreţi să-i "
 "vedeţi detaliile personale."
 
-#: ../pidgin/gtkdialogs.c:993
 msgid "View User Log"
 msgstr "Arată înregistrările unui utilizator"
 
-#: ../pidgin/gtkdialogs.c:1015
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:1016
 msgid "Enter an alias for this contact."
 msgstr "Introduceţi un alias pentru acest contact."
 
-#: ../pidgin/gtkdialogs.c:1038
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduceţi un alias pentru %s."
 
-#: ../pidgin/gtkdialogs.c:1040
 msgid "Alias Buddy"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:1061
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: ../pidgin/gtkdialogs.c:1062
 msgid "Enter an alias for this chat."
 msgstr "Introduceţi un nou alias pentru acest chat."
 
-#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15785,15 +11451,12 @@ msgstr[2] ""
 "Sunteţi pe cale să ştergeţi din listă contactul conţinând %s şi încă %d de "
 "alte contacte. Doriţi să continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1109
 msgid "Remove Contact"
 msgstr "Ştergere contact"
 
-#: ../pidgin/gtkdialogs.c:1112
 msgid "_Remove Contact"
 msgstr "Şter_gere contact"
 
-#: ../pidgin/gtkdialogs.c:1143
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15802,15 +11465,12 @@ msgstr ""
 "Sunteţi pe cale să mutaţi membrii grupului %s în grupul %s. Doriţi să "
 "continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1150
 msgid "Merge Groups"
 msgstr "Unire grupuri"
 
-#: ../pidgin/gtkdialogs.c:1153
 msgid "_Merge Groups"
 msgstr "_Unire grupuri"
 
-#: ../pidgin/gtkdialogs.c:1203
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15819,15 +11479,12 @@ msgstr ""
 "Sunteţi pe cale să ştergeţi grupul %s şi toţi membrii săi din lista de "
 "contacte. Doriţi să continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1206
 msgid "Remove Group"
 msgstr "Ştergere grup"
 
-#: ../pidgin/gtkdialogs.c:1209
 msgid "_Remove Group"
 msgstr "Şter_gere grup"
 
-#: ../pidgin/gtkdialogs.c:1242
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -15835,15 +11492,12 @@ msgstr ""
 "Sunteţi pe cale să îl/o ştergeţi pe %s din lista de contacte. Doriţi să "
 "continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1245
 msgid "Remove Buddy"
 msgstr "Ştergere contact"
 
-#: ../pidgin/gtkdialogs.c:1248
 msgid "_Remove Buddy"
 msgstr "Şter_ge contactul"
 
-#: ../pidgin/gtkdialogs.c:1269
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15852,221 +11506,186 @@ msgstr ""
 "Sunteţi pe cale să ştergeţi un chat cu numele %s din lista de contacte. "
 "Doriţi să continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1272
 msgid "Remove Chat"
 msgstr "Ştergere chat"
 
-#: ../pidgin/gtkdialogs.c:1275
 msgid "_Remove Chat"
 msgstr "Şter_gere chat"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
 
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr "Schimbare status"
+msgid "_Change Status"
+msgstr "_Schimbare status"
 
-#: ../pidgin/gtkdocklet.c:681
-msgid "Show Buddy List"
-msgstr "Listă de contacte vizibilă"
+msgid "Show Buddy _List"
+msgstr "_Listă vizibilă"
 
-#: ../pidgin/gtkdocklet.c:707
-msgid "New Message..."
-msgstr "Mesaj nou..."
+msgid "_Unread Messages"
+msgstr "Mesaje _necitite"
 
-#: ../pidgin/gtkdocklet.c:722
-msgid "Mute Sounds"
-msgstr "Fără sunete"
+msgid "New _Message..."
+msgstr "_Mesaj nou..."
 
-#: ../pidgin/gtkdocklet.c:729
-msgid "Blink on New Message"
-msgstr "Clipire la mesaje noi"
+msgid "_Accounts"
+msgstr "_Conturi"
 
-#: ../pidgin/gtkdocklet.c:739
-msgid "Quit"
-msgstr "Ieşire"
+msgid "Plu_gins"
+msgstr "M_odule"
+
+msgid "Pr_eferences"
+msgstr "_Preferinţe"
+
+msgid "Mute _Sounds"
+msgstr "_Fără sunete"
+
+msgid "_Blink on New Message"
+msgstr "Clipi_re la mesaje noi"
+
+msgid "_Quit"
+msgstr "_Ieşire"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Neiniţializat"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Primesc ca:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Primesc de la:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Trimit către:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Trimit ca:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "Nu există o aplicaţie asociată acestui tip de fişier."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "A apărut o eroare la deschiderea fişierului."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Eroare la pornirea %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Eroare la pornirea %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Procesul a returnat codul de eroare %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nume fişier:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Fişier local:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Viteză:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Timp trecut:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Timp rămas:"
 
-#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Închide fereastra la _terminarea tuturor transferurilor"
 
-#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "Şter_ge transferurile terminate"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
-msgstr "Ascunde _detaliile transferului"
+msgstr "_Detaliile transferului de fişiere"
 
 #. Pause button
-#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pauză"
 
 #. Resume button
-#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Reluare"
 
-#: ../pidgin/gtkimhtml.c:842
 msgid "Paste as Plain _Text"
 msgstr "Lipeşte ca text _simplu"
 
-#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Reset formatting"
 msgstr "_Fără formatare"
 
-#: ../pidgin/gtkimhtml.c:867
 msgid "Disable _smileys in selected text"
 msgstr "Fără iconiţe _simbolice în textul selectat"
 
-#: ../pidgin/gtkimhtml.c:1430
 msgid "Hyperlink color"
 msgstr "Culoare adresă"
 
-#: ../pidgin/gtkimhtml.c:1431
 msgid "Color to draw hyperlinks."
 msgstr "Culoare pentru afişarea adreselor."
 
-#: ../pidgin/gtkimhtml.c:1434
 msgid "Hyperlink prelight color"
 msgstr "Culoare evidenţiere adresă"
 
-#: ../pidgin/gtkimhtml.c:1435
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Culoare pentru afişarea adreselor sub cursorul de maus."
 
-#: ../pidgin/gtkimhtml.c:1438 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Culoare pentru mesaje trimise"
 
-#: ../pidgin/gtkimhtml.c:1439
 msgid "Color to draw the name of a message you sent."
 msgstr "Culoare de utilizat pentru numele mesajelor pe care le trimiteţi."
 
-#: ../pidgin/gtkimhtml.c:1442 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Culoare pentru mesaje primite"
 
-#: ../pidgin/gtkimhtml.c:1443
 msgid "Color to draw the name of a message you received."
 msgstr "Culoare de utilizat pentru numele mesajelor pe care le primiţi."
 
-#: ../pidgin/gtkimhtml.c:1446
 msgid "\"Attention\" Name Color"
 msgstr "Culoare de atenţionare"
 
-#: ../pidgin/gtkimhtml.c:1447
 msgid "Color to draw the name of a message you received containing your name."
 msgstr "Culoare de utilizat pentru numele mesajelor ce vă pomenesc numele."
 
-#: ../pidgin/gtkimhtml.c:1450 ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr "Culoare pentru mesajele comenzi"
 
-#: ../pidgin/gtkimhtml.c:1451
 msgid "Color to draw the name of an action message."
 msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
 
-#: ../pidgin/gtkimhtml.c:1460
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Culoare pentru mesajele comenzi în mod discret"
+
+msgid "Whisper Message Name Color"
+msgstr "Culoare pentru mesajele discrete"
+
 msgid "Typing notification color"
 msgstr "Culoarea mesajelor de notificare"
 
-#: ../pidgin/gtkimhtml.c:1461
 msgid "The color to use for the typing notification font"
 msgstr "Culoare de utilizat pentru mesajele de notificare"
 
-#: ../pidgin/gtkimhtml.c:1464
 msgid "Typing notification font"
 msgstr "Fontul mesajelor de notificare"
 
-#: ../pidgin/gtkimhtml.c:1465
 msgid "The font to use for the typing notification"
 msgstr "Font de utilizat pentru mesajele de notificare"
 
-#: ../pidgin/gtkimhtml.c:1468 ../pidgin/gtkimhtml.c:1469
 msgid "Enable typing notification"
 msgstr "Activează mesajele de notificare"
 
-#: ../pidgin/gtkimhtml.c:1688
 msgid "_Copy Email Address"
 msgstr "C_opiază adresa de mail"
 
-#: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
 msgstr "_Deschide adresa în navigator"
 
-#: ../pidgin/gtkimhtml.c:1710
 msgid "_Copy Link Location"
 msgstr "_Copiază adresa"
 
-#: ../pidgin/gtkimhtml.c:3482
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16076,7 +11695,6 @@ msgstr ""
 "\n"
 "Se utilizează tipul implicit: PNG."
 
-#: ../pidgin/gtkimhtml.c:3485
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16086,7 +11704,6 @@ msgstr ""
 "\n"
 "Se utilizează tipul implicit: PNG."
 
-#: ../pidgin/gtkimhtml.c:3514
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16097,7 +11714,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3517
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16108,35 +11724,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3598 ../pidgin/gtkimhtml.c:3610
 msgid "Save Image"
 msgstr "Salvează imaginea"
 
-#: ../pidgin/gtkimhtml.c:3638
+#, c-format
 msgid "_Save Image..."
 msgstr "_Salvează imaginea..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:164
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Adaugă iconiţă simbolică..."
+
 msgid "Select Font"
 msgstr "Alegeţi un font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Selectaţi culoarea textului"
 
-#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Selectaţi culoarea fundalului"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Descriere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -16144,163 +11757,136 @@ msgstr ""
 "Introduceţi adresa pe care doriţi să o inseraţi şi descrierea ei. Descrierea "
 "este opţională."
 
-#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduceţi adresa pe care doriţi să o inseraţi."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert Link"
 msgstr "Inserare adresă"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1264
 msgid "_Insert"
 msgstr "Inserea_ză"
 
-#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Nu s-a putut stoca imaginea: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Inserare imagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:712
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Această iconiţă simbolică este dezactivată deoarece există o iconiţă "
+"personalizată pentru această combinaţie de semne:\n"
+" %s"
+
 msgid "Smile!"
 msgstr "Iconiţe simbolice"
 
-#: ../pidgin/gtkimhtmltoolbar.c:763
+msgid "_Manage custom smileys"
+msgstr "Ad_ministrare iconiţe simbolice personalizate"
+
 msgid "This theme has no available smileys."
 msgstr "Această temă nu are iconiţe disponibile."
 
-#: ../pidgin/gtkimhtmltoolbar.c:847 ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Font"
 msgstr "_Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Group Items"
 msgstr "Elemente grupate"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Ungroup Items"
 msgstr "Elemente negrupate"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Aldin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Cursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Subliniat"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
 msgid "Strikethrough"
 msgstr "Tăiat"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Increase Font Size"
 msgstr "Măreşte fontul"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Decrease Font Size"
 msgstr "Micşorează fontul"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Font Face"
 msgstr "Nume font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Background Color"
 msgstr "Culoare fundal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Foreground Color"
 msgstr "Culoare text"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Reset Formatting"
 msgstr "Fără formatare"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert IM Image"
 msgstr "Inserare imagine IM"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert Smiley"
 msgstr "Inserare iconiţă simbolică"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<b>_Bold</b>"
 msgstr "<b>_Aldin</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<u>_Underline</u>"
 msgstr "<u>_Subliniat</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Tăiat</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Mărit</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>M_icşorat</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "_Font face"
 msgstr "Nume _font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Foreground _color"
 msgstr "Culoare te_xt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Bac_kground color"
 msgstr "Culoare f_undal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Imagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1284
 msgid "_Horizontal rule"
 msgstr "Linie _orizontală"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1306
 msgid "_Smile!"
-msgstr "Ico_niţe simbolice"
+msgstr "Iconiţe _simbolice"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Ştergerea înregistrărilor a eşuat"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Verificaţi drepturile şi încercaţi din nou."
 
-#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -16309,7 +11895,6 @@ msgstr ""
 "Sigur doriţi să ştergeţi definitiv înregistrarea conversaţiei cu %s începută "
 "la %s?"
 
-#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -16318,44 +11903,36 @@ msgstr ""
 "Sigur doriţi să ştergeţi definitiv înregistrarea conversaţiei din %s "
 "începută la %s?"
 
-#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr ""
-"Sigur doriţi să ştergeţi permanent întâmpinarea înregistrarea sistem ce a "
-"început la %s?"
+"Sigur doriţi să ştergeţi permanent înregistrarea de sistem ce a început la %"
+"s?"
 
-#: ../pidgin/gtklog.c:323
 msgid "Delete Log?"
 msgstr "Ştergeţi înregistrarea?"
 
-#: ../pidgin/gtklog.c:334
 msgid "Delete Log..."
 msgstr "Ştergere înregistrare..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Discuţie în %s pe %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Discuţie cu %s în data de %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Navigare director înregistrări"
 
-#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Încercaţi „%s -h” pentru mai multe informaţii.\n"
 
-#: ../pidgin/gtkmain.c:389
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16386,7 +11963,6 @@ msgstr ""
 "  --display=ECRAN     ecran X de utilizat\n"
 "  -v, --version       arată versiunea curentă\n"
 
-#: ../pidgin/gtkmain.c:402
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16416,7 +11992,6 @@ msgstr ""
 "display=ECRAN     ecran X de utilizat\n"
 "  -v, --version       arată versiunea curentă\n"
 
-#: ../pidgin/gtkmain.c:532
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16457,19 +12032,15 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:726 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:360
 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
 
-#: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Aveţi mail nou!</span>"
 
-#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -16477,7 +12048,6 @@ msgstr[0] "%s are un mesaj nou."
 msgstr[1] "%s are %d mesaje noi."
 msgstr[2] "%s are %d de mesaje noi."
 
-#: ../pidgin/gtknotify.c:599
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
@@ -16485,45 +12055,35 @@ msgstr[0] "<b>un mail nou.</b>"
 msgstr[1] "<b>%d mailuri noi.</b>"
 msgstr[2] "<b>%d de mailuri noi.</b>"
 
-#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Navigatorul „%s” este invalid."
 
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1047
-#: ../pidgin/gtknotify.c:1060 ../pidgin/gtknotify.c:1197
 msgid "Unable to open URL"
 msgstr "Nu se poate deschide acest URL"
 
-#: ../pidgin/gtknotify.c:1045 ../pidgin/gtknotify.c:1058
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Eroare la pornirea „%s”: %s"
 
-#: ../pidgin/gtknotify.c:1198
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Aţi ales să precizaţi o comandă pentru deschiderea unui navigator, dar nu "
 "aţi introdus-o în preferinţele Gaim."
 
-#: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
 msgstr "Următoarele module vor fi dezactivate."
 
-#: ../pidgin/gtkplugin.c:297
 msgid "Multiple plugins will be unloaded."
 msgstr "Mai multe module vor fi dezactivate."
 
-#: ../pidgin/gtkplugin.c:301
 msgid "Unload Plugins"
 msgstr "Dezactivare module"
 
-#: ../pidgin/gtkplugin.c:318
 msgid "Could not unload plugin"
 msgstr "Nu s-a putut descărca modulul"
 
-#: ../pidgin/gtkplugin.c:319
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
@@ -16531,7 +12091,6 @@ msgstr ""
 "Modulul nu a putut fi descărcat din memorie acum, dar va fi dezactivat la "
 "următoarea pornire."
 
-#: ../pidgin/gtkplugin.c:454
 #, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
@@ -16540,136 +12099,103 @@ msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Eroare: %s\n"
 "Verificaţi adresa Internet a modulului pentru o versiune mai nouă.</span>"
 
-#: ../pidgin/gtkplugin.c:583
 msgid "Author"
 msgstr "Autor"
 
-#: ../pidgin/gtkplugin.c:661
 msgid "<b>Written by:</b>"
 msgstr "<b>Scris de:</b>"
 
-#: ../pidgin/gtkplugin.c:685
 msgid "<b>Web site:</b>"
 msgstr "<b>Adresă Internet:</b>"
 
-#: ../pidgin/gtkplugin.c:694
 msgid "<b>Filename:</b>"
 msgstr "<b>Nume de fişier:</b>"
 
-#: ../pidgin/gtkplugin.c:720
 msgid "Configure Pl_ugin"
 msgstr "Configurare _modul"
 
-#: ../pidgin/gtkplugin.c:788
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalii modul</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Selectaţi un fişier"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Întâmpinare pentru"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Nu_me contact:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_Autentificare"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_Deconectare"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Intrarea în a_bsenţă"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "Întoarcerea din abs_enţă"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Intrarea în inacti_vitate"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Revenirea din inac_tivitate"
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Tastarea unui mesaj _nou"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Pau_ză în timpul tastării"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "O_prirea din tastare"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Trimiterea unui _mesaj"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "Desc_hide o discuţie"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Deschide _o fereastră de notificare"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Trimite un mesa_j"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "E_xecută o comandă"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Redă _un sunet"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "Na_vigare..."
 
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "Navi_gare..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Testare"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "Întâmpinare doar în starea de _indisponibilitate"
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "Re_curentă"
 
-#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Ţintă întâmpinare"
 
-#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Tema de iconiţe simbolice nu a putut fi dezarhivată."
 
-#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Instalare temă"
 
-#: ../pidgin/gtkprefs.c:646
 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."
@@ -16678,148 +12204,112 @@ msgstr ""
 "utilizaţi. Prin tragere şi plasare cu mausul puteţi adăuga teme noi în "
 "această listă."
 
-#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Iconiţă"
 
-#: ../pidgin/gtkprefs.c:894
 msgid "Keyboard Shortcuts"
 msgstr "Combinaţii de taste"
 
-#: ../pidgin/gtkprefs.c:914
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Închide _fereastra de discuţii cu tasta Esc"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "System Tray Icon"
 msgstr "Iconiţă în zona de notificare"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "_Show system tray icon:"
 msgstr "Arată iconiţa din _zona de notificare:"
 
-#: ../pidgin/gtkprefs.c:947
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"
 
-#: ../pidgin/gtkprefs.c:953
 msgid "Conversation Window Hiding"
 msgstr "Ascundere ferestre de discuţii"
 
-#: ../pidgin/gtkprefs.c:954
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuţiile _noi:"
 
-#: ../pidgin/gtkprefs.c:957 ../pidgin/gtkprefs.c:2075
 msgid "When away"
 msgstr "În absenţă"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:965
 msgid "Tabs"
 msgstr "Taburi"
 
-#: ../pidgin/gtkprefs.c:967
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Arată _discuţiile şi chat-urile în taburi"
 
-#: ../pidgin/gtkprefs.c:981
 msgid "Show close b_utton on tabs"
 msgstr "Arată _butoanele de închidere a taburilor"
 
-#: ../pidgin/gtkprefs.c:984
 msgid "_Placement:"
 msgstr "_Plasament:"
 
-#: ../pidgin/gtkprefs.c:986
 msgid "Top"
 msgstr "Sus"
 
-#: ../pidgin/gtkprefs.c:987
 msgid "Bottom"
 msgstr "Jos"
 
-#: ../pidgin/gtkprefs.c:988
 msgid "Left"
 msgstr "În stânga"
 
-#: ../pidgin/gtkprefs.c:989
 msgid "Right"
 msgstr "În dreapta"
 
-#: ../pidgin/gtkprefs.c:991
 msgid "Left Vertical"
 msgstr "Vertical în stânga"
 
-#: ../pidgin/gtkprefs.c:992
 msgid "Right Vertical"
 msgstr "Vertical in dreapta"
 
-#: ../pidgin/gtkprefs.c:999
 msgid "N_ew conversations:"
 msgstr "D_iscuţii noi:"
 
-#: ../pidgin/gtkprefs.c:1048
 msgid "Show _formatting on incoming messages"
 msgstr "Păstrează _formatarea mesajelor primite"
 
-#: ../pidgin/gtkprefs.c:1050
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Închide discuţiile imediat după închiderea tabului"
 
-#: ../pidgin/gtkprefs.c:1053
 msgid "Show _detailed information"
 msgstr "Arată informaţii _detaliate"
 
-#: ../pidgin/gtkprefs.c:1055
 msgid "Enable buddy ic_on animation"
 msgstr "Activea_ză animaţiile avatarurilor"
 
-#: ../pidgin/gtkprefs.c:1062
 msgid "_Notify buddies that you are typing to them"
 msgstr "Notifică contactele când le scri_u"
 
-#: ../pidgin/gtkprefs.c:1065
 msgid "Highlight _misspelled words"
 msgstr "_Evidenţiază greşelile de ortografie"
 
-#: ../pidgin/gtkprefs.c:1069
 msgid "Use smooth-scrolling"
 msgstr "Derulare cu efect"
 
-#: ../pidgin/gtkprefs.c:1072
 msgid "F_lash window when IMs are received"
 msgstr "_Evidenţiază fereastra la primirea de mesaje"
 
-#: ../pidgin/gtkprefs.c:1074
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zează noile ferestre de discuţii"
 
-#: ../pidgin/gtkprefs.c:1078
 msgid "Minimum input area height in lines:"
 msgstr "Înălţime minimă pentru zona de introducere de text:"
 
-#: ../pidgin/gtkprefs.c:1084
 msgid "Font"
 msgstr "Font"
 
-#: ../pidgin/gtkprefs.c:1086
 msgid "Use document font from _theme"
 msgstr "Utilizează fontul precizat în _temă pentru documente"
 
-#: ../pidgin/gtkprefs.c:1088
 msgid "Use font from _theme"
 msgstr "Utilizează fontul din _temă"
 
-#: ../pidgin/gtkprefs.c:1094
 msgid "Conversation _font:"
 msgstr "_Font discuţii:"
 
-#: ../pidgin/gtkprefs.c:1101
 msgid "Default Formatting"
 msgstr "Formatare implicită"
 
-#: ../pidgin/gtkprefs.c:1120
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16827,63 +12317,48 @@ msgstr ""
 "Aşa vor arăta mesajele trimise utilizând protocoalele ce suportă formatarea "
 "mesajelor."
 
-#: ../pidgin/gtkprefs.c:1180
 msgid "Cannot start proxy configuration program."
 msgstr "Nu s-a putut porni programul de configurare a unui proxy."
 
-#: ../pidgin/gtkprefs.c:1192
 msgid "Cannot start browser configuration program."
 msgstr "Nu s-a putut porni programul de configurare a unui navigator."
 
-#: ../pidgin/gtkprefs.c:1212
 msgid "ST_UN server:"
 msgstr "Server ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1224
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1228
 msgid "_Autodetect IP address"
 msgstr "_Autodetectare adresă IP"
 
-#: ../pidgin/gtkprefs.c:1237
 msgid "Public _IP:"
 msgstr "_IP public:"
 
-#: ../pidgin/gtkprefs.c:1268
 msgid "Ports"
 msgstr "Porturi"
 
-#: ../pidgin/gtkprefs.c:1271
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activează automat „port forwarding” în ruter"
 
-#: ../pidgin/gtkprefs.c:1274
 msgid "_Manually specify range of ports to listen on"
 msgstr "P_orturi de utilizat"
 
-#: ../pidgin/gtkprefs.c:1277
 msgid "_Start port:"
 msgstr "_De la:"
 
-#: ../pidgin/gtkprefs.c:1284
 msgid "_End port:"
 msgstr "_Până la:"
 
-#: ../pidgin/gtkprefs.c:1292
 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; navigator"
 
-#: ../pidgin/gtkprefs.c:1300
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Nu s-a găsit programul de configurare a unui proxy</b>"
 
-#: ../pidgin/gtkprefs.c:1308
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Nu s-a găsit programul de configurare a unui navigator</b>"
 
-#: ../pidgin/gtkprefs.c:1313
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16891,99 +12366,75 @@ msgstr ""
 "Opţiunile pentru proxy şi navigator pot fi\n"
 "schimbate în Preferinţele GNOME"
 
-#: ../pidgin/gtkprefs.c:1320
 msgid "Configure _Proxy"
 msgstr "Configurare _proxy"
 
-#: ../pidgin/gtkprefs.c:1325
 msgid "Configure _Browser"
 msgstr "Configurare _navigator"
 
-#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy Server"
 msgstr "Server proxy"
 
-#: ../pidgin/gtkprefs.c:1336
 msgid "No proxy"
 msgstr "Fără proxy"
 
-#: ../pidgin/gtkprefs.c:1392
 msgid "_User:"
 msgstr "Utili_zator:"
 
-#: ../pidgin/gtkprefs.c:1480
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1481
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1482
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1483
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1484
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1485
 msgid "Desktop Default"
 msgstr "Navigatorul implicit"
 
-#: ../pidgin/gtkprefs.c:1486
 msgid "GNOME Default"
 msgstr "Navigatorul Gnome"
 
-#: ../pidgin/gtkprefs.c:1487
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1488
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1489
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1490
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1499
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1560
 msgid "Browser Selection"
 msgstr "Navigator preferat"
 
-#: ../pidgin/gtkprefs.c:1564
 msgid "_Browser:"
 msgstr "_Navigator:"
 
-#: ../pidgin/gtkprefs.c:1572
 msgid "_Open link in:"
 msgstr "_Deschide adresa:"
 
-#: ../pidgin/gtkprefs.c:1574
 msgid "Browser default"
 msgstr "După cum e setat navigatorul"
 
-#: ../pidgin/gtkprefs.c:1575
 msgid "Existing window"
 msgstr "Într-o fereastră existentă"
 
-#: ../pidgin/gtkprefs.c:1577
 msgid "New tab"
 msgstr "Într-un tab nou"
 
-#: ../pidgin/gtkprefs.c:1594
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16992,63 +12443,54 @@ msgstr ""
 "_Manual:\n"
 "(%s pentru adresă)"
 
-#: ../pidgin/gtkprefs.c:1620
 msgid "Log _format:"
 msgstr "_Format înregistrări:"
 
-#: ../pidgin/gtkprefs.c:1625
 msgid "Log all _instant messages"
 msgstr "Înregistrează toate _mesajele"
 
-#: ../pidgin/gtkprefs.c:1627
 msgid "Log all c_hats"
 msgstr "Înregistrează _toate chat-urile"
 
-#: ../pidgin/gtkprefs.c:1629
 msgid "Log all _status changes to system log"
-msgstr "Înregistrează toate schimbările de _status în înregistrările sistem"
+msgstr "Înregistrează toate schimbările de _status în înregistrările de sistem"
 
-#: ../pidgin/gtkprefs.c:1779
 msgid "Sound Selection"
 msgstr "Selectaţi un sunet"
 
-#: ../pidgin/gtkprefs.c:1789
+#, c-format
 msgid "Quietest"
 msgstr "Foarte încet"
 
-#: ../pidgin/gtkprefs.c:1791
+#, c-format
 msgid "Quieter"
 msgstr "Mai încet"
 
-#: ../pidgin/gtkprefs.c:1793
+#, c-format
 msgid "Quiet"
 msgstr "Încet"
 
-#: ../pidgin/gtkprefs.c:1797
+#, c-format
 msgid "Loud"
 msgstr "Tare"
 
-#: ../pidgin/gtkprefs.c:1799
+#, c-format
 msgid "Louder"
 msgstr "Mai tare"
 
-#: ../pidgin/gtkprefs.c:1801
+#, c-format
 msgid "Loudest"
 msgstr "Foarte tare"
 
-#: ../pidgin/gtkprefs.c:1864
 msgid "_Method:"
 msgstr "_Sistem:"
 
-#: ../pidgin/gtkprefs.c:1866
 msgid "Console beep"
 msgstr "Bip"
 
-#: ../pidgin/gtkprefs.c:1873
 msgid "No sounds"
 msgstr "Fără sunete"
 
-#: ../pidgin/gtkprefs.c:1886
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17057,278 +12499,260 @@ msgstr ""
 "Comandă de _redare sunet\n"
 "(%s pentru numele fişierului)"
 
-#: ../pidgin/gtkprefs.c:1895
 msgid "Sounds when conversation has _focus"
 msgstr "Utilizează sunete când fereastra de discuţii are _focus"
 
-#: ../pidgin/gtkprefs.c:1897
 msgid "Enable sounds:"
 msgstr "Activare sunete:"
 
-#: ../pidgin/gtkprefs.c:1914
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1981
 msgid "Play"
 msgstr "Redare"
 
-#: ../pidgin/gtkprefs.c:2058
+msgid "_Browse..."
+msgstr "Na_vigare..."
+
+msgid "_Reset"
+msgstr "_Anulare"
+
 msgid "_Report idle time:"
 msgstr "_Raportează inactivitatea:"
 
-#: ../pidgin/gtkprefs.c:2063
 msgid "Based on keyboard or mouse use"
 msgstr "În funcţie de activitatea utilizatorului"
 
-#: ../pidgin/gtkprefs.c:2072
 msgid "_Auto-reply:"
 msgstr "Răspunsuri _automate:"
 
-#: ../pidgin/gtkprefs.c:2076
 msgid "When both away and idle"
 msgstr "În absenţă şi inactivitate"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2082
 msgid "Auto-away"
 msgstr "Absenţe automate"
 
-#: ../pidgin/gtkprefs.c:2084
 msgid "Change status when _idle"
 msgstr "Schimbă statusul în _inactivitate"
 
-#: ../pidgin/gtkprefs.c:2088
 msgid "_Minutes before becoming idle:"
 msgstr "_Minute înaintea intrării în inactivitate:"
 
-#: ../pidgin/gtkprefs.c:2095
 msgid "Change _status to:"
 msgstr "Schimbă _statusul în:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2108
 msgid "Status at Startup"
 msgstr "Status la pornire"
 
-#: ../pidgin/gtkprefs.c:2110
 msgid "Use status from last _exit at startup"
 msgstr "Utilizează _ultimul status"
 
-#: ../pidgin/gtkprefs.c:2117
 msgid "Status to a_pply at startup:"
 msgstr "Status de setat la _pornire:"
 
-#: ../pidgin/gtkprefs.c:2146
 msgid "Interface"
 msgstr "Interfaţă"
 
-#: ../pidgin/gtkprefs.c:2148
 msgid "Smiley Themes"
 msgstr "Teme iconiţe"
 
-#: ../pidgin/gtkprefs.c:2155
 msgid "Browser"
 msgstr "Navigator"
 
-#: ../pidgin/gtkprefs.c:2159
 msgid "Status / Idle"
 msgstr "Statusuri"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Permite tuturor să mă contacteze"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Permite doar celor din lista de contacte"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Permite doar utilizatorilor de mai jos"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Blochează toţi utilizatorii"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Blochează doar utilizatorii de mai jos"
 
-#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Securitate"
 
-#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Opţiunile de securitate intră în acţiune instantaneu."
 
-#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Opţiuni de securitate pentru:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
 msgstr "Şterge t_ot"
 
-#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Permite utilizatorul"
 
-#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Introduceţi un utilizator care să vă poată contacta."
 
-#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Introduceţi numele utilizatorului care doriţi să vă poată contacta."
 
-#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Permite"
 
-#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Are voie %s să vă contacteze?"
 
-#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sigur doriţi ca %s să vă poată contacta?"
 
-#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Blocare utilizator"
 
-#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Introduceţi un utilizator pe care să-l blocaţi."
 
-#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduceţi numele utilizatorului pe care doriţi să-l blocaţi."
 
-#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "Doriţi să blocaţi utilizatorul %s?"
 
-#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sigur doriţi ca %s să nu vă poată contacta?"
 
-#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Aplică"
 
-#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Acest fişier există deja."
 
-#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Doriţi să îl suprascrieţi?"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Suprascriere"
 
-#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Nume nou"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Alegeţi un director..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Obţine lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Adaugă un chat"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Sigur doriţi să ştergeţi întâmpinarea la %s pentru %s?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Utilizează"
 
-#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titlu utilizat deja. E necesară alegerea unui titlu unic."
 
-#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Diferit"
 
-#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Titlu:"
 
-#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "St_atus:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Utilizează un status _diferit pentru unele conturi"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Sal_vează şi utilizează"
 
-#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "Status pentru %s"
 
-#: ../pidgin/gtkstatusbox.c:688
+msgid "Custom Smiley"
+msgstr "Iconiţă simbolică personalizată"
+
+msgid "Duplicate Shortcut"
+msgstr "Combinaţie duplicată de semne"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"O iconiţă simbolică personalizată există deja pentru combinaţia de semne "
+"selectată. Alegeţi o altă combinaţie de semne."
+
+msgid "More Data needed"
+msgstr "E nevoie de mai multe date"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Alegeţi o combinaţie de semne de asociat acestei iconiţe."
+
+msgid "Please select an image for the smiley."
+msgstr "Selectaţi o imagine pentru această iconiţă."
+
+msgid "Edit Smiley"
+msgstr "Editare iconiţă simbolică"
+
+msgid "Add Smiley"
+msgstr "Adăugare iconiţă simbolică"
+
+msgid "Smiley _Image"
+msgstr "_Imagine iconiţă simbolică"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Combinaţie de _taste asociată"
+
+msgid "Smiley"
+msgstr "Iconiţă simbolice"
+
+msgid "Custom Smiley Manager"
+msgstr "Administrator de iconiţe personalizate"
+
 msgid "Waiting for network connection"
 msgstr "Se aşteaptă revenirea conexiunii de reţea"
 
-#: ../pidgin/gtkstatusbox.c:1101
 msgid "New status..."
 msgstr "Status nou..."
 
-#: ../pidgin/gtkstatusbox.c:1102
 msgid "Saved statuses..."
 msgstr "Statusuri salvate..."
 
-#: ../pidgin/gtkstatusbox.c:1737
 msgid "Status Selector"
 msgstr "Selector de status"
 
-#: ../pidgin/gtkutils.c:685
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1475
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Următoarea eroare a apărut la încărcarea %s: %s"
 
-#: ../pidgin/gtkutils.c:1455 ../pidgin/gtkutils.c:1477
 msgid "Failed to load image"
 msgstr "Încărcarea imaginii a eşuat"
 
-#: ../pidgin/gtkutils.c:1551
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Nu se poate trimite directorul %s."
 
-#: ../pidgin/gtkutils.c:1552
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -17337,12 +12761,9 @@ msgstr ""
 "În %s nu se pot transfera directoare. Va trebui să trimiteţi fişierele "
 "individual."
 
-#: ../pidgin/gtkutils.c:1586 ../pidgin/gtkutils.c:1598
-#: ../pidgin/gtkutils.c:1605
 msgid "You have dragged an image"
 msgstr "Aţi tras şi plasat o imagine"
 
-#: ../pidgin/gtkutils.c:1587
 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."
@@ -17350,23 +12771,18 @@ msgstr ""
 "Puteţi trimite această imagine printr-un transfer de fişiere, o puteţi "
 "insera în acest mesaj sau o puteţi seta ca avatar pentru acest contact."
 
-#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1613
 msgid "Set as buddy icon"
 msgstr "Utilizează ca avatar"
 
-#: ../pidgin/gtkutils.c:1594 ../pidgin/gtkutils.c:1614
 msgid "Send image file"
 msgstr "Transferă fişierul"
 
-#: ../pidgin/gtkutils.c:1595 ../pidgin/gtkutils.c:1614
 msgid "Insert in message"
 msgstr "Inserează în mesaj"
 
-#: ../pidgin/gtkutils.c:1599
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Doriţi să o setaţi ca avatar pentru acest contact?"
 
-#: ../pidgin/gtkutils.c:1606
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -17374,7 +12790,6 @@ msgstr ""
 "Puteţi trimite această imagine printr-un transfer de fişiere sau o puteţi "
 "seta ca avatar pentru acest contact."
 
-#: ../pidgin/gtkutils.c:1607
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17387,11 +12802,9 @@ msgstr ""
 #. * 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:1666
 msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"
 
-#: ../pidgin/gtkutils.c:1666
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -17399,7 +12812,6 @@ msgstr ""
 "Aţi tras şi plasat un lansator pentru desktop. Probabil doriţi sa trimiteţi "
 "nu lansatorul în sine, ci fişierul la care face referire."
 
-#: ../pidgin/gtkutils.c:2404
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17410,25 +12822,20 @@ msgstr ""
 "<b>Mărime fişier:</b> %s\n"
 "<b>Mărime imagine:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2706
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Fişierul „%s” este prea mare pentru %s. Încercaţi un fişier mai mic.\n"
 
-#: ../pidgin/gtkutils.c:2708
 msgid "Icon Error"
 msgstr "Eroare iconiţă"
 
-#: ../pidgin/gtkutils.c:2709
 msgid "Could not set icon"
 msgstr "Nu s-a putut utiliza iconiţa"
 
-#: ../pidgin/gtkutils.c:2809
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nu s-a putut deschide fişierul „%s”: %s"
 
-#: ../pidgin/gtkutils.c:2858
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17436,83 +12843,63 @@ msgstr ""
 "Dintr-un motiv necunoscut nu s-a putut încărca imaginea „%s”, probabil este "
 "un fişier imagine corupt"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Salvare fişier"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Selectare culoare"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Închide _taburile"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Detalii"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Invită"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modifică"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Arată mailul"
 
-#: ../pidgin/pidgintooltip.c:100
 msgid "Pidgin Tooltip"
 msgstr "Indiciu Pidgin"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Iconiţe simbolice Pidgin"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Pinguini"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Fără iconiţe simbolice grafice."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "nimic"
 
-#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Probabilitate răspunsuri:"
 
-#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Configurare statistici"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Timp maxim de răspuns:"
 
-#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
-#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minute"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Diferenţa maximă înregistrată:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Prag:"
 
@@ -17522,58 +12909,46 @@ msgstr "Prag:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "Predicţii pentru disponibilitatea contactelor"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr "Modul pentru disponibilitatea contactelor"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Arată statistici despre disponibilitatea contactelor"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Contactul este inactiv"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Contactul este absent"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Contactul este absent demult"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Contactul este mobil"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Contactul este deconectat"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Precizaţi valorile de utilizat când..."
 
-#: ../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 ""
 "Contactul cu <i>cel mai mare scor</i> este contactul ce va avea prioritate.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Utilizează ultimul contact când scorurile sunt egale"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Precizaţi valorile de utilizat pentru contul..."
 
@@ -17583,21 +12958,18 @@ msgstr "Precizaţi valorile de utilizat pentru contul..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioritate contact"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Permite controlul valorilor asociate cu diferitele stări ale contactelor."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -17605,61 +12977,47 @@ msgstr ""
 "Permite schimbarea numărului de puncte asociate stărilor de inactivare/"
 "absenţă/deconectare utilizate la ordonarea contactelor."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Discuţii colorate"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Permite schimbarea culorilor în fereastra de discuţii"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Mesaje de eroare"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Evidenţiere mesaje"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Mesaje de sistem"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Mesaje trimise"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Mesaje primite"
 
-#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Alegeţi culoarea pentru %s"
 
-#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Ignoră formatarea iniţială"
 
-#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Utilizează în chat-uri"
 
-#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Utilizează în mesajele instant"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "După numărul discuţiilor"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Plasament discuţii"
 
 #. 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\"."
@@ -17667,11 +13025,9 @@ msgstr ""
 "Notă: Opţiunea pentru „Noi conversaţii” trebuie să fie „După numărul "
 "discuţiilor”."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Număr maxim de discuţii într-o fereastră"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 "Separă ferestrele de discuţii şi cele de chat când numărul lor e limitat"
@@ -17682,19 +13038,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Ferestre extra"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Opţiuni de plasare a discuţiilor în plus."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -17703,20 +13056,16 @@ msgstr ""
 "discuţiile de chat-uri"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configurare gesturi de maus"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Butonul din mijloc"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Butonul din dreapta"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "Desenează _explicit gesturile"
 
@@ -17726,19 +13075,16 @@ msgstr "Desenează _explicit gesturile"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Gesturi de maus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Oferă suport pentru gesturile de maus."
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -17752,35 +13098,26 @@ msgstr ""
 " • Trageţi în sus şi apoi în stânga pentru a trece în discuţia anterioară.\n"
 " • Trageţi în sus şi apoi în dreapta pentru a trece în discuţia următoare."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Mesagerie instant"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Selectaţi o persoană din agenda de mai jos sau adăugaţi o nouă persoană."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Grup:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Persoană nouă"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Selectare contact"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -17789,43 +13126,33 @@ msgstr ""
 "nouă intrare."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalii utilizator"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Asociere contact"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:242
-#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send email"
 msgstr "Trimiterea mailului a eşuat."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "Executabilul „evolution” nu a fost găsit în PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An email address was not found for this buddy."
 msgstr "Nu s-a găsit o adresă de mail pentru acest contact."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Adaugă în agendă"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send Email"
 msgstr "Trimite mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Configurare integrare cu Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Selectaţi toate conturile în care contactele ar trebui adăugate automat."
@@ -17836,7 +13163,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Integrare cu Evolution"
 
@@ -17844,37 +13170,28 @@ msgstr "Integrare cu Evolution"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Oferă integrare cu aplicaţia Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Introduceţi mai jos detaliile persoanei."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's username and account type below."
 msgstr "Adăugaţi numele de utilizator al contactului şi tipul contului."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tip cont:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "Detalii opţionale:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "Prenume:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "Nume de familie:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "Email:"
 msgstr "Mail:"
 
@@ -17884,7 +13201,6 @@ msgstr "Mail:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Test semnale GTK"
 
@@ -17892,14 +13208,11 @@ msgstr "Test semnale GTK"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 "Testează toate semnalele interfeţei pentru a verifica funcţionarea lor "
 "corectă."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17908,7 +13221,6 @@ msgstr ""
 "\n"
 "<b>Notiţe contact</b>: %s"
 
-#: ../pidgin/plugins/history.c:201
 msgid "History"
 msgstr "Istoric"
 
@@ -17918,7 +13230,6 @@ msgstr "Istoric"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Minimizare în absenţă"
 
@@ -17926,47 +13237,36 @@ msgstr "Minimizare în absenţă"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimizează ferestrele la trecerea în absenţă."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Verificare mail"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Verifică mailul local."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "Adaugă o căsuţă în lista de contacte care vă anunţă mailurile noi."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Marcaj mesaje noi"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Marchează cu o linie mesajele noi dintr-o discuţie."
 
-#: ../pidgin/plugins/markerline.c:240
 msgid "Jump to markerline"
 msgstr "Salt la marcajul mesajelor noi"
 
-#: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "Utilizează marcaj în:"
 
-#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "Ferestrele de _discuţii"
 
-#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "Ferestrele de c_hat"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -17974,36 +13274,28 @@ msgstr ""
 "O sesiune de mesaje muzicale a fost iniţiată. Un click pe iconiţa MM o va "
 "accepta."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Sesiune confirmată de de mesaje muzicale."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Mesaje muzicale"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "A apărut un conflict la pornirea comenzii:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Eroare la pornirea editorului"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "A intervenit următoarea eroare:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configurare mesaje muzicale"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Cale editor partitură:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplică"
 
@@ -18015,12 +13307,10 @@ msgstr "_Aplică"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Mesaje muzicale pentru compoziţii în colaborare."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 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."
@@ -18029,79 +13319,63 @@ msgstr ""
 "piesă muzicală editând o partitură comună în timp real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:689
 msgid "Notify For"
 msgstr "Notifică în:"
 
-#: ../pidgin/plugins/notify.c:708
 msgid "\t_Only when someone says your username"
 msgstr "\tDoar când cineva _vă spune numele de utilizator într-un chat"
 
-#: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
 msgstr "F_erestrele în prim plan"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:726
 msgid "Notification Methods"
 msgstr "Mijloace de notificare"
 
-#: ../pidgin/plugins/notify.c:733
 msgid "Prepend _string into window title:"
 msgstr "Adaugă acest şir în _titlu:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:752
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserează _numărul de noi mesaje în titlul ferestrei"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:761
 msgid "Insert count of new message into _X property"
 msgstr "Inserează numărul de noi mesaje în proprietatea _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:769
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Schimbă starea ferestrei în _URGENT"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
 msgstr "R_idică fereastra de discuţii"
 
 #. Present conversation method button
-#: ../pidgin/plugins/notify.c:786
 msgid "_Present conversation window"
 msgstr "_Prezintă fereastra de discuţii"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:794
 msgid "Notification Removal"
 msgstr "Anulare notificare"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:799
 msgid "Remove when conversation window _gains focus"
 msgstr "Înlătură când fereastra de discuţii primeşte _focus"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:806
 msgid "Remove when conversation window _receives click"
 msgstr "Înlătură la _revenirea în prim plan a ferestrei de discuţii"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:814
 msgid "Remove when _typing in conversation window"
 msgstr "Înlătură când încep să _scriu în fereastra de discuţii"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:822
 msgid "Remove when a _message gets sent"
 msgstr "Înlătură după ce am trimis un _mesaj"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:831
 msgid "Remove on switch to conversation ta_b"
 msgstr "Înlătură la activarea ta_bului respectivei discuţii"
 
@@ -18111,7 +13385,6 @@ msgstr "Înlătură la activarea ta_bului respectivei discuţii"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:924
 msgid "Message Notification"
 msgstr "Notificări mesaje"
 
@@ -18119,7 +13392,6 @@ msgstr "Notificări mesaje"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:927 ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Oferă mai multe moduri de evidenţiere a mesajelor necitite."
 
@@ -18129,19 +13401,16 @@ msgstr "Oferă mai multe moduri de evidenţiere a mesajelor necitite."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Modul demonstrativ Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un exemplu funcţional de modul - a se vedea descrierea."
 
 #. *  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"
@@ -18153,56 +13422,44 @@ msgstr ""
 "- Inversează textul mesajelor primite\n"
 "- Trimite un mesaj contactelor din listă atunci când se autentifică."
 
-#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Culoare cursor"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Culoare cursor secundar"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Culoare adresă Internet"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Numele culorii pentru evidenţierea mesajelor"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separare orizontală GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Introducere text"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Dialog cerere"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Dialog notificare"
 
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Alegeţi o culoare"
 
-#: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Alegeţi fontul interfeţei"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Alegeţi un font pentru %s"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "Font interfaţă GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Temă combinaţii de taste GTK+ Text"
 
@@ -18226,48 +13483,37 @@ msgstr "Temă combinaţii de taste GTK+ Text"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Culori interfaţă"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Mărimi widget-uri"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Fonturi"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Unelte fişiere Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Scrie opţiunile în %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Reciteşte fişierele gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control temă GTK+ Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Permite accesul la cele mai uzuale opţiuni gtkrc."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Brut"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permite introducerea brută a comenzilor în protocoalele tip text."
 
-#: ../pidgin/plugins/raw.c:178
 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."
@@ -18276,7 +13522,6 @@ msgstr ""
 "IRC, TOC). Comenzile se trimit cu ENTER. Urmăriţi rezultatul comenzilor în "
 "fereastra de depanare."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -18285,12 +13530,10 @@ msgstr ""
 "Versiunea utilizată este %s versiunea %s. Ultima versiune este %s. O puteţi "
 "obţine de la <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Noutăţi:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "A apărut o nouă versiune"
 
@@ -18300,19 +13543,16 @@ msgstr "A apărut o nouă versiune"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notificări versiuni noi"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Verifică dacă există versiuni noi Gaim."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -18328,86 +13568,66 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/sendbutton.c:138
 msgid "Send Button"
 msgstr "Buton de trimitere"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/sendbutton.c:140
 msgid "Conversation Window Send Button."
 msgstr "Buton de trimitere în fereastra de discuţii"
 
 #. *< summary
-#: ../pidgin/plugins/sendbutton.c:141
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for when no physical keyboard is present."
-msgstr ""
-"Adaugă un buton de trimitere a mesajului în fereastra de discuţii."
+msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuţii."
 
-#: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "Corecţie duplicată"
 
-#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "Cuvântul specificat există deja în lista de corecţii."
 
-#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "Cuvinte de înlocuit:"
 
-#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "Dacă scrieţi"
 
-#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "Se va trimite"
 
-#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "Doar cuvinte întregi"
 
-#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "Majuscule semnificative"
 
-#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "Adăugaţi un alt cuvânt de înlocuit"
 
-#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "_Dacă scrieţi:"
 
-#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "_Se va trimite:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2296
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "Potrivire _exactă majuscule (dezactivaţi pentru procesare automată)"
 
-#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "Înlocuieşte doar cuvintele î_ntregi"
 
-#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "Opţiuni generale de corectare a textului"
 
-#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "Activează corectarea ultimului cuvânt la trimitere"
 
-#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "Corecturi text"
 
-#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."
 
@@ -18417,7 +13637,6 @@ msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Listă glisantă de contacte"
 
@@ -18425,11 +13644,9 @@ msgstr "Listă glisantă de contacte"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "O versiune glisantă pe orizontală a listei de contacte."
 
-#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Pune marcaje de timp la fiecare:"
 
@@ -18439,49 +13656,38 @@ msgstr "Pune marcaje de timp la fiecare:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Marcaje de timp"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Marcaje de timp în stil iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Adaugă marcaje de timp în stil iChat la fiecare N minute."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Opţiuni de formatare a marcajelor de timp"
 
-#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Marcaje de timp tip „24 de ore”"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Arată data în..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "_Discuţii:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Pentru mesaje întârziate"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Pentru mesaje întârziate şi în chat-uri"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "M_esaje înregistrate:"
 
@@ -18491,19 +13697,16 @@ msgstr "M_esaje înregistrate:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Formatare marcaje de timp"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Personalizare a marcajelor de timp."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -18511,44 +13714,32 @@ msgstr ""
 "Acest modul vă permite să personalizaţi formatarea marcajelor de timp în "
 "discuţii şi înregistrări."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacitate:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Ferestre de discuţii"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparenţa ferestrelor de _discuţii"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "Arată _bara de derulare în fereastra de discuţii"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Dezactivează transparenţa ferestrei de discuţii în prim plan"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Întotdeauna deasupra"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Fereastra listei de contacte"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_Transparenţa ferestrei listei de contacte"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Dezactivează transparenţa listei de contacte în prim plan"
 
@@ -18558,19 +13749,16 @@ msgstr "Dezactivează transparenţa listei de contacte în prim plan"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparenţă"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparenţă variabilă pentru lista contactelor şi discuţii."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -18582,56 +13770,45 @@ msgstr ""
 "\n"
 "Notă: Acest modul necesită Windows 2000 sau mai nou."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Versiune GTK+ utilizată"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Pornire"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "Porneşte %s odată cu _Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Listă de contacte în _dock"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Păstrează fereastra listei de contacte deasupra:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Doar când e ataşată"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Evidenţiază fereastra la primirea de mesaje noi"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opţiuni Pidgin în Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opţiuni Pidgin specifice Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Permite alegerea unor opţiuni Pidgin pentru Windows, precum ataşarea listei "
 "de contacte."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Deconectat(ă).</font>"
+msgstr "<font color='#777777'>Deconectat.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -18639,41 +13816,74 @@ msgstr "<font color='#777777'>Deconectat(ă).</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Consolă XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Cont: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Neconectat(ă) la XMPP</font>"
+msgstr "<font color='#777777'>Neconectat la XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Inserează un bloc brut <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Inserează un bloc brut <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Inserează un bloc brut <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Trimitere şi primire blocuri XMPP brute"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor şi clienţilor XMPP."
 
+#~ msgid "Error setting socket options"
+#~ msgstr "Eroare la introducerea opţiunilor socket-ului"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Autentificare Windows Live ID: nu s-a găsit un „token” de autentificare "
+#~ "în răspunsul de la server"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Autentificarea Windows Live ID a eşuat!"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "Prea periculos (expeditorul)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Prea periculos (destinatarul)"
+
+#~ msgid "Available Message"
+#~ msgstr "Mesaj ce arată disponibilitatea"
+
+#~ msgid "Away Message"
+#~ msgstr "Mesaj în absenţă"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr "<i>(se descarcă)</i>"
+
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Cod [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Eroare de operare asupra grupului"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Eroare la cererea unui „token” de autentificare"
+
+#~ msgid "TCP Address"
+#~ msgstr "Adresă TCP"
+
+#~ msgid "UDP Address"
+#~ msgstr "Adresă UDP"
diff --git a/po/si.po b/po/si.po
index 303cbeaa8f..c6f86f96f7 100644
--- a/po/si.po
+++ b/po/si.po
@@ -1,33 +1,32 @@
-# translation of pidgin.po to Sinhala
+# translation of si.po to Sinhala
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Danishka Navin <snavin@redhat.com>, 2007.
+# Yajith Ajantha Dayarathna <yajith@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin\n"
+"Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-21 03:21-0500\n"
-"PO-Revision-Date: 2007-11-26 15:16+0530\n"
-"Last-Translator: Danishka Navin <snavin@redhat.com>\n"
-"Language-Team: Sinhala <en@li.org>\n"
+"POT-Creation-Date: 2008-08-15 11:13-0400\n"
+"PO-Revision-Date: 2008-05-17 11:08+0530\n"
+"Last-Translator: Yajith Ajantha Dayarathna <yajith@gmail.com>\n"
+"Language-Team: Sinhala <sinhala@linux.lk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
 msgid "Finch"
 msgstr ""
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. බොහෝ තොරතුරු සඳහා  `%s -h' භාවිතා කරන්න.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -40,7 +39,6 @@ msgid ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -48,723 +46,434 @@ msgid ""
 "http://developer.pidgin.im"
 msgstr ""
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
-#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "දෝෂය"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "ගිණුම එක් නොවුනි"
 
-#: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
+msgid "Username of an account must be non-empty."
 msgstr ""
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "නව තැපැල් දැන්වීම"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "රහස්පදය මතක තබාගන්න"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr ""
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4522
 msgid "Modify Account"
 msgstr "ගිණුම වෙනස් කරන්න"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "නව ගිණුම"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "නියමාවලිය:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
-msgid "Screen name:"
-msgstr "තිර නම:"
+#, fuzzy
+msgid "Username:"
+msgstr "පරිශීලක නම (_U):"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "රහස්පදය:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "අපරනාම:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr ""
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2226 ../finch/gntblist.c:2289
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1105
-#: ../libpurple/account.c:1394 ../libpurple/account.c:1429
-#: ../libpurple/conversation.c:1215 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2426
-#: ../libpurple/protocols/jabber/buddy.c:2462
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1026
-#: ../libpurple/protocols/jabber/jabber.c:1035
-#: ../libpurple/protocols/jabber/jabber.c:1739
-#: ../libpurple/protocols/jabber/si.c:1103
-#: ../libpurple/protocols/jabber/usermood.c:202
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6144
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/silc.c:966
-#: ../libpurple/protocols/silc/silc.c:1174
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6718
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:774
-#: ../pidgin/gtkdialogs.c:913 ../pidgin/gtkdialogs.c:1005
-#: ../pidgin/gtkdialogs.c:1025 ../pidgin/gtkdialogs.c:1049
-#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1119
-#: ../pidgin/gtkdialogs.c:1160 ../pidgin/gtkdialogs.c:1216
-#: ../pidgin/gtkdialogs.c:1255 ../pidgin/gtkdialogs.c:1282
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:272 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "අවලංගු කරන්න"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:278
 msgid "Save"
 msgstr "සුරකින්න"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "ඔබට %s මැකීමට අවශයද? ඔබට විශ්වාසද?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "ගිණුම මකන්න"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "මකන්න"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2123 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "ගිණුම්"
 
-#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2381
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5532
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:6717 ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:276
 msgid "Add"
 msgstr "එකතු කිරීම"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "සකසන්න"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "මබගේ ලැයිස්තුවට මිතුරා එක් කළ යුතුද?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
-#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "අනුමත මිතුරකුද?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "අනුමත"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "වැලකීම"
 
-#: ../finch/gntblist.c:289
-msgid "You must provide a screename for the buddy."
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"සබැඳි: %d\n"
+"සියළු: %d"
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "ගිණුම්: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"අවසාන සිදුවීම: %s ට පෙර"
+
+msgid "Default"
+msgstr "ප්‍රකෘතිය"
+
+#, fuzzy
+msgid "You must provide a username for the buddy."
 msgstr "මිතුරා සඳහා ඔබ තිර නමක් ඉදිරිපත් කළ යුතුම වේ."
 
-#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "ඔබ සමූහයක් ඉදිරිපත් කළ යුතුම වේ."
 
-#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "ඔබ ගිණුමක් තෝරාගත යුතුම වේ."
 
-#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "තෝරාගත් ගිණුම සබැඳිව නැත."
 
-#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "මිතුරා එක් කිරීම දෝෂ සහිතයි"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
-msgid "Screen Name"
-msgstr "තිර නම"
-
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1551
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1024
-#: ../pidgin/gtkdialogs.c:1048 ../pidgin/gtkdialogs.c:1070
-#: ../pidgin/gtkrequest.c:279
-msgid "Alias"
-msgstr "අපරනාම"
+msgid "Username"
+msgstr "පරිශීලක නම"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "සමුහය"
+msgid "Alias (optional)"
+msgstr ""
+
+#, fuzzy
+msgid "Add in group"
+msgstr "සමූහයක් එක් කරන්න"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntblist.c:2212 ../finch/gntblist.c:2276 ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3233
-#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1280
-#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "ගිණුම"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3353 ../pidgin/gtkblist.c:6219
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "මිතුරකු එක් කරන්න"
 
-#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "මිතුරාගේ තොරතුරු ඇතුළත් කරන්න."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "පිළිසඳර"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../finch/gntblist.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:954
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:599
-#: ../pidgin/gtkroomlist.c:931
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "නම"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+msgid "Alias"
+msgstr "අපරනාම"
+
+msgid "Group"
+msgstr "සමුහය"
+
 msgid "Auto-join"
 msgstr "ස්වයංක්‍රීය-එක්වීම"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6603
 msgid "Add Chat"
 msgstr "පිළිසඳර එක් කරන්න"
 
-#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr ""
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "සමූහය එක් කිරීම දෝෂ සහිතයි"
 
-#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr ""
 
-#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr ""
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6714
 msgid "Add Group"
 msgstr "සමූහයක් එක් කරන්න"
 
-#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr ""
 
-#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "පිළිසඳර සකසන්න"
 
-#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr ""
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "සැකසුම්"
 
-#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "සකසුම් සැකසීම්"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "තොරතුරු"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "ලබාගනිමින්"
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
-#: ../libpurple/protocols/silc/chat.c:903
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "තොරතුරු ගන්න"
 
-#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr ""
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
-#: ../libpurple/protocols/jabber/si.c:1103
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "ගොනු යවන්න"
 
-#: ../finch/gntblist.c:919
+msgid "Blocked"
+msgstr ""
+
 msgid "View Log"
 msgstr "සටහන් දර්ශනය"
 
-#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr ""
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "නම වෙනස් කරන්න"
 
-#: ../finch/gntblist.c:1002
 msgid "Set Alias"
 msgstr "අපරනාම සකසන්න"
 
-#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr ""
 
-#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 
-#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 
-#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr ""
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "ඉවත් කිරීම ස්තිර කරන්න"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:277
-#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "ඉවත් කරන්න"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2434 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2913 ../pidgin/gtkblist.c:4958
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "මිතුරු ලැයිස්තුව"
 
-#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr ""
 
-#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2409
-#: ../libpurple/protocols/jabber/jabber.c:965
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1594
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3257
 msgid "Nickname"
 msgstr "අනුර්ත නම"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:365
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2842
-#: ../libpurple/protocols/oscar/oscar.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3285
-#: ../pidgin/gtkblist.c:3691 ../pidgin/gtkprefs.c:2025
 msgid "Idle"
 msgstr "අභාවිත"
 
-#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr "ජංගම දුරකතනයේ"
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"සබැඳි: %d\n"
-"සියළු: %d"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "ගිණුම්: %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"අවසාන සිදුවීම: %s ට පෙර"
-
-#: ../finch/gntblist.c:1706 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "නව..."
 
-#: ../finch/gntblist.c:1713 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "සුරකූ..."
 
-#: ../finch/gntblist.c:2091 ../finch/gntplugin.c:345 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:548
 msgid "Plugins"
 msgstr "ප්ලගීන"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:768
-msgid "New Instant Message"
-msgstr "නව ක්‍ෂණික පණිවිඩය"
+msgid "Block/Unblock"
+msgstr ""
 
-#: ../finch/gntblist.c:2222 ../pidgin/gtkdialogs.c:770
-msgid "Please enter the screen name or alias of the person you would like to IM."
+msgid "Block"
+msgstr ""
+
+msgid "Unblock"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
 msgstr ""
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2225 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../finch/plugins/gnthistory.c:180
-#: ../libpurple/account.c:1104 ../libpurple/account.c:1393
-#: ../libpurple/protocols/gg/gg.c:507 ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1738
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6143
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
-#: ../libpurple/protocols/yahoo/yahoo.c:3518 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
-#: ../pidgin/gtkdialogs.c:1004 ../pidgin/gtkrequest.c:271
 msgid "OK"
 msgstr "හරි"
 
-#: ../finch/gntblist.c:2272
+msgid "New Instant Message"
+msgstr "නව ක්‍ෂණික පණිවිඩය"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+
 msgid "Channel"
 msgstr "නාලීකාව"
 
-#: ../finch/gntblist.c:2284 ../pidgin/gtkblist.c:945
 msgid "Join a Chat"
 msgstr "පිළිසඳරට එක් වන්න"
 
-#: ../finch/gntblist.c:2286
 msgid "Please enter the name of the chat you want to join."
 msgstr ""
 
-#: ../finch/gntblist.c:2288 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "එක් වන්න"
 
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2326 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "විකල්ප"
 
-#: ../finch/gntblist.c:2332
 msgid "Send IM..."
 msgstr "IM යවන්න..."
 
-#: ../finch/gntblist.c:2337
+msgid "Block/Unblock..."
+msgstr ""
+
 msgid "Join Chat..."
 msgstr "පිළිසඳරට එක් වන්න..."
 
-#: ../finch/gntblist.c:2342
+#, fuzzy
+msgid "View Log..."
+msgstr "සටහන් දර්ශනය"
+
+#, fuzzy
+msgid "View All Logs"
+msgstr "සටහන් දර්ශනය"
+
 msgid "Show"
 msgstr "දර්ශනය"
 
-#: ../finch/gntblist.c:2347
 msgid "Empty groups"
 msgstr "හිස් සමුහ"
 
-#: ../finch/gntblist.c:2354
 msgid "Offline buddies"
 msgstr "නොබැඳි මිතුරන්"
 
-#: ../finch/gntblist.c:2361
 msgid "Sort"
 msgstr "වර්‍ග කිරීම"
 
-#: ../finch/gntblist.c:2366
 msgid "By Status"
 msgstr "තත්වය මඟින්"
 
-#: ../finch/gntblist.c:2371 ../pidgin/gtkblist.c:4182
 msgid "Alphabetically"
 msgstr "අක්‍ෂර පිළිවෙලට"
 
-#: ../finch/gntblist.c:2376
 msgid "By Log Size"
 msgstr "සටහන් ප්‍රමාණය මඟින්"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#, fuzzy
+msgid "Buddy"
+msgstr "මිතුරකු එක් කරන්න"
+
+msgid "Chat"
+msgstr "පිළි සඳර"
+
+#, fuzzy
+msgid "Grouping"
+msgstr "සමුහය"
+
 msgid "Certificate Import"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr ""
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "%s සඳහා සහතිකය"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -773,57 +482,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
 msgstr ""
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:677
-#: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "ධාරක නම"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "තොරතුරු"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
-#: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:274
 msgid "Close"
 msgstr "වසන්න"
 
-#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s විසන්දි විය."
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -832,49 +522,43 @@ msgid ""
 "and re-enable the account."
 msgstr ""
 
-#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "ගිණුම යළි සක්‍රීය කිරීම"
 
-#: ../finch/gntconv.c:137
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+
 msgid "No such command."
 msgstr ""
 
-#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 
-#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr ""
 
-#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr ""
 
-#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr ""
 
-#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr ""
 
-#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
 msgstr ""
 
-#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -883,127 +567,134 @@ msgstr ""
 "\n"
 "%s ලියමින්..."
 
-#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "ඔබ මෙම පිළිසඳරෙන් ඉවත් වී ඇත."
 
-#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 
-#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "වෙතට යවන්න"
 
-#: ../finch/gntconv.c:507
+#, fuzzy
+msgid "Invite message"
+msgstr "අන්තර්ජාල පණිවිඩකරු"
+
+msgid "Invite"
+msgstr "ඇරයුම"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+
 msgid "Conversation"
 msgstr ""
 
-#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr ""
 
-#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr ""
 
-#: ../finch/gntconv.c:548
+#, fuzzy
+msgid "Invite..."
+msgstr "ඇරයුම"
+
 msgid "Enable Logging"
 msgstr "පිවිසුම සක්‍රීය කරන්න"
 
-#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
 msgstr "ශබ්ද සක්‍රීය කරන්න"
 
-#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:883
-msgid "List of users:\n"
-msgstr "පරිශීලක ලැයිස්තුව:\n"
+#, fuzzy, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "පරිශීලක ලැයිස්තුව:\n"
+msgstr[1] "පරිශීලක ලැයිස්තුව:\n"
 
-#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr ""
 
-#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr ""
 
-#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
 msgid "Unable to open file."
 msgstr ""
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "දෝෂහරණ කවුළුව"
 
@@ -1011,185 +702,188 @@ msgstr "දෝෂහරණ කවුළුව"
 #. * 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:292 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "පැහිදිලි කරන්න"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "පෙරහන:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "විරාමය"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "ගොනු හුවමාරුව - %d%%, ගොනු %d කින්"
+#, fuzzy, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "ගොනු හුවමාරුව - %d%%, ගොනු %d කින්"
+msgstr[1] "ගොනු හුවමාරුව - %d%%, ගොනු %d කින්"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "ගොනු හුවමාරුව"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "ප්‍රගති තීරුව"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "ගොනු නම"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "වේගය"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "ඉතිරිය"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:369
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2710
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3329
-#: ../pidgin/gtkblist.c:3343 ../pidgin/gtkblist.c:3345
-#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "තත්වය"
 
-#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr ""
 
-#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr ""
 
-#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "නවතන්න"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "අහෝසි කරන්න"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "අසමත් විය"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+#, fuzzy
+msgid "Sent"
+msgstr "යවන්න"
+
+msgid "Received"
+msgstr ""
+
+msgid "Finished"
+msgstr "නිම විය"
+
 #, c-format
 msgid "The file was saved as %s."
 msgstr "ගොනුව %s ලෙස සුරකින ලදි."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
-msgid "Finished"
-msgstr "නිම විය"
+#, fuzzy
+msgid "Sending"
+msgstr "යවන්න"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:357
-msgid "Transferring"
-msgstr "යවමින්"
+#, fuzzy
+msgid "Receiving"
+msgstr "ඉතිරිය"
+
+#, fuzzy, c-format
+msgid "Conversation in %s on %s"
+msgstr "සංවාද"
+
+#, fuzzy, c-format
+msgid "Conversation with %s on %s"
+msgstr "සංවාද"
+
+msgid "%B %Y"
+msgstr "%B %Y"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+msgid "No logs were found"
+msgstr ""
+
+msgid "Total log size:"
+msgstr ""
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr ""
+
+#, c-format
+msgid "Conversations in %s"
+msgstr ""
+
+#, c-format
+msgid "Conversations with %s"
+msgstr ""
+
+#, fuzzy
+msgid "All Conversations"
+msgstr "සංවාද"
+
+msgid "System Log"
+msgstr "පද්ධති සටහන"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "විද්‍යත් තැපෑල්"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "ඔබට තැපෑලක් ඇත!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "යවන්නා"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "මාතෘකාව"
 
-#: ../finch/gntnotify.c:202
 #, 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:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "නව පණිවිඩය"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "%s සඳහා තොරතුරු"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "මිතුරු තොරතුරු"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "දිගටම කරගෙන යන්න"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
-msgid "Invite"
-msgstr "ඇරයුම"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(කිසිවක් නැත)"
 
-#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
+#, fuzzy
+msgid "URI"
+msgstr "UIN"
+
 msgid "ERROR"
 msgstr "දෝෂය"
 
-#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1206,39 +900,31 @@ msgstr ""
 "වෙබ් අඩවිය: %s\n"
 "ගොනු නාමය: %s\n"
 
-#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 
-#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr ""
 
-#: ../finch/gntplugin.c:259
 msgid "Error loading plugin"
 msgstr ""
 
-#: ../finch/gntplugin.c:260
 msgid "The selected file is not a valid plugin."
 msgstr ""
 
-#: ../finch/gntplugin.c:261
-msgid "Please open the debug window and try again to see the exact error message."
+msgid ""
+"Please open the debug window and try again to see the exact error message."
 msgstr ""
 
-#: ../finch/gntplugin.c:324
 msgid "Select plugin to install"
 msgstr ""
 
-#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr ""
 
-#: ../finch/gntplugin.c:401
 msgid "Install Plugin..."
 msgstr ""
 
-#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr ""
 
@@ -1247,362 +933,291 @@ msgstr ""
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2168
 msgid "Preferences"
 msgstr "අභිප්‍රේත"
 
-#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr ""
 
-#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr ""
 
 #. Account:
-#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "ගිණුම:"
 
-#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr ""
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr ""
 
-#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "ඇතුළත් වීම"
 
-#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "පිට වීම"
 
-#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "ඉවත්ව ඇත"
 
-#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "නැවත පැමිණියා"
 
-#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "අභාවිත වී"
 
-#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "තවදුරටත් අභාවිත නැත"
 
-#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "ලිවීම අරඹමින්"
 
-#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "ලිවීම සඳහා විරාමයක්"
 
-#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "ලිවීම අවසන්"
 
-#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "පණිවිඩයක් යවන ලදි"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "ක්‍රියාව"
 
-#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "IM කවුළුවක් විවෘත කරන්න"
 
-#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr ""
 
-#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr ""
 
-#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr ""
 
-#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "ශබ්දයක් වාදනය කරන්න"
 
-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
+msgid "Pounce only when my status is not Available"
 msgstr ""
 
-#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1293
 msgid "Recurring"
 msgstr "පුනරාවර්තනය වීම"
 
-#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
 msgstr ""
 
-#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr ""
 
-#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr ""
 
-#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "මිතුරකු අල්ලාගන්න"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ඔබට ලිවීමට ආරම්ඹ කරන ලදි (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ඔබට ලියන අතරේදි නවතාලන ලදි (%s)"
 
-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s පිවිසුනි (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s අභාවිතවව සිට යළි ක්‍රියාත්මකයි (%s)"
 
-#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s නැචත පැමිණියා (%s)"
 
-#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ඔබට ලිවීම නවතන ලදි (%s)"
 
-#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s ඉවත් විය (%s)"
 
-#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s අභාවිත විය (%s)"
 
-#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ඉවතට ගොස් ඇත. (%s)"
 
-#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ඔබට පණිවිඩයක් එවන ලදි. (%s)"
 
-#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1483
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2030
 msgid "From last sent message"
 msgstr ""
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:899 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:2029 ../pidgin/gtkprefs.c:2043
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "කිසිදාක නැත"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr ""
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "නොබැඳි මිතුරන් දර්ශනය"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr ""
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
 msgid "Log format"
 msgstr ""
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
 msgid "Log IMs"
 msgstr ""
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log chats"
 msgstr ""
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr ""
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr ""
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr ""
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr ""
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr ""
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:994 ../pidgin/gtkprefs.c:2134
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "සංවාද"
 
-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
-#: ../pidgin/gtkprefs.c:1562 ../pidgin/gtkprefs.c:2145
 msgid "Logging"
 msgstr "පිවිසීම"
 
-#: ../finch/gntrequest.c:585
+msgid "You must fill all the required fields."
+msgstr ""
+
+msgid "The required fields are underlined."
+msgstr ""
+
 msgid "Not implemented yet."
 msgstr ""
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
 msgid "Save File..."
 msgstr "ගොනුව සුරකින්න..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1557
-#: ../pidgin/gtkrequest.c:1603
 msgid "Open File..."
 msgstr "ගොනුව විවෘත කරන්න..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
+#, fuzzy
+msgid "Choose Location..."
+msgstr "තෝරන්න..."
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+msgid "Get"
+msgstr ""
+
+#. Create the window.
+msgid "Room List"
+msgstr "කාමර ලැයිස්තුව"
+
 msgid "Buddy logs in"
 msgstr ""
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr ""
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr ""
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr ""
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr ""
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr ""
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr ""
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
-msgid "Someone says your screen name in chat"
+msgid "Someone says your username in chat"
 msgstr ""
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr ""
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr ""
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1686
-#: ../pidgin/gtkprefs.c:1775 ../pidgin/gtkprefs.c:1971
 msgid "(default)"
 msgstr "(පෙරනිමය)"
 
-#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr ""
 
-#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr ""
 
-#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "පැතිකඩ"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1816
 msgid "Automatic"
 msgstr "ස්වයංක්‍රිය"
 
-#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr ""
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1820
 msgid "Command"
 msgstr "විධානය"
 
-#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr ""
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1811
 msgid "Sound Method"
 msgstr ""
 
-#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "ආකාරය: "
 
-#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1610,81 +1225,56 @@ msgid ""
 msgstr ""
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1855
 msgid "Sound Options"
 msgstr ""
 
-#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr ""
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1862 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "සැමවිටම"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1860
 msgid "Only when available"
 msgstr ""
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1861
 msgid "Only when not available"
 msgstr ""
 
-#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "හඬ පරිමාව(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1897
 msgid "Sound Events"
 msgstr ""
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1956
 msgid "Event"
 msgstr "සිදුවීම"
 
-#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "ගොනුව"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1975
 msgid "Test"
 msgstr "පරික්‍ෂණය"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1979
 msgid "Reset"
 msgstr "මුල්ම තත්වයට සකසන්න"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1983
 msgid "Choose..."
 msgstr "තෝරන්න..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr ""
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr ""
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/msn/msn.c:725
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "සිරස්තලය"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "වර්‍ගය"
 
@@ -1696,208 +1286,130 @@ msgstr "වර්‍ගය"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:288
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1619
-#: ../libpurple/protocols/jabber/jabber.c:1635
-#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
-#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
-#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/oscar/oscar.c:5822
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5852
-#: ../libpurple/protocols/oscar/oscar.c:5859
-#: ../libpurple/protocols/oscar/oscar.c:5866
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "පණිවිඩ"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr ""
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr ""
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr ""
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr ""
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr ""
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr ""
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "තත්වය:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "පණිවිඩය:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr ""
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr ""
 
-#: ../finch/gntui.c:85
 msgid "Certificates"
 msgstr "සහතික"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2136
 msgid "Sounds"
 msgstr ""
 
-#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:117 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:175 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1905,139 +1417,128 @@ msgid ""
 "the same conversation type(s)."
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:220
 msgid "GntHistory"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:222 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:69
+#, c-format
+msgid "Online"
+msgstr ""
+
+msgid "Offline"
+msgstr "නොබැඳි"
+
+#, fuzzy
+msgid "Online Buddies"
+msgstr "නොබැඳි මිතුරන්"
+
+#, fuzzy
+msgid "Offline Buddies"
+msgstr "නොබැඳි මිතුරන්"
+
+#, fuzzy
+msgid "Online/Offline"
+msgstr "නොබැඳි"
+
+msgid "Meebo"
+msgstr ""
+
+#, fuzzy
+msgid "No Grouping"
+msgstr "සමුහය"
+
+msgid "Provides alternate buddylist grouping options."
+msgstr ""
+
 msgid "Lastlog"
 msgstr ""
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr ""
 
-#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr ""
 
-#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr ""
 
-#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "රහස්පදය ඇතුළත් කරන්න"
 
-#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr ""
 
-#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr ""
 
-#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "New passwords do not match."
 msgstr ""
 
-#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr ""
 
-#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "නැවුම් රහස්පදය"
 
-#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "නව රහස්පදය"
 
-#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "නව රහස්පදය (යළි)"
 
-#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "%s සඳහා රහස්පදය වෙනස් කරන්න"
 
-#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr ""
 
-#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr ""
 
-#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr ""
 
-#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "නොදන්නා"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6109
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "මිතුරන්"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "මිතුරු ලැයිස්තුව"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2045,71 +1546,46 @@ msgid ""
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1184
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
 msgstr ""
 
 #. Number of actions
-#: ../libpurple/certificate.c:1199
 msgid "Accept"
 msgstr "අනුමත කරන්න"
 
-#: ../libpurple/certificate.c:1200 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "අනුමත නොකරන්න"
 
-#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
 msgstr "සහතික දසුන... (_V)"
 
 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1301
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1326
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
 
-#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr ""
@@ -2119,27 +1595,23 @@ msgstr ""
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1422
 msgid "SSL Certificate Error"
 msgstr ""
 
-#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
 msgstr ""
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1374
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1397
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1414
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2147,12 +1619,20 @@ msgid ""
 "signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1423
 msgid "Invalid certificate authority signature"
 msgstr ""
 
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
 #. Make messages
-#: ../libpurple/certificate.c:1887
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2164,211 +1644,163 @@ msgid ""
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1896
 msgid "Certificate Information"
 msgstr ""
 
-#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr ""
 
-#: ../libpurple/connection.c:180
 msgid "Unregistration Error"
 msgstr ""
 
-#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr ""
 
-#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr ""
 
-#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2350
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "නොදන්නා දෝෂයක්"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr ""
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr ""
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:268
-#: ../libpurple/protocols/bonjour/jabber.c:311
 msgid "Unable to send message."
 msgstr ""
 
-#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr ""
 
-#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr ""
 
-#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr ""
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr ""
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr ""
 
-#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "නමක් නැත"
 
-#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "නොදන්නා හේතුවක්"
 
-#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr ""
 
-#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr ""
 
-#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2376,406 +1808,316 @@ msgid ""
 "Remote port: %d"
 msgstr ""
 
-#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr ""
 
-#: ../libpurple/ft.c:1108
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1113
+#, c-format
 msgid "File transfer cancelled"
 msgstr ""
 
-#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/ft.c:1176
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr ""
 
-#: ../libpurple/ft.c:1233
 #, c-format
 msgid "File transfer to %s failed."
 msgstr ""
 
-#: ../libpurple/ft.c:1235
 #, c-format
 msgid "File transfer from %s failed."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr ""
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML "
 
-#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr ""
 
-#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr ""
 
-#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr ""
 
-#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
 
-#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr ""
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr ""
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "සුරකින්න (_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:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5936
-#: ../libpurple/protocols/oscar/oscar.c:5991
-#: ../libpurple/protocols/oscar/oscar.c:6217
-#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "අහෝසි (_C)"
 
-#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "අහන්න"
 
-#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr ""
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 
-#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+msgid "Create a new directory for each user"
+msgstr ""
+
 msgid "Notes"
 msgstr "සටහන්"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr ""
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr ""
 
@@ -2787,18 +2129,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr ""
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
@@ -2808,7 +2147,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr ""
 
@@ -2816,7 +2154,6 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr ""
 
@@ -2826,7 +2163,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr ""
 
@@ -2834,8 +2170,6 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr ""
 
@@ -2845,7 +2179,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr ""
 
@@ -2853,50 +2186,38 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr ""
 
-#: ../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:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr ""
 
-#: ../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:229
 msgid "_Set"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 
@@ -2906,19 +2227,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr ""
 
 #. *  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."
@@ -2930,31 +2248,25 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr ""
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 
-#: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr ""
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr ""
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr ""
 
@@ -2964,19 +2276,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr ""
 
 #. *  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."
@@ -2986,118 +2295,89 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN පණිවිඩකරු"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2861
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr ""
 
@@ -3107,19 +2387,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr ""
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3128,15 +2405,18 @@ msgid ""
 "at your own risk!"
 msgstr ""
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr ""
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr ""
 
+msgid "Add new line in IMs"
+msgstr ""
+
+msgid "Add new line in Chats"
+msgstr ""
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3146,87 +2426,52 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "නව පෙළ"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr ""
 
 #. *< 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."
+"the username in the conversation window."
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, 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 ""
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:269
 msgid "Yes"
 msgstr "ඔව්"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:270
 msgid "No"
 msgstr "නැත"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -3236,48 +2481,38 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr ""
 
@@ -3287,7 +2522,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr ""
 
@@ -3295,8 +2529,6 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr ""
 
@@ -3306,7 +2538,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr ""
 
@@ -3314,13 +2545,10 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr ""
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509 සහතික"
 
@@ -3330,7 +2558,6 @@ msgstr "X.509 සහතික"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3338,8 +2565,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr ""
 
@@ -3349,7 +2574,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3357,8 +2581,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr ""
 
@@ -3368,7 +2590,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3376,48 +2597,38 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr ""
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr ""
 
@@ -3427,7 +2638,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr ""
 
@@ -3435,77 +2645,47 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  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 ""
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr ""
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr ""
 
-#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:109
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:128
 msgid "Unable to listen for incoming IM connections\n"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:155
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/bonjour/bonjour.c:681
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "මුල් නම"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:378
-#: ../libpurple/protocols/bonjour/bonjour.c:684
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:973
 msgid "Last name"
 msgstr "අවසන් නම"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "Email"
-msgstr "විද්‍යුත් තැපැල:"
+msgstr "විද්‍යුත් තැපෑල"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:385
-#: ../libpurple/protocols/bonjour/bonjour.c:690
 msgid "AIM Account"
 msgstr "AIM ගිණුම"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:388
-#: ../libpurple/protocols/bonjour/bonjour.c:693
 msgid "XMPP Account"
 msgstr "XMPP ගිණුම"
 
@@ -3519,415 +2699,252 @@ msgstr "XMPP ගිණුම"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:492
-#: ../libpurple/protocols/bonjour/bonjour.c:494
 msgid "Bonjour Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:635
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:399
 #, c-format
 msgid "%s has closed the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:456
-#: ../libpurple/protocols/bonjour/jabber.c:689
-#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
 msgid "Cannot open socket"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:616
-msgid "Error setting socket options"
-msgstr ""
-
-#: ../libpurple/protocols/bonjour/jabber.c:642
 msgid "Could not bind socket to port"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:652
 msgid "Could not listen on socket"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
+msgid "Error communicating with local mDNSResponder."
+msgstr ""
+
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "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
 msgid "Token Error"
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:382
+msgid "Load buddylist from file..."
+msgstr ""
+
 msgid "Fill in the registration fields."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "රහස්පද ගැල පෙන්නේ නැත."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:944
-#: ../libpurple/protocols/jabber/jabber.c:947
-#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password"
 msgstr "රහස්පදය"
 
-#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/oscar/oscar.c:3799
-#: ../libpurple/protocols/oscar/oscar.c:3812
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "නගරය"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "උපන් වසර"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3742
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "ස්ත්‍රි/පුරුෂ භාවය"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "ස්ත්‍රි හෝ පුරුෂ"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3742
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "පුරුෂ"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3742
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "ගැහැණු"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "පිළිසඳරට එක් කරන්න..."
 
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5654
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3109 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3329 ../pidgin/gtkblist.c:3667
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "නොබැඳි"
-
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2833
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3111 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "භාවිතයට ඇති"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
-#: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4557
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3663
-#: ../libpurple/protocols/yahoo/yahoo.c:3737 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2039
-#: ../pidgin/gtkstatusbox.c:1058
+#, c-format
 msgid "Away"
 msgstr "පිටතට ගොස්"
 
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2709
-#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3720
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "පළමු නම"
 
-#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "උපන් වසර"
 
-#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "සොයාගත් ප්‍රතිඵල"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr ""
-
 #. magic
 #. major_version
 #. minor_version
@@ -3939,149 +2956,81 @@ msgstr ""
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr ""
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr ""
 
-#: ../libpurple/protocols/irc/dcc_send.c:293
-#: ../libpurple/protocols/irc/dcc_send.c:334
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr ""
 
-#: ../libpurple/protocols/irc/dcc_send.c:294
-#: ../libpurple/protocols/irc/dcc_send.c:335
 msgid "Could not open a listening port."
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
-#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "නාලිකාව (_C):"
 
-#: ../libpurple/protocols/irc/irc.c:271
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "රහස්පදය: (_P)"
 
-#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:325
-#: ../libpurple/protocols/jabber/jabber.c:1304
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1290
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
-#: ../libpurple/protocols/simple/simple.c:1893
-#: ../libpurple/protocols/yahoo/yahoo.c:2947
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:335
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1117
 msgid "SSL support unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:348
-#: ../libpurple/protocols/myspace/myspace.c:320
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:430
-#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
-#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:790
-#: ../libpurple/protocols/silc/chat.c:1398
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "පරිශීලකයින්"
 
-#: ../libpurple/protocols/irc/irc.c:793
-#: ../libpurple/protocols/sametime/sametime.c:3416
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr ""
 
@@ -4093,68 +3042,27 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2335
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6721
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "සේවා දායකය"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6724
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
-#: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "කෙවනිය"
 
-#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:939
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
-#: ../libpurple/protocols/silc/silc.c:1148
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
-msgid "Username"
-msgstr "පරිශීලක නම"
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:319
-#: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr ""
 
@@ -4162,1767 +3070,1203 @@ msgstr ""
 #. 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:977
 msgid "Use SSL"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:200
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Ban on %s"
+msgstr "%s සඳහා තොරතුරු"
+
+msgid "End of ban list"
+msgstr ""
+
 #, c-format
 msgid "You are banned from %s."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr ""
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:600
 msgid "no such channel"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:800
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr ""
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:805 ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:828
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:913 ../libpurple/protocols/irc/msgs.c:914
 msgid "Invalid nickname"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:920
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:959
 msgid "Cannot change nick"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:959
 msgid "Could not change nick"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:980
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1022
 msgid "Error: invalid PONG from server"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1024
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1115
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1116
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1150
 msgid "Nick or channel is temporarily unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/irc/msgs.c:1162
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:124
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
 msgid "chanserv: Send a command to chanserv"
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:139
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: ../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)."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640 ../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/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:698
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Unknown Error"
 msgstr "හඳුනානොගත් දෝෂයකි"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:120
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr ""
+
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:325
-#: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:520
-#: ../libpurple/protocols/jabber/auth.c:521
-#: ../libpurple/protocols/jabber/auth.c:614
-#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:340
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:627
-msgid "Server does not use any supported authentication method"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/auth.c:472
-#: ../libpurple/protocols/jabber/auth.c:576
-#: ../libpurple/protocols/jabber/auth.c:795
-#: ../libpurple/protocols/jabber/auth.c:944
-#: ../libpurple/protocols/jabber/auth.c:971
-#: ../libpurple/protocols/jabber/auth.c:993
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:616
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
+msgid "Server does not use any supported authentication method"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:818
-#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4174
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "සම්පූර්ණ නම"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "පෙලපත් නාමය"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "ලබාදුන් නම"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "කළාපය"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "තැපැල් අංකය"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "රට"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "දුරකතනය"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "ආයතන නම"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "ආයතන ඒකකය"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "කාර්‍යය"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "උපන්දිනය"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3341
-#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "විස්තරය"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "සේවාලාභියා"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "මෙහෙයුම් පද්ධතිය"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
 msgstr "අවසන් ක්‍රියාව"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Service Discovery Info"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Extended Stanza Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Multi-User Chat"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 msgid "Multi-User Chat Extended Presence Information"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "Ad-Hoc Commands"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
 msgid "In-Band Registration"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "User Location"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Avatar"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "Chat State Notifications"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Software Version"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Stream Initiation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
 msgid "User Mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Activity"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "Entity Capabilities"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "User Tune"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Reachability Address"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "User Profile"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "User Nickname"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Video"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Message Receipts"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Public Key Publishing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "User Chatting"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Browsing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Gaming"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Viewing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
 msgid "Stanza Encryption"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1088
-msgid "Resource"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1576
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1618
 msgid "Priority"
 msgstr "ප්‍රමුකත්වය"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:977
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "ලිපිනය"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "ලාංජනය"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr ""
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "දායකත්වය නවතන්න"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
 msgstr "පිවිසීම"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
 msgstr "ඉවත් වීම"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Chatty"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1617
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5858
-#: ../libpurple/protocols/sametime/sametime.c:3339
+#, c-format
 msgid "Do Not Disturb"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr ""
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2353
 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:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2414
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3724
-#: ../libpurple/protocols/oscar/oscar.c:3733
+#, fuzzy
 msgid "Email Address"
 msgstr "විද්‍යුත් තැපැල් ලිපිනය"
 
-#: ../libpurple/protocols/jabber/buddy.c:2423
-#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr ""
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2425
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5657
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "සොයන්න"
 
-#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5342
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "කාමරය (_R):"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "සේවාදායකය (_S):"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:424
-#: ../libpurple/protocols/jabber/jabber.c:463
+msgid "Ping timeout"
+msgstr ""
+
 msgid "Read Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:500
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2561
-#: ../libpurple/protocols/yahoo/yahoo.c:2593
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-#: ../libpurple/protocols/jabber/jabber.c:598
-#: ../libpurple/protocols/jabber/jabber.c:1083
 msgid "Invalid XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:689
 #, c-format
 msgid "Registration to %s successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:691
-#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:700
-#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:719
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:730
-#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:897
-#: ../libpurple/protocols/jabber/jabber.c:898
 msgid "Already Registered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:985
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "පවත්නා තත්වය"
 
-#: ../libpurple/protocols/jabber/jabber.c:989
 msgid "Postal code"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:993
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "දුරකථනය"
 
-#: ../libpurple/protocols/jabber/jabber.c:1001
 msgid "Date"
 msgstr "දිනය"
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
 msgid "Unregister"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1015
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1023
-#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Register New XMPP Account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1025
-#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "Register"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1030
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1031
 #, c-format
 msgid "Register New Account at %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "Change Registration"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1142
-#: ../libpurple/protocols/jabber/jabber.c:1143
 msgid "Error unregistering account"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1148
-#: ../libpurple/protocols/jabber/jabber.c:1149
 msgid "Account successfully unregistered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1308
 msgid "Initializing Stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Initializing SSL/TLS"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1326
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1420
-#: ../libpurple/protocols/jabber/jabber.c:1872
-#: ../libpurple/protocols/jabber/jabber.c:1915
-#: ../libpurple/protocols/jabber/jabber.c:1953
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1468
 msgid "Both"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1470
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1472
 msgid "From"
 msgstr "වෙතින්"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "To"
 msgstr "වෙත"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "කිසිවක් නැත"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Subscription"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1495
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1592
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1620
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:647
-msgid "Current media"
+msgid "Now Listening"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1593
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1621
 msgid "Mood Text"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1595
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Allow Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1641
 msgid "Tune Artist"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1642
 msgid "Tune Title"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1643
 msgid "Tune Album"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1644
 msgid "Tune Genre"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1645
 msgid "Tune Comment"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1646
 msgid "Tune Track"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1647
 msgid "Tune Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1648
 msgid "Tune Year"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Tune URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1672
-#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Error changing password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
 msgid "Password (again)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Change XMPP Password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Please enter your new password"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1751
-#: ../libpurple/protocols/oscar/oscar.c:6438
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr ""
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1756
-#: ../libpurple/protocols/oscar/oscar.c:6449
-#: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr ""
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1761
 msgid "Search for Users..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "Bad Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1854
 msgid "Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1856
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid "Forbidden"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1860
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1862
-#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
 msgid "Item Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid "Malformed XMPP ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1868
 msgid "Not Acceptable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "Not Allowed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1874
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1880
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
 msgid "Remote Server Not Found"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1884
 msgid "Remote Server Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1886
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Service Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Unexpected Request"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Authorization Aborted"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Invalid Authorization Mechanism"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1917
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Bad Format"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Host Unknown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "Invalid ID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Invalid XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Resource Constraint"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Unsupported Version"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Stream Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2062
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2082
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2087
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2106
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2111
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2164
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2195
 #, c-format
 msgid "Unable to ping user %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
-#: ../libpurple/protocols/jabber/jabber.c:2224
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2219
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2272
-#: ../libpurple/protocols/yahoo/yahoo.c:4129
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2273
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4130
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2274
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2310
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2319
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2330
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2336
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2342
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2360
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2366
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2371
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2377
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:4155
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
@@ -5936,959 +4280,677 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "කළාපය"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3305
-#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr ""
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3302
-#: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:237
 msgid "File transfer proxies"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
-msgid " (Code %s)"
+msgid "(Code %s)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:436
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:517
-#: ../libpurple/protocols/jabber/presence.c:518
 msgid "Create New Room"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:519
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Configure Room"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:526
 msgid "_Accept Defaults"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:568
 #, c-format
-msgid "Error in chat %s"
+msgid "Error joining chat %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:572
 #, c-format
-msgid "Error joining chat %s"
+msgid "Error in chat %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1003
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1004
-#: ../libpurple/protocols/jabber/si.c:1005
-#: ../libpurple/protocols/jabber/si.c:1074
 msgid "File Send Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1067
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1069
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1071
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1086
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:1102
 msgid "Select a Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:201
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
 msgstr "ක්‍රියා"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 msgid "Select an action"
 msgstr ""
 
-#: ../libpurple/protocols/msn/contact.c:712
 msgid "Unable to retrieve MSN Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/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 ""
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/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 ""
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "දැනටම පිවිසි ඇත"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
-msgid "Invalid screen name"
+#, c-format
+msgid "Invalid username"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1377
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
+#, c-format
 msgid "Authentication failed"
 msgstr "සත්‍යාපනය අසමත් විය"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr ""
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
+#, fuzzy
+msgid "Email Address..."
+msgstr "විද්‍යුත් තැපැල් ලිපිනය"
+
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 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 ""
 
-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
-msgid "This Hotmail account may not be active."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
+
+msgid "No text is blocked for this account."
+msgstr ""
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+msgid "This account does not have email enabled."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "පිටුව"
 
-#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3771
+#, fuzzy
+msgid "Home Phone Number"
+msgstr "ගෘහස්ථ දුරකථනය 2"
+
+msgid "Work Phone Number"
+msgstr ""
+
+#, fuzzy
+msgid "Mobile Phone Number"
+msgstr "ජංගම දුරකථනය"
+
 msgid "Be Right Back"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3774
 msgid "Busy"
 msgstr "කාර්‍යය බහුලයි"
 
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo.c:3786
 msgid "On the Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3101
-#: ../libpurple/protocols/yahoo/yahoo.c:3792
 msgid "Out to Lunch"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:723
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
 msgid "Artist"
 msgstr "ශිල්පියා"
 
-#: ../libpurple/protocols/msn/msn.c:724
 msgid "Album"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
+msgid "View Blocked Text..."
+msgstr ""
+
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "සාමාන්‍ය"
 
-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "පිහිටීම"
 
-#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "සංගීත"
 
-#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "පෞද්ගලික"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "ගෘහස්ථ දුරකථනය"
 
-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "ගෘහස්ථ දුරකථනය 2"
 
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "ගෘහස්ථ ෆැක්ස්"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
+#, fuzzy
 msgid "Personal Email"
-msgstr ""
+msgstr "පෞද්ගලික"
 
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "සාංවත්සරික"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "වැඩ"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "රැකියා තනතුර"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "සේවාස්ථානය"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#, fuzzy
 msgid "Work Email"
-msgstr ""
+msgstr "විද්‍යුත් තැපෑල"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "ඇරඹුම් දිනය"
 
-#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "නිවාස පිටුව"
 
-#: ../libpurple/protocols/msn/msn.c:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
 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 ""
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr ""
 
@@ -6902,128 +4964,81 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/msn/nexus.c:70
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr ""
 
-#. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:126
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-
-#: ../libpurple/protocols/msn/nexus.c:172
-msgid "Windows Live ID authentication Failed"
+msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:532
-#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:836
 #, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
 msgid "Unable to add user"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:922
-#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1263
-#: ../libpurple/protocols/msnp9/notification.c:851
+msgid "Mobile message was not sent because it was too long."
+msgstr ""
+
 msgid "Unable to rename group"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1318
-#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:1931
-#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7042,175 +5057,116 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+
 msgid "Unable to connect"
 msgstr ""
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr ""
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:311
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:334
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:359
+msgid "Transferring"
+msgstr "යවමින්"
+
 msgid "Starting authentication"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr ""
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr ""
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr ""
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
-msgid "Message could not be sent because an error with the switchboard occurred:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr ""
@@ -7218,18 +5174,16 @@ msgstr ""
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr ""
 
-#: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:655
-msgid "The screen name specified is invalid."
+msgid "The username specified is invalid."
+msgstr ""
+
+msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libpurple/protocols/msnp9/msn.c:549
 msgid "Has you"
 msgstr ""
 
@@ -7243,283 +5197,243 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
 msgid "MSN Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1820
-msgid "MySpaceIM Error"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+msgstr[1] ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr ""
 
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1565
-#: ../libpurple/protocols/myspace/myspace.c:1568
-msgid "No username set"
+#, c-format
+msgid "Protocol error, code %d: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1566
+#, c-format
 msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1794
-#, c-format
-msgid "Protocol error, code %d: %s"
+msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
-#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2024
-#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
-#: ../libpurple/protocols/myspace/myspace.c:2261
-#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2351
-#: ../libpurple/protocols/myspace/myspace.c:2388
-msgid "Read buffer full"
+msgid "Read buffer full (2)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2499
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2822
-#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
 msgstr ""
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "පරිශිලක"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr ""
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
+msgid "MySpaceIM - Username Available"
+msgstr ""
+
+msgid "This username is available. Would you like to set it?"
+msgstr ""
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr ""
+
+msgid "This username is unavailable."
+msgstr ""
+
+msgid "Please try another username:"
+msgstr ""
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "%s has zapped you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr ""
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "%s has whacked you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
 msgstr ""
@@ -7527,76 +5441,61 @@ msgstr ""
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr ""
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "%s has smooched you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "%s has hugged you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr ""
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "%s has slapped you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has goosed you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Goosing %s..."
 msgstr ""
@@ -7604,16 +5503,13 @@ msgstr ""
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "%s has high-fived you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
@@ -7621,16 +5517,13 @@ msgstr ""
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
 msgstr "Punk"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has punk'd you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr ""
@@ -7642,252 +5535,194 @@ msgstr ""
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "%s has raspberried you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr ""
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "සාවද්‍ය රහස්පදයකී."
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
+msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
-#: ../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:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
+msgid "You have entered an incorrect username"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr ""
 
-#: ../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:1953
 msgid "The user is either offline or you are blocked"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr ""
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr ""
 
@@ -7897,37 +5732,29 @@ msgstr ""
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7935,30 +5762,26 @@ msgid ""
 "Sent: %s"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:2521
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -7972,43 +5795,30 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2472
-#: ../libpurple/protocols/yahoo/yahoo.c:2640
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
+msgid "Could not join chat room"
+msgstr ""
+
+msgid "Invalid chat room name"
+msgstr ""
+
 msgid "Server closed the connection."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2633 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr ""
 
@@ -8022,8 +5832,6 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr ""
 
@@ -8037,151 +5845,113 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (sender)"
+msgid "Warning level too high (sender)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
+msgid "Warning level too high (receiver)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:348
 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 "
@@ -8189,7 +5959,6 @@ msgid ""
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8197,305 +5966,216 @@ msgid ""
 msgstr ""
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
-#: ../pidgin/gtkutils.c:2422
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "පිළි සඳර"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "ක්‍රිඩා"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "කැමරාව"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5830
+msgid "Screen Sharing"
+msgstr ""
+
+#, c-format
 msgid "Free For Chat"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5865
+#, c-format
 msgid "Not Available"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5851
+#, c-format
 msgid "Occupied"
 msgstr "දරාසිටී"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3105 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-msgid "Online"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3717
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1155
 msgid "IP Address"
 msgstr "IP ලිපිනය"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
-msgid "Screen name sent"
-msgstr ""
+#, fuzzy
+msgid "Username sent"
+msgstr "පරිශීලක නම"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr ""
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1347
-#: ../libpurple/protocols/yahoo/yahoo.c:2107
-msgid "Invalid screen name."
+msgid "Invalid username."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Incorrect password."
 msgstr "සාවද්‍ය රහස්පදයකී."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1365
-#: ../libpurple/protocols/oscar/oscar.c:1374
 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 ""
 
-#. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
 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:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5935
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "හරි (_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1653
+#. allow multple logins?
 msgid "Password sent"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr ""
 
-#: ../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
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5311
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "No reason given."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8503,17 +6183,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8522,7 +6199,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8531,7 +6207,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8540,59 +6215,54 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "එක් කරන්න (_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2606
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2615
 #, 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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2624
 #, 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."
+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] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2633
 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2642
 #, 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."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2651
 #, 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."
@@ -8600,203 +6270,152 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2806
-#: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2809
-#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2946
-msgid "Available Message"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3406
 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 ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3489
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3739
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "ජංගම දුරකථනය"
 
-#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+msgid "Work Information"
+msgstr ""
+
 msgid "Division"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "පිහිටීම"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "වෙබ් පිටුව"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
-msgid "Work Information"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
-msgid "Screen name"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for email address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
-msgid "Error Changing Account Info"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
+msgid "Error Changing Account Info"
+msgstr ""
+
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4228
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
 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 ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8807,11 +6426,9 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8822,82 +6439,61 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4644
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4764
 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 minutes."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4947
-#: ../libpurple/protocols/oscar/oscar.c:4949
-#: ../libpurple/protocols/oscar/oscar.c:5177
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
 #, 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 ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8905,749 +6501,553 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5348
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
-msgid "Invalid chat name specified."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5619
-#: ../libpurple/protocols/oscar/oscar.c:5624
-msgid "Away Message"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5624
-msgid "<i>(retrieving)</i>"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5990
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "සම්බන්ධ (_o)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
-msgid "Screen name formatting can change only capitalization and whitespace."
+msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by Email"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by email address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "සොයන්න (_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6444
-msgid "Set User Info (URL)..."
-msgstr ""
+#, fuzzy
+msgid "Set User Info (web)..."
+msgstr "පරිශීලක තොරතුරු ලබා ගන්න"
 
-#: ../libpurple/protocols/oscar/oscar.c:6455
-msgid "Change Password (URL)"
-msgstr ""
+#, fuzzy
+msgid "Change Password (web)"
+msgstr "රහස්පදය වෙනස් කරන්න"
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
-msgid "Configure IM Forwarding (URL)"
+msgid "Configure IM Forwarding (web)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr ""
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered Email Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered Email Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by Email Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6570
-msgid "Use recent buddies group"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6573
-msgid "Show how long you have been idle"
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6728
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+msgid "Allow multiple simultaneous logins"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1039
 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 ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "වෙනත්"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr ""
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr ""
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr ""
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr ""
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr ""
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "යවන්න"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr ""
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modified Qun information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr ""
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr ""
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr ""
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-msgid "Keep alive error"
+#, c-format
+msgid "Unknown-%d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
+msgid "Level"
 msgstr ""
 
-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
+msgid "Member"
 msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
+msgid " VIP"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
+msgid " TCP"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
+#, fuzzy
+msgid " FromMobile"
+msgstr "ජංගම"
+
+#, fuzzy
+msgid " BindMobile"
+msgstr "ජංගම"
+
+msgid " Video"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
+#, fuzzy
+msgid " Space"
+msgstr "සුරකින්න"
+
+msgid "Flag"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
+msgid "Ver"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:445
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr ""
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "පිවිසුම් තොරතුරු"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "රහස්පදය වෙනස් කරන්න"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr ""
 
@@ -9661,249 +7061,269 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr ""
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr ""
+
+msgid "Keep alive interval(s)"
+msgstr ""
+
+msgid "Update interval(s)"
+msgstr ""
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr ""
+
+msgid "Keep alive error"
+msgstr ""
+
+msgid "Failed to connect server"
+msgstr ""
+
 msgid "Socket error"
 msgstr ""
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+
 msgid "Unable to read from socket"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr ""
+
+msgid "Connection lost"
+msgstr ""
+
+msgid "Couldn't resolve host"
+msgstr ""
+
+msgid "hostname is NULL or port is 0"
+msgstr ""
+
 #, c-format
-msgid "%d has declined the file %s"
+msgid "Connecting server %s, retries %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
-msgid "File Send"
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr ""
+
+msgid "Could not resolve hostname"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:736
+msgid "Unable to login. Check debug log."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to login"
+msgstr "පිවිසුම සක්‍රීය කරන්න"
+
 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
+msgid "Failed room reply"
+msgstr ""
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr ""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr ""
+
+msgid "File Send"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
+#, c-format
+msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
 msgid "Do you want to add this buddy?"
 msgstr ""
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
 msgstr ""
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:419
+#, fuzzy, c-format
+msgid "Notice from: %s"
+msgstr "%s සඳහා සහතිකය"
+
+#, c-format
+msgid "%s"
+msgstr ""
+
 msgid "Connection closed (writing)"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr ""
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "නිර්මාණය කරන්න"
 
-#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -9911,154 +7331,118 @@ msgid ""
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3681
 #, 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "පරිශීලක නම"
 
-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
 #, 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "පරිශීලක තෝරන්න"
 
-#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4466
 #, 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10066,37 +7450,30 @@ msgid ""
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5527
 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10104,150 +7481,86 @@ msgid ""
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10255,453 +7568,222 @@ msgid ""
 "Remote port: %d"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "පරිශීලක තොරතුරු"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
 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:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
 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:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
 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:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "මෙවලම්"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr ""
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr ""
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:432
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:437
-#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10710,443 +7792,244 @@ msgid ""
 "able to join."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
-#: ../libpurple/protocols/silc/silc.c:1163
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:747
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:911
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:916
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:924
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:937
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:942
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:950
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:956
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:961
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:968
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:973
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:980
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:985
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1046
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1360
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1361
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:1246
-#: ../libpurple/protocols/silc/silc.c:1362
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "අවසර වලකා ඇත"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "පෞද්ගලික තොරතුරු"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1156
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "ඒකකය"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "සටහන"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "බොහෝ... (_M)"
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc/silc.c:1220
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "සේවාදායකයේ තොරතුරු"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1552
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1553
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11166,71 +8049,46 @@ msgid ""
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
-#: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/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 ""
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11239,437 +8097,267 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr ""
 
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
-msgid "Connecting to SILC Server"
+msgid "Unable to create connection"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
-msgstr ""
+msgstr "SILC යතුරු කූට්ටම නැංවීමට නොහැක"
 
-#: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
-msgid "Unable to create connection"
-msgstr ""
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
-#: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
-msgstr ""
+msgstr "මතකය ප්‍රමාණවත් නොමැත"
 
-#: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
+msgstr "SILC යතුරු කූට්ටම නැංවීමේ දෝශයක් ඇතිවිය"
+
+#, c-format
+msgid "Download %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1740
+#, c-format
 msgid "Normal"
 msgstr "සාමාන්‍ය"
 
-#: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
-msgstr ""
+msgstr "දෘශ්‍ය සාකච්ඡා"
 
-#: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
-msgstr ""
+msgstr "ඔබ භාවිතා කරන සේවාවන් දැනගැනීමට අනෙකුත් අයට අවසර දෙන්න"
 
-#: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
-msgstr ""
+msgstr "ඔබ භාවිතාකරන පරිගනකය ගැන දැනගැනීමට අනෙකුත් අයට අවසර දෙන්න"
 
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
-msgstr ""
+msgstr "ඔබගේ VCard ගොනුව"
 
-#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
-msgstr ""
+msgstr "කාලප්‍රාන්තය (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
 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 ""
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
-msgstr ""
+msgstr "දිනයේ පණිවුඩය"
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
-msgstr ""
+msgstr "දිනයේ පණිවුඩය ලබාගැනීමට නොහැක"
 
-#: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
-msgstr ""
+msgstr "මෙම සම්බන්ධතාවයට අදාල දිනයේ පණිවුඩයක් නොමැත"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1171
-#: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
-msgstr ""
+msgstr "නව SILC යතුරු කූට්ටමක් සම්පාදනය කරන්න"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
-msgstr ""
+msgstr "අවසර වැකි එකිනෙක නොගැලපේ"
 
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
-msgstr ""
+msgstr "යතුරු කූට්ටම සම්පාදනය කීරීමට නොහැකිවිය"
 
-#: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
-msgstr ""
+msgstr "යතුරු විශාලත්වය"
 
-#: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
-msgstr ""
+msgstr "පොදු යතුරු ගොනුව"
 
-#: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
-msgstr ""
+msgstr "පෞද්ගලික යතුරු ගොනුව"
 
-#: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
-msgstr ""
+msgstr "අවසර වැකිය ( නැවතවරක් )"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
-msgstr ""
+msgstr "යතුරු කූට්ටම සම්පාදනය කරන්න"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
-msgstr ""
+msgstr "දිනයේ පණිවුඩය ලබාගන්න"
 
-#: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
-msgstr ""
+msgstr "SILC යතුරු කූට්ටම සම්පාදනය කරන්න..."
 
-#: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr ""
+msgstr "පරිශීලක <I>%s</I> ජාලයට සම්බන්ධ වී නොමැත"
 
-#: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
-msgstr ""
+msgstr "මාතෘකාව දීර්ඝ වැඩියි"
 
-#: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
-msgstr ""
+msgstr "ඔබ ආරූඪ නාමයක් අනිවාර්යයෙන්ම ලබාදිය යුතුය"
 
-#: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
-msgstr ""
+msgstr "චැනල %s සොයාගැනීමට නොහැකිය"
 
-#: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr ""
+msgstr "නොදන්නා විධානයක්: %s, (සේවා ග්‍රාහක දෝශයක් විය හැකිය)"
 
-#: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11684,141 +8372,91 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr ""
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2137
 msgid "Network"
 msgstr "ජාලය"
 
-#: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr ""
+msgstr "SILC යතුරු කූට්ටමක් සම්පාදනය වෙමින් පවතී..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
-msgstr ""
+msgstr "SILC යතුරු කූට්ටම සම්පාදනය කිරීමට නොහැකි විය\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr ""
+msgstr "නිවැරදි නම: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr ""
+msgstr "පරිශීලක නම: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:359
-#, c-format
+#, fuzzy, c-format
 msgid "Email: \t\t%s\n"
-msgstr ""
+msgstr "විද්‍යුත් තැපෑල: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:372
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr ""
+msgstr "සේවා ස්ථානය:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
-msgstr ""
+msgstr "රට: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:376
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr ""
+msgstr "යතුරු දිග: \tබිටු %d\n"
 
-#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
-msgstr ""
+msgstr "අනුවාදය: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11826,153 +8464,109 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:381
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "පරිගණකය"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "අග්‍රය"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr ""
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr ""
-
-#: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1752
-msgid "Couldn't resolve host"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1853
-msgid "Could not resolve hostname"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1871
-msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
 #. *< type
@@ -11983,235 +8577,195 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "Email lookup restricted."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:549
-msgid "Incorrect screen name or password."
-msgstr ""
+#, fuzzy, c-format
+msgid "Incorrect username or password."
+msgstr "සාවද්‍ය රහස්පදයකී."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6320
-#: ../pidgin/gtkblist.c:6678
 msgid "_Group:"
 msgstr "සමූහය (_G):"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "සුරකින අයුර..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -12226,45 +8780,36 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:961
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "Authorization denied message:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1048
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1051
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1053
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1995
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12272,169 +8817,120 @@ msgid ""
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1998
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2064
 #, 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 ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2067
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2135
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2656
 msgid "Received unexpected HTTP response from server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2681
-#: ../libpurple/protocols/yahoo/yahoo.c:2869
-#: ../libpurple/protocols/yahoo/yahoo.c:2973
-#: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2707
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2732
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3777
 msgid "Not at Home"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3780
 msgid "Not at Desk"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3783
 msgid "Not in Office"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3099
-#: ../libpurple/protocols/yahoo/yahoo.c:3789
 msgid "On Vacation"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3103
-#: ../libpurple/protocols/yahoo/yahoo.c:3795
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3196
-#: ../libpurple/protocols/yahoo/yahoo.c:3226
 msgid "Not on server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
-#: ../libpurple/protocols/yahoo/yahoo.c:3301
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3246
-#: ../libpurple/protocols/yahoo/yahoo.c:3322
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3264
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3307
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3316
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3364
 msgid "Join in Chat"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3370
 msgid "Initiate Conference"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3398
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3404
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "Activate which ID?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Join whom in chat?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Activate ID..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3532
 msgid "Join User in Chat..."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3537
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4159
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12448,338 +8944,257 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4368
-#: ../libpurple/protocols/yahoo/yahoo.c:4370
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4393
 msgid "Yahoo Japan"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4396
 msgid "Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4399
 msgid "Japan Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4402
 msgid "Pager port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4405
 msgid "File transfer server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4408
 msgid "Japan file transfer server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4411
 msgid "File transfer port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Chat room locale"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Chat room list URL"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4428
 msgid "Yahoo Chat server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4431
 msgid "Yahoo Chat port"
 msgstr ""
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "නිවාස පිටුව"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 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 ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr ""
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "නොදන්නා කාමරයක්"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr ""
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "භාවිතයට නැත"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -12793,408 +9208,364 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr ""
 
-#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 
-#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr ""
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "ඔව් (_Y)"
 
-#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "නැත (_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr ""
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr ""
 
-#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr ""
 
-#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr ""
 
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr ""
 
-#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr ""
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+#, fuzzy
+msgid "Shortcut"
+msgstr "වර්‍ග කිරීම"
+
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+#, fuzzy
+msgid "Stored Image"
+msgstr "පිළිඹිබුව සුරකින්න"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
 msgid "SSL Connection Failed"
 msgstr ""
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr ""
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr ""
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr ""
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr ""
 
-#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr ""
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr ""
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "ජංගම"
 
-#: ../libpurple/status.c:161
 msgid "Listening to music"
 msgstr ""
 
-#: ../libpurple/status.c:610
-#, c-format
-msgid "%s changed status from %s to %s"
-msgstr ""
-
-#: ../libpurple/status.c:613
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr ""
 
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is now %s"
-msgstr ""
-
-#: ../libpurple/status.c:626
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr ""
 
-#: ../libpurple/status.c:632
-#, c-format
-msgid "%s is no longer %s"
-msgstr ""
-
-#: ../libpurple/status.c:634
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr ""
 
-#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr ""
 
-#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr ""
 
-#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr ""
 
-#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr ""
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr ""
 
-#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr ""
 
-#: ../libpurple/util.c:2784
 #, 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 ""
 
-#: ../libpurple/util.c:3283
 msgid "Calculating..."
 msgstr "ගණනය කරමින්..."
 
-#: ../libpurple/util.c:3286
 msgid "Unknown."
 msgstr ""
 
-#: ../libpurple/util.c:3312
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "තත්පර %d යි"
 msgstr[1] "තත්පර %d යි"
 
-#: ../libpurple/util.c:3324
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "දින %d"
 msgstr[1] "දින %d"
 
-#: ../libpurple/util.c:3332
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3338
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "පැය %d යි"
 msgstr[1] "පැය %d යි"
 
-#: ../libpurple/util.c:3346
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3352
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "විනාඩි %d යි"
 msgstr[1] "විනාඩි %d යි"
 
-#: ../libpurple/util.c:3612
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3649 ../libpurple/util.c:3945
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3772
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3807
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3838
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3863
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#: ../pidgin.desktop.in.h:1
+#, c-format
+msgid " - %s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid " (%s)"
+msgstr "%s (%s)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr ""
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr ""
+
+#. 10060
+#, c-format
+msgid "Connection timed out."
+msgstr ""
+
+#. 10061
+#, c-format
+msgid "Connection refused."
+msgstr ""
+
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr ""
+
 msgid "Internet Messenger"
 msgstr "අන්තර්ජාල පණිවිඩකරු"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr ""
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr ""
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "දිශානතිය"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "තැටියේ දිශානතිය."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:442
-msgid "Screen _name:"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:532
-msgid "_Local alias:"
-msgstr ""
+msgid "_Username:"
+msgstr "පරිශීලක නම (_U):"
 
-#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr ""
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:607
+msgid "_Local alias:"
+msgstr ""
+
 msgid "New _mail notifications"
 msgstr ""
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1282
 msgid "Use Environmental Settings"
 msgstr ""
 
@@ -13203,72 +9574,52 @@ msgstr ""
 #. 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:1009
 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:1012
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1276
 msgid "Proxy _type:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1297
 msgid "_Host:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1315
 msgid "_Port:"
 msgstr "තොට (_P):"
 
-#: ../pidgin/gtkaccount.c:1068
-msgid "_Username:"
-msgstr "පරිශීලක නම (_U):"
-
-#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1352
 msgid "Pa_ssword:"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "මූලික (_B)"
 
-#: ../pidgin/gtkaccount.c:1504
-msgid "Create this new account on the server"
+msgid "Create _this new account on the server"
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "සංකීර්ණ (_A)"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:586
 msgid "Enabled"
 msgstr "සක්‍රීය කළා"
 
-#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "නියමාවලිය"
 
-#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13282,727 +9633,601 @@ msgid ""
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:543
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkblist.c:544
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:546
-msgid "_Merge"
+msgid "Please update the necessary fields."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:966
+#, fuzzy
+msgid "Room _List"
+msgstr "කාමර ලැයිස්තුව"
+
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:977 ../pidgin/gtkblist.c:6639
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "ගිණුම (_A):"
 
-#: ../pidgin/gtkblist.c:1266 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1266
 msgid "Un_block"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1309
 msgid "Move to"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1349
 msgid "Get _Info"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1352 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1358
 msgid "_Send File..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1365
 msgid "Add Buddy _Pounce..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1370 ../pidgin/gtkblist.c:1374
-#: ../pidgin/gtkblist.c:1489 ../pidgin/gtkblist.c:1512
 msgid "View _Log"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1380
 msgid "Hide when offline"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1380
 msgid "Show when offline"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1403
-#: ../pidgin/gtkblist.c:1497 ../pidgin/gtkblist.c:1518
 msgid "_Alias..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1397 ../pidgin/gtkblist.c:1405
-#: ../pidgin/gtkblist.c:1499 ../pidgin/gtkblist.c:1520
 msgid "_Remove"
 msgstr "ඉවත් කරන්න (_R)"
 
-#: ../pidgin/gtkblist.c:1455
+msgid "Set Custom Icon"
+msgstr ""
+
+msgid "Remove Custom Icon"
+msgstr ""
+
 msgid "Add _Buddy..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1458
 msgid "Add C_hat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1461
 msgid "_Delete Group"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1463
 msgid "_Rename"
 msgstr "නම වෙනස් කරන්න (_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1483 ../pidgin/gtkroomlist.c:316
-#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1485
 msgid "Auto-Join"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1487
 msgid "Persistent"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1525 ../pidgin/gtkblist.c:1548
+#, fuzzy
+msgid "_Edit Settings..."
+msgstr "සකසුම් සැකසීම්"
+
 msgid "_Collapse"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1553
 msgid "_Expand"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:1804 ../pidgin/gtkblist.c:1816
-#: ../pidgin/gtkblist.c:5282 ../pidgin/gtkblist.c:5295
 msgid "/Tools/Mute Sounds"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2276 ../pidgin/gtkconv.c:4922
-#: ../pidgin/gtkpounce.c:437
-msgid "You are not currently signed on with an account that can add that buddy."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#, fuzzy
+msgid "Unknown node type"
+msgstr "නොදන්නා කාමරයක්"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3094
 msgid "/_Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3095
 msgid "/Buddies/New Instant _Message..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3096
 msgid "/Buddies/Join a _Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3097
 msgid "/Buddies/Get User _Info..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3098
 msgid "/Buddies/View User _Log..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3100
 msgid "/Buddies/Sh_ow"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3101
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3102
 msgid "/Buddies/Show/_Empty Groups"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3103
 msgid "/Buddies/Show/Buddy _Details"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/Show/Idle _Times"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/_Sort Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3108
 msgid "/Buddies/_Add Buddy..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3109
 msgid "/Buddies/Add C_hat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Add _Group..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/_Quit"
 msgstr ""
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3115
 msgid "/_Accounts"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3116 ../pidgin/gtkblist.c:7341
-msgid "/Accounts/Manage"
+msgid "/Accounts/Manage Accounts"
 msgstr ""
 
 #. Tools
-#: ../pidgin/gtkblist.c:3119
 msgid "/_Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3120
 msgid "/Tools/Buddy _Pounces"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3121
 msgid "/Tools/_Certificates"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3122
 msgid "/Tools/Plu_gins"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3123
 msgid "/Tools/Pr_eferences"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3124
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3126
+msgid "/Tools/Smile_y"
+msgstr ""
+
 msgid "/Tools/_File Transfers"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3127
 msgid "/Tools/R_oom List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3128
 msgid "/Tools/System _Log"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/Mute _Sounds"
 msgstr ""
 
 #. Help
-#: ../pidgin/gtkblist.c:3132
 msgid "/_Help"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3133
 msgid "/Help/Online _Help"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3134
 msgid "/Help/_Debug Window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3136 ../pidgin/gtkblist.c:3138
 msgid "/Help/_About"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3167
+#, fuzzy, c-format
+msgid "<b>Account:</b> %s"
+msgstr "ගිණුම්: %s (%s)"
+
 #, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+
+msgid "(no topic set)"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3245
 msgid "Buddy Alias"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3274
 msgid "Logged In"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3320
 msgid "Last Seen"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3341
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3343
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3345
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3684
+#, fuzzy
+msgid "Total Buddies"
+msgstr "මිතුරන්"
+
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3686
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3688
 #, c-format
 msgid "Idle %dm"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3842
 msgid "/Buddies/New Instant Message..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3843 ../pidgin/gtkblist.c:3876
 msgid "/Buddies/Join a Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3844
 msgid "/Buddies/Get User Info..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3845
 msgid "/Buddies/Add Buddy..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3846 ../pidgin/gtkblist.c:3879
 msgid "/Buddies/Add Chat..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3847
 msgid "/Buddies/Add Group..."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3882
 msgid "/Tools/Privacy"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3885
 msgid "/Tools/Room List"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4017 ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkblist.c:4180
 msgid "Manually"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4183
 msgid "By status"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4184
 msgid "By log size"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4513
 #, c-format
 msgid "%s disconnected"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4515
 #, c-format
 msgid "%s disabled"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4519
 msgid "Reconnect"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4519 ../pidgin/gtkblist.c:4627
 msgid "Re-enable"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4523 ../pidgin/gtkblist.c:4630
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "දාවක මට්ටම"
+msgid "Welcome back!"
+msgstr ""
 
-#: ../pidgin/gtkblist.c:4654
 #, c-format
-msgid "%d account was disabled because you signed on from another location."
-msgid_plural "%d accounts were disabled because you signed on from another location."
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkblist.c:4892
 msgid "<b>Username:</b>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4899
 msgid "<b>Password:</b>"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4910
 msgid "_Login"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4994
 msgid "/Accounts"
 msgstr ""
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5008
 #, 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5276
 msgid "/Buddies/Show/Offline Buddies"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5279
 msgid "/Buddies/Show/Empty Groups"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5285
 msgid "/Buddies/Show/Buddy Details"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5288
 msgid "/Buddies/Show/Idle Times"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5291
 msgid "/Buddies/Show/Protocol Icons"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6245
-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 ""
+#, fuzzy
+msgid "Add a buddy.\n"
+msgstr "මිතුරකු එක් කරන්න"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6268
-msgid "A_ccount:"
-msgstr ""
+#, fuzzy
+msgid "Buddy's _username:"
+msgstr "පරිශීලක නම (_U):"
 
-#. End of account box
-#: ../pidgin/gtkblist.c:6280
-msgid "_Screen name:"
-msgstr ""
+#, fuzzy
+msgid "(Optional) A_lias:"
+msgstr "වෛකල්පිත තොරතුරු:"
 
-#: ../pidgin/gtkblist.c:6302 ../pidgin/gtkblist.c:6660
-msgid "A_lias:"
-msgstr ""
+#, fuzzy
+msgid "Add buddy to _group:"
+msgstr "මබගේ ලැයිස්තුවට මිතුරා එක් කළ යුතුද?"
 
-#: ../pidgin/gtkblist.c:6570
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6586
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6629
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6688
-msgid "Autojoin when account becomes online."
+msgid "A_lias:"
+msgstr ""
+
+msgid "Auto_join when account becomes online."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6689
-msgid "Hide chat when the window is closed."
+msgid "_Hide chat when the window is closed."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6715
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7361
+msgid "Enable Account"
+msgstr ""
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7385
 msgid "_Edit Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7398 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7406
 msgid "_Disable"
 msgstr "අක්‍රීය (_D)"
 
-#: ../pidgin/gtkblist.c:7418
-msgid "Enable Account"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:7424
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:7473
 msgid "/Tools"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7543
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
 msgid "SSL Servers"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:816
-msgid "You are not currently signed on with an account that can invite that buddy."
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
-#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "සොයන්න"
 
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "සඳහා සොයන්න (_S):"
 
-#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1699
+msgid "Ignore"
+msgstr "දාවක මට්ටම"
+
 msgid "Get Away Message"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "සජිවිකරණය"
 
-#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2799
-msgid "Remove Custom Icon"
+msgid "Change Size"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr ""
 
 #. Options
-#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
 msgstr ""
 
@@ -14011,596 +10236,437 @@ msgstr ""
 #. 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:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:3464
-msgid "User has typed something and stopped"
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr "%s ඔබට ලිවීම නවතන ලදි (%s)"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
 msgid "S_end To"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "යවන්න (_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "නොකියවූ පණිවිඩ"
 
-#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1509
 msgid "New window"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "පෙරනය"
 
-#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "සියළු"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "අවවාදය"
 
-#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
-msgid "lead developer"
+msgid "developer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../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:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
-msgid "developer"
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "සහාය"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr ""
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:133
+msgid "lead developer"
+msgstr ""
+
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:228
 msgid "Arabic"
 msgstr "අරාබී"
 
-#: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "බෙලරුසියානු ලතින්"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:229
 msgid "Bulgarian"
-msgstr ""
+msgstr "බල්ගේරියානු"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
-msgstr ""
+msgstr "බෙන්ගාලි"
 
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
-msgstr ""
+msgstr "බොස්නියානු"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
 msgid "Catalan"
-msgstr ""
+msgstr "කතලානු"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
-msgstr ""
+msgstr "වැලෙන්සියානු-කතලානු"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:232
 msgid "Czech"
-msgstr ""
+msgstr "චෙක්"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
-msgstr ""
+msgstr "ඩේනිෂ්"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:233
 msgid "German"
-msgstr ""
+msgstr "ජර්මානු"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "ග්‍රීක"
 
-#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
-msgstr ""
+msgstr "ඕස්ට්‍රේලියානු ඉංග්‍රීසි"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
-msgstr ""
+msgstr "කැනේඩියා‍රේලියානු ඉංග්‍රීසි"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
-msgstr ""
+msgstr "එස්පෙරාන්ටෝ"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
 msgid "Spanish"
-msgstr ""
+msgstr "ස්පාඤ්‍ඤ"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
-msgstr ""
+msgstr "එස්තෝනියානු"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
-msgstr "පර්ශියන්"
+msgstr "පර්සියානු"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
 msgid "Finnish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
 msgid "French"
-msgstr ""
+msgstr "ප්‍රංශ"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:244
 msgid "Galician"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "ගුජරාති"
 
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "ගුජරාති භාෂා කණ්ඩායම"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:245
 msgid "Hebrew"
-msgstr "හේබෘව්"
+msgstr "හීබෲ"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "හින්දි"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:246
 msgid "Hungarian"
-msgstr ""
+msgstr "හංගේරියානු"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
-msgstr ""
+msgstr "ඉන්දුනීසියානු"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:247
 msgid "Italian"
-msgstr ""
+msgstr "ඉතාලි"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
 msgid "Japanese"
 msgstr "ජපන්"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Georgian"
 msgstr "ජොර්ජියානු"
 
-#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
-msgstr ""
+msgstr "කන්නාඩ"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "කන්නාඩ පරිවර්තන කණඩායම"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
 msgid "Korean"
 msgstr "කොරියානු"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
-msgstr ""
+msgstr "කුර්දි"
 
-#: ../pidgin/gtkdialogs.c:185
 msgid "Lao"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
 msgid "Lithuanian"
-msgstr ""
+msgstr "ලිතුවේනියානු"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:256
 msgid "Macedonian"
-msgstr ""
+msgstr "මැසඩෝනියානු"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
-#: ../pidgin/gtkdialogs.c:258
 msgid "Bokmål Norwegian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
-msgstr ""
+msgstr "නේපාල"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:194
-msgid "Punjabi"
+msgid "Occitan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:259
+msgid "Punjabi"
+msgstr "පන්ජාබ"
+
 msgid "Polish"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese"
-msgstr ""
+msgstr "පෘතුගීසියානු"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese-Brazil"
-msgstr ""
+msgstr "පෘතුගීසියානු-බ්‍රසීල"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Romanian"
 msgstr "රෝමානු"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
 msgid "Russian"
-msgstr ""
+msgstr "රුසියානු"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
 msgid "Slovak"
-msgstr ""
+msgstr "ස්ලෝවැකියානු"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:265
 msgid "Slovenian"
-msgstr ""
+msgstr "ස්ලෝවේනියානු"
 
-#: ../pidgin/gtkdialogs.c:206
 msgid "Albanian"
-msgstr ""
+msgstr "ඇල්බේනියානු"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
 msgid "Serbian"
-msgstr ""
+msgstr "සර්බියානු"
+
+msgid "Sinhala"
+msgstr "සිංහල"
 
-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:268
-#: ../pidgin/gtkdialogs.c:269
 msgid "Swedish"
-msgstr ""
+msgstr "ස්වීඩන"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Tamil"
-msgstr ""
+msgstr "දෙමළ"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Telugu"
 msgstr "තෙලිගු"
 
-#: ../pidgin/gtkdialogs.c:212
 msgid "Thai"
-msgstr "තායී"
+msgstr "තායි"
 
-#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:270
 msgid "Turkish"
 msgstr "තුර්කි"
 
-#: ../pidgin/gtkdialogs.c:214
 msgid "Urdu"
-msgstr ""
+msgstr "උර්දු"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "Vietnamese"
-msgstr "වියත්නාම"
+msgstr "වියට්නාම"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:271
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "සරලකරණ ලද චීන"
 
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "හොං කොං චීන"
 
-#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:272
 msgid "Traditional Chinese"
-msgstr ""
+msgstr "පාරම්පරික චීන"
 
-#: ../pidgin/gtkdialogs.c:227
 msgid "Amharic"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid "About %s"
 msgstr "%s සම්බන්ධව"
 
-#: ../pidgin/gtkdialogs.c:402
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14614,98 +10680,70 @@ msgid ""
 "<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:420
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin irc.freenode.net මත<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:425
 msgid "Current Developers"
-msgstr ""
+msgstr "වර්තමාන කේත රචකයන්"
 
-#: ../pidgin/gtkdialogs.c:440
 msgid "Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:455
 msgid "Retired Developers"
-msgstr ""
+msgstr "අතීයේ දායකත්වයක් ලබාදුන් කේත රචකයන්"
 
-#: ../pidgin/gtkdialogs.c:470
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:485
 msgid "Artists"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:500
 msgid "Current Translators"
-msgstr ""
+msgstr "වර්තමාන පරිවර්තකයන්"
 
-#: ../pidgin/gtkdialogs.c:520
 msgid "Past Translators"
-msgstr ""
+msgstr "අතීයේ දායකත්වයක් ලබාදුන් පරිවර්තකයන්"
 
-#: ../pidgin/gtkdialogs.c:538
 msgid "Debugging Information"
-msgstr ""
+msgstr "නිර්දෝශකරන තොරතුරු"
 
-#: ../pidgin/gtkdialogs.c:755 ../pidgin/gtkdialogs.c:894
-#: ../pidgin/gtkdialogs.c:975
 msgid "_Name"
-msgstr ""
+msgstr "_නාමය"
 
-#: ../pidgin/gtkdialogs.c:760 ../pidgin/gtkdialogs.c:899
-#: ../pidgin/gtkdialogs.c:980
 msgid "_Account"
-msgstr ""
+msgstr "_ගිණුම"
 
-#: ../pidgin/gtkdialogs.c:907
 msgid "Get User Info"
 msgstr "පරිශීලක තොරතුරු ලබා ගන්න"
 
-#: ../pidgin/gtkdialogs.c:909
 msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr "ලොග් සටහන් ලබාගැනීමට අවශ්‍ය පුද්ගල නාමය හෝ ගැලපෙන වෙනත් නමක් කරුණාකර ලබාදෙන්න."
 
-#: ../pidgin/gtkdialogs.c:999
 msgid "View User Log"
 msgstr "පරිශීලක සටහන දර්ශනය"
 
-#: ../pidgin/gtkdialogs.c:1001
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:1021
 msgid "Alias Contact"
-msgstr ""
+msgstr "සබඳතාවයට වෙනත් නමක්"
 
-#: ../pidgin/gtkdialogs.c:1022
 msgid "Enter an alias for this contact."
-msgstr ""
+msgstr "මෙම සබඳතාවය සඳහා වෙනත් නමක් ලබාදෙන්න"
 
-#: ../pidgin/gtkdialogs.c:1044
 #, c-format
 msgid "Enter an alias for %s."
-msgstr ""
+msgstr "%s සඳහා වෙනත් නමක් ඇතුලත් කරන්න."
 
-#: ../pidgin/gtkdialogs.c:1046
 msgid "Alias Buddy"
-msgstr ""
+msgstr "මිතුරාට වෙනත් නමක්"
 
-#: ../pidgin/gtkdialogs.c:1067
 msgid "Alias Chat"
-msgstr ""
+msgstr "සංවාදයට වෙනත් නමක්"
 
-#: ../pidgin/gtkdialogs.c:1068
 msgid "Enter an alias for this chat."
-msgstr ""
+msgstr "මෙම සංවාදය සඳහා වෙනත් නමක් ඇතුලත් කරන්න."
 
-#: ../pidgin/gtkdialogs.c:1107
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -14714,239 +10752,272 @@ 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 සහ %d මිතුරා රැගත් සබඳතාවය ඉවත්කිරීමටයි. මෙම ක්‍රියාවලිය ඉදිරියට ගෙනයාමට "
+"ඔබට අවශ්‍යයද ?"
 msgstr[1] ""
+"ඔබ සැරසෙන්නේ %s සහ %d මිතුරන් රැගත් සබඳතාවය ඉවත්කිරීමටයි. මෙම ක්‍රියාවලිය ඉදිරියට ගෙනයාමට "
+"ඔබට අවශ්‍යයද ?"
 
-#: ../pidgin/gtkdialogs.c:1115
 msgid "Remove Contact"
-msgstr ""
+msgstr "සබඳතාවය ඉවත්කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1118
 msgid "_Remove Contact"
-msgstr ""
+msgstr "_සබඳතාවය ඉවත්කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1149
 #, 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:1156
 msgid "Merge Groups"
-msgstr ""
+msgstr "මිතුරු සමූහයන් එකිනෙක සමඟ සම්බන්ධ කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1159
 msgid "_Merge Groups"
-msgstr ""
+msgstr "_මිතුරු සමූහයන් එකිනෙක සමඟ සම්බන්ධ කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1209
 #, 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:1212
 msgid "Remove Group"
-msgstr ""
+msgstr "සමූහය ඉවත් කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1215
 msgid "_Remove Group"
-msgstr ""
+msgstr "_සමූහය ඉවත් කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1248
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
+"ඔබ සැරසෙන්නේ %s ඔබගේ මිතුරු ලැයිස්තුවෙන් ඉවත් කිරීමටයි. මෙම ක්‍රියාවලිය ඉදිරියට ගෙනයාමට ඔබට "
+"අවශ්‍යයද ?"
 
-#: ../pidgin/gtkdialogs.c:1251
 msgid "Remove Buddy"
-msgstr ""
+msgstr "මිතුරා ඉවත්කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1254
 msgid "_Remove Buddy"
-msgstr ""
+msgstr "_මිතුරා ඉවත්කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1275
 #, 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:1278
 msgid "Remove Chat"
-msgstr ""
+msgstr "සංවාදය ඉවත්කරන්න"
 
-#: ../pidgin/gtkdialogs.c:1281
 msgid "_Remove Chat"
-msgstr ""
+msgstr "_සංවාදය ඉවත්කරන්න"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
-msgstr ""
+msgstr "තවත් නොකියවූ පණිවුඩ ලබාගැනීම සඳහා දකුණු මූසික බොත්තම තදකරන්න.\n"
 
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr ""
+#, fuzzy
+msgid "_Change Status"
+msgstr "රහස්පදය වෙනස් කරන්න"
 
-#: ../pidgin/gtkdocklet.c:680
-msgid "Show Buddy List"
-msgstr ""
+#, fuzzy
+msgid "Show Buddy _List"
+msgstr "මිතුරු ලැයිස්තුව පෙන්වන්න"
 
-#: ../pidgin/gtkdocklet.c:706
-msgid "New Message..."
-msgstr ""
+#, fuzzy
+msgid "_Unread Messages"
+msgstr "නොකියවූ පණිවිඩ"
+
+#, fuzzy
+msgid "New _Message..."
+msgstr "නව පණිවුඩයක්..."
+
+#, fuzzy
+msgid "_Accounts"
+msgstr "ගිණුම්"
+
+#, fuzzy
+msgid "Plu_gins"
+msgstr "ප්ලගීන"
+
+#, fuzzy
+msgid "Pr_eferences"
+msgstr "අභිප්‍රේත"
 
-#: ../pidgin/gtkdocklet.c:721
-msgid "Mute Sounds"
+#, fuzzy
+msgid "Mute _Sounds"
 msgstr "නිහඩ කරන්න"
 
-#: ../pidgin/gtkdocklet.c:728
-msgid "Blink on New Message"
-msgstr ""
+#, fuzzy
+msgid "_Blink on New Message"
+msgstr "නව පණිවුඩයක්..."
 
-#: ../pidgin/gtkdocklet.c:738
-msgid "Quit"
+#, fuzzy
+msgid "_Quit"
 msgstr "පිටවීම"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
-msgstr ""
+msgstr "ආරම්භ වී නොමැත"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
-msgstr ""
+msgstr "<b>ලබාගැනීම සිදුකරන්නේ:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
-msgstr ""
+msgstr "<b>ලබා දීම සිදුකරන්නේ:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
-msgstr ""
+msgstr "<b>යවනු ලබන්නේ:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
-msgstr ""
+msgstr "<b>යැවීම සිදුකරන්නේ:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
-msgstr ""
+msgstr "මෙම වර්ගයේ ගොනු විවෘත කිරීම සඳහා මෘදුකාංගයක් පෙන්වා දී නොමැත."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
-msgstr ""
+msgstr "ගොනුව විවෘත කිරීමේදී දෝශයක් ඇතිවිය."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
-msgstr ""
+msgstr "%s ආරම්භ කිරීමේ දෝශයක්: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
-msgstr ""
+msgstr "%s ධාවනය කිරීමේ දෝශයක්."
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
+msgstr "ක්‍රියාවලිය %d දෝශ කේතය ලබාදෙයි"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "ගොනු නම:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr ""
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "වේගය:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
-msgstr ""
+msgstr "ගතවූ කාලය:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
-msgstr ""
+msgstr "ඉතිරි වී ඇති කාලය:"
 
-#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
-msgstr ""
+msgstr "සියලු හුවමාරු අවසානයේ දී මෙම කවුලුව _චසා දමන්න"
 
-#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
-msgstr ""
+msgstr "සම්පූර්ණ වූ හුවමාරු ඉ_වත් කරන්න"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
-msgstr ""
+msgstr "ගොනු හුවමාරු _තොරතුරු"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "විරාමය (_P)"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
 msgid "_Resume"
-msgstr ""
+msgstr "_යලි අරඹන්න"
 
-#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1359
+msgid "Disable _smileys in selected text"
+msgstr ""
+
 msgid "Hyperlink color"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1363
 msgid "Hyperlink prelight color"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1581
-msgid "_Copy Email Address"
+msgid "Sent Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+msgid "Received Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+
+msgid "Action Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Whisper Message Name Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1593
+msgid "Typing notification color"
+msgstr ""
+
+msgid "The color to use for the typing notification font"
+msgstr ""
+
+#, fuzzy
+msgid "Typing notification font"
+msgstr "නව තැපැල් දැන්වීම"
+
+msgid "The font to use for the typing notification"
+msgstr ""
+
+#, fuzzy
+msgid "Enable typing notification"
+msgstr "නව තැපැල් දැන්වීම"
+
+#, fuzzy
+msgid "_Copy Email Address"
+msgstr "විද්‍යුත් තැපැල් ලිපිනය"
+
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3358
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3361
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3390
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -14954,7 +11025,6 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3393
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -14962,273 +11032,223 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:3471 ../pidgin/gtkimhtml.c:3483
 msgid "Save Image"
 msgstr "පිළිඹිබුව සුරකින්න"
 
-#: ../pidgin/gtkimhtml.c:3511
+#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr ""
+
 msgid "Select Font"
 msgstr "අක්‍ෂර තෝරන්න"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "විස්තරය (_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "ඇතුලත් කරන්න (_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
-msgid "This theme has no available smileys."
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
 msgstr ""
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
+msgid "_Manage custom smileys"
+msgstr ""
+
+msgid "This theme has no available smileys."
+msgstr ""
+
 msgid "_Font"
 msgstr "අක්‍ෂර (_F)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Group Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "තදකුරු"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "ඇලකුරු"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "යටි ඉර"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Font Face"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Background Color"
 msgstr "පසුබිම් වර්‍ණය"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Foreground Color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Reset Formatting"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert IM Image"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Smiley"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
 msgstr "සාමාන්‍ය (_N)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr ""
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
 msgstr "පිළිඹිබුව (_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1305
 msgid "_Smile!"
 msgstr ""
 
-#: ../pidgin/gtklog.c:293
+msgid "Log Deletion Failed"
+msgstr ""
+
+msgid "Check permissions and try again."
+msgstr ""
+
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
 
-#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr ""
 
-#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr ""
 
-#: ../pidgin/gtklog.c:453
+#, fuzzy
+msgid "Delete Log?"
+msgstr "මකන්න"
+
+#, fuzzy
+msgid "Delete Log..."
+msgstr "මකන්න"
+
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr ""
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:557
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr ""
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr ""
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr ""
-
-#: ../pidgin/gtklog.c:710
-#, c-format
-msgid "Conversations in %s"
-msgstr ""
-
-#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
 #, c-format
-msgid "Conversations with %s"
+msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr ""
 
-#: ../pidgin/gtklog.c:810
-msgid "System Log"
-msgstr "පද්ධති සටහන"
-
-#: ../pidgin/gtkmain.c:398
 #, c-format
-msgid "%s %s. Try `%s -h' for more information.\n"
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:400
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15239,13 +11259,12 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  --display=DISPLAY   X display to use\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:528
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -15269,873 +11288,745 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr ""
 
-#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
-#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:1154
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:308
 msgid "Could not unload plugin"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:309
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:427
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
+#, fuzzy
+msgid "Author"
+msgstr "අනුමත"
+
+msgid "<b>Written by:</b>"
+msgstr ""
+
+msgid "<b>Web site:</b>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:553
+#, fuzzy
+msgid "<b>Filename:</b>"
+msgstr "ගොනු නම:"
+
 msgid "Configure Pl_ugin"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:616
 msgid "<b>Plugin Details</b>"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "ගොනුවක් තෝරන්න"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
-msgstr ""
+msgstr "සැසිය ආ_රම්භ කරයි"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
-msgstr ""
+msgstr "සැසිය අ_වසන් කරයි"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
-msgstr ""
+msgstr "අසළින් ඉ_වත්වයයි."
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
-msgstr ""
+msgstr "ඉවත්වගොස් සිට නැ_වත පැමිණෙයි"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
-msgstr ""
+msgstr "ලිවීම _අරඹයි"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
-msgstr ""
+msgstr "ලිවීම අතරතුර වි_රාමයක් ගනියි"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
-msgstr ""
+msgstr "ලි_වීම නවත්වයි"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
-msgstr ""
+msgstr "ප_ණිවුඩයක් යැවීම"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
-msgstr ""
+msgstr "කෂණික ප_ණිවුඩ කවුඵවක් විවෘත කරන්න"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
-msgstr ""
+msgstr "_පණිවුඩයක් යැවීම"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "සැරිසරන්න... (_o)"
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
-msgstr ""
+msgstr "පෙර_දසුන"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr ""
 
-#: ../pidgin/gtkpounce.c:1258
 msgid "Pounce Target"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "ප්‍රකෘතිය"
-
-#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:697
 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 ""
 
-#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "නිරූපකය"
 
-#: ../pidgin/gtkprefs.c:894
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
 msgid "System Tray Icon"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
-msgstr ""
+msgstr "නොකියවන ලද පණිවුඩ සඳහා"
 
-#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
-msgstr ""
+msgstr "දෙබස් කවුඵව සැඟවීම"
 
-#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:2044
 msgid "When away"
 msgstr ""
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
-msgstr ""
+msgstr "_ස්ථානගතකිරීම"
 
-#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "ඉහළ"
 
-#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "වම"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "දකුණ"
 
-#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:996
 msgid "Show _formatting on incoming messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:998
 msgid "Close IMs immediately when the tab is closed"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1001
 msgid "Show _detailed information"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1003
 msgid "Enable buddy ic_on animation"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1010
 msgid "_Notify buddies that you are typing to them"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1013
 msgid "Highlight _misspelled words"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1017
 msgid "Use smooth-scrolling"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1020
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1022
 msgid "Minimi_ze new conversation windows"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1026
+msgid "Minimum input area height in lines:"
+msgstr ""
+
 msgid "Font"
 msgstr "අක්‍ෂර"
 
-#: ../pidgin/gtkprefs.c:1028
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1030
 msgid "Use font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1032
 msgid "Conversation _font:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1046
 msgid "Default Formatting"
 msgstr "පෙරනිමි හැඩකරණය"
 
-#: ../pidgin/gtkprefs.c:1065
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1125
 msgid "Cannot start proxy configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1137
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1157
 msgid "ST_UN server:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1169
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1173
 msgid "_Autodetect IP address"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1182
 msgid "Public _IP:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1213
 msgid "Ports"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1216
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
 msgid "_Manually specify range of ports to listen on"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1219
 msgid "_Start port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1226
 msgid "_End port:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1234
 msgid "Proxy Server &amp; Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1242
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1250
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1255
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1262
 msgid "Configure _Proxy"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1267
 msgid "Configure _Browser"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1273
 msgid "Proxy Server"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1278
 msgid "No proxy"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1334
 msgid "_User:"
 msgstr "පරිශීලක (_U):"
 
-#: ../pidgin/gtkprefs.c:1422
 msgid "Seamonkey"
-msgstr ""
+msgstr "සීමංකි"
 
-#: ../pidgin/gtkprefs.c:1423
 msgid "Opera"
 msgstr "ඔපෙරා"
 
-#: ../pidgin/gtkprefs.c:1424
 msgid "Netscape"
-msgstr ""
+msgstr "නෙට්ස්කේප්"
 
-#: ../pidgin/gtkprefs.c:1425
 msgid "Mozilla"
 msgstr "මොසිලා"
 
-#: ../pidgin/gtkprefs.c:1426
 msgid "Konqueror"
-msgstr ""
+msgstr "කොන්ක්වරර්"
+
+#, fuzzy
+msgid "Desktop Default"
+msgstr "ප්‍රකෘතිය"
 
-#: ../pidgin/gtkprefs.c:1427
 msgid "GNOME Default"
-msgstr ""
+msgstr "GNOME ප්‍රකෘතිය"
 
-#: ../pidgin/gtkprefs.c:1428
 msgid "Galeon"
-msgstr ""
+msgstr "ගේලියොන්"
 
-#: ../pidgin/gtkprefs.c:1429
 msgid "Firefox"
 msgstr "ෆයර්ෆොක්ස්"
 
-#: ../pidgin/gtkprefs.c:1430
 msgid "Firebird"
-msgstr ""
+msgstr "ෆයර්බර්ඩ්"
 
-#: ../pidgin/gtkprefs.c:1431
 msgid "Epiphany"
-msgstr ""
+msgstr "එපිෆනි"
 
-#: ../pidgin/gtkprefs.c:1440
 msgid "Manual"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1493
 msgid "Browser Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1497
 msgid "_Browser:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1505
 msgid "_Open link in:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1507
 msgid "Browser default"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1508
 msgid "Existing window"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1510
 msgid "New tab"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1524
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1565
 msgid "Log _format:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1570
 msgid "Log all _instant messages"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1572
 msgid "Log all c_hats"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1574
 msgid "Log all _status changes to system log"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1724
 msgid "Sound Selection"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1734
+#, c-format
 msgid "Quietest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1736
+#, c-format
 msgid "Quieter"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1738
+#, c-format
 msgid "Quiet"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1742
+#, c-format
 msgid "Loud"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1744
+#, c-format
 msgid "Louder"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1746
+#, c-format
 msgid "Loudest"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1812
 msgid "_Method:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1814
 msgid "Console beep"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1821
 msgid "No sounds"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1829
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1856
 msgid "Sounds when conversation has _focus"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1858
 msgid "Enable sounds:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1869
 msgid "Volume:"
 msgstr "පරිමාව:"
 
-#: ../pidgin/gtkprefs.c:1949
 msgid "Play"
 msgstr "වාදනය"
 
-#: ../pidgin/gtkprefs.c:2027
+#, fuzzy
+msgid "_Browse..."
+msgstr "සැරිසරන්න... (_o)"
+
+#, fuzzy
+msgid "_Reset"
+msgstr "මුල්ම තත්වයට සකසන්න"
+
 msgid "_Report idle time:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2032
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2041
 msgid "_Auto-reply:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2045
 msgid "When both away and idle"
 msgstr ""
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2051
 msgid "Auto-away"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2053
 msgid "Change status when _idle"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2057
 msgid "_Minutes before becoming idle:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2065
 msgid "Change _status to:"
 msgstr ""
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2086
 msgid "Status at Startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2088
 msgid "Use status from last _exit at startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2094
 msgid "Status to a_pply at startup:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2133
 msgid "Interface"
 msgstr "අතුරු මූණත"
 
-#: ../pidgin/gtkprefs.c:2135
 msgid "Smiley Themes"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2142
 msgid "Browser"
 msgstr "ගවේශකය"
 
-#: ../pidgin/gtkprefs.c:2146
 msgid "Status / Idle"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "පෞද්ගලිකත්වය"
 
-#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#. Remove All button
+#, fuzzy
+msgid "Remove Al_l"
+msgstr "ඉවත් කරන්න"
+
 msgid "Permit User"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr ""
 
-#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:273
 msgid "Apply"
 msgstr "යොදන්න"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "That file already exists"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1509
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1512
 msgid "Overwrite"
 msgstr "මත ලියන්න"
 
-#: ../pidgin/gtkrequest.c:1513
 msgid "Choose New Name"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1651 ../pidgin/gtkrequest.c:1665
 msgid "Select Folder..."
 msgstr ""
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
-msgid "Room List"
-msgstr "කාමර ලැයිස්තුව"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr ""
 
 #. add button
-#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr ""
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "සිරස්තලය: (_T)"
 
-#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr ""
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr ""
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr ""
 
-#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:664
+msgid "Custom Smiley"
+msgstr ""
+
+msgid "Duplicate Shortcut"
+msgstr ""
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+
+msgid "More Data needed"
+msgstr ""
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr ""
+
+msgid "Please select an image for the smiley."
+msgstr ""
+
+msgid "Edit Smiley"
+msgstr ""
+
+msgid "Add Smiley"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley _Image"
+msgstr "පිළිඹිබුව සුරකින්න"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley"
+msgstr "ප්‍රමාණය"
+
+msgid "Custom Smiley Manager"
+msgstr ""
+
 msgid "Waiting for network connection"
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:1072
 msgid "New status..."
 msgstr ""
 
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved statuses..."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:634
+msgid "Status Selector"
+msgstr ""
+
 msgid "Google Talk"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
-#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1536
 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 ""
 
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16146,17 +12037,14 @@ msgstr ""
 #. * 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:1615
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1615
 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:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16164,106 +12052,82 @@ msgid ""
 "<b>Image size:</b> %dx%d"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%s' ගොනුව විවෘත කිරීම අපහසුවිය: %s"
 
-#: ../pidgin/gtkutils.c:2798
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "'%s'පිළිඹිබුව පූරණය දෝෂසහිතයි: හේතුව නොදන්නා අතර සමහරවිට දූෂිත පිළිඹිබු ගොනුවක් විය හැක"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr ""
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr ""
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr ""
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin Tooltip"
+msgstr ""
+
 msgid "Pidgin smileys"
 msgstr ""
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr ""
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "කිසිවක් නැත"
 
-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr ""
-
-#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr ""
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "මිනිත්තු"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr ""
 
@@ -16273,59 +12137,45 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr ""
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:941
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
+msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr ""
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr ""
 
-#: ../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 ""
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr ""
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr ""
 
@@ -16335,89 +12185,71 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
-msgid "Allows for controlling the values associated with different buddy states."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr ""
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:82
 msgid "Error Messages"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:84
 msgid "System Messages"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:85
 msgid "Sent Messages"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:86
 msgid "Received Messages"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:311
 msgid "Apply in Chats"
 msgstr ""
 
-#: ../pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
 msgstr ""
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr ""
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr ""
 
 #. 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 ""
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 
@@ -16427,39 +12259,32 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr ""
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr ""
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr ""
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr ""
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr ""
 
@@ -16469,101 +12294,82 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr ""
 
 #. *  description
-#: ../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"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
-msgstr ""
+msgstr "කෂණික පණිවුඩ"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
+"ඔබගේ ලිපින පොතෙහි පුද්ගලයෙකු පහළින් තෝරාදෙන්න. එසේ නොමැති නම් නව පුද්ගලයෙකු ඇතුලත් කරන්න."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "සමූහය:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
-msgstr ""
+msgstr "නව පුද්ගලයා"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
-msgstr ""
+msgstr "මිතුරෙකු තෝරන්න"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr ""
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#, fuzzy
 msgid "Unable to send email"
-msgstr ""
+msgstr "විද්‍යුත් තැපැල් පණිවුඩය යැවීමට නොහැක"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "Evolution සක්‍රිය ගොනුව PATH තුල සොයාගත නොහැක."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
+#, fuzzy
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "මෙම මිතුරා සඳහා විද්‍යුත් තැපැල් ලිපිනයක් සොයාගත නොහැක."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
-msgstr ""
+msgstr "ලිපින පොතට ඇතුලත් කරන්න"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
+#, fuzzy
 msgid "Send Email"
-msgstr ""
+msgstr "විද්‍යුත් තැපැල් පණිවුඩයක් යවන්න"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
-msgstr ""
+msgstr "Evolution සබඳතාවය සැකැස්ම"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
+msgstr "සවයංක්‍රීයව මිතුරන් ඇතුලත් කල යුතු සියලුම ගිනුම් තෝරාදෙන්න."
 
 #. *< type
 #. *< ui_requirement
@@ -16571,47 +12377,38 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
-msgstr ""
+msgstr "Evolution සබඳතාවය"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
-msgstr ""
+msgstr "Evolution සබඳතාවය ලබාදෙයි."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
-msgstr ""
+msgstr "කරුණාකර පුද්ගල තොරතුරු පහත ඇතුලත් කරන්න."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
+msgid "Please enter the buddy's username and account type below."
+msgstr "කරුණාකර මිතුරු නාමය සහ ගිනුම් වර්ගය පහත ඇතුලත් කරන්න."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
-msgstr ""
+msgstr "ගිණුම් වර්ගය:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "වෛකල්පිත තොරතුරු:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
-msgstr ""
+msgstr "පළමු නම:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
-msgstr ""
+msgstr "අවසන් නම:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
+#, fuzzy
 msgid "Email:"
-msgstr ""
+msgstr "විද්‍යුත් තැපෑල:"
 
 #. *< type
 #. *< ui_requirement
@@ -16619,27 +12416,24 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
-msgstr ""
+msgstr "GTK සංඥා පරීක්ෂාව"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
-msgstr ""
+msgstr "සියළුම පරිශීලක අතුරු මුහුනත් සංඥාවල නිරවද්‍යතාවය දැනගැනීම සඳහා වූ පරීක්ෂණයකි."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
+"\n"
+"<b>මිතුරු සටහන</b>: %s"
 
-#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "අතීත"
 
@@ -16649,86 +12443,70 @@ msgstr "අතීත"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr ""
+msgstr "අසළ නොමැති විටදී රූපකරනය කරන්න"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
+msgstr "ඔබ අසළ නොමැති විටදී මිතුරු ලැයිස්තුව සහ ඔබගේ සංවාද රූපකරනය කරයි."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
-msgstr ""
+msgstr "තැපෑල පරීක්ෂාකරණය"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr ""
+msgstr "නව තැපැල් පණිවුඩ සඳහා පරීක්ෂාකර බලයි."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
+msgstr "ඔබට නව තැපැල් පණිවුඩ ඇති විටදී මිතුරු ලැයිස්තුවට කුඩා කොටුවක් එක් කරයි."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
-msgstr ""
+msgstr "දර්ශක තීරුව"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr ""
+msgstr "තීරුවක් එක් කිරීමෙන් සංවාදයේ ඇති නව පණවුඩ හඳුන්වාදෙයි."
+
+msgid "Jump to markerline"
+msgstr "දර්ශක තීරුව වෙත යන්න"
 
-#: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "නව දර්ශක තීරුවක් එක් අඳින්න"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
-msgstr ""
+msgstr "_ක්ෂණික පණිවුඩ කවුළු"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
-msgstr ""
+msgstr "සංවාද_ කවුළු"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
-msgstr ""
+msgstr "ගීතමය පණිවුඩ සංවාදයක් අවසර පතයි. මෙයට අවසර දීම සඳහා කරුණාකර MM රූපකය මත ඔබන්න."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "ගීතමය පණිවුඩ සංවාද සැසිය ස්ථිර කර ඇත."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
-msgstr ""
+msgstr "ගීතමය පණිවුඩ"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "මෙම විධානය ධාවනය කිරීමේදී ගැටුමක් ඇතිවිය:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
-msgstr ""
+msgstr "සංස්කාරකය ධාවනය කිරීමේ දෝෂයක්"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
-msgstr ""
+msgstr "පෙන්වා දී ඇත දෝෂය ඇති විය:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "යොද වන්න (_A)"
 
@@ -16740,86 +12518,73 @@ msgstr "යොද වන්න (_A)"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr ""
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 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 ""
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
+msgid "\t_Only when someone says your username"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr ""
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr ""
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr ""
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr ""
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr ""
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr ""
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr ""
 
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr ""
+
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr ""
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr ""
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr ""
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr ""
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr ""
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -16829,7 +12594,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr ""
 
@@ -16837,7 +12601,6 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 
@@ -16847,19 +12610,16 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
 
 #. *  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"
@@ -16867,52 +12627,44 @@ msgid ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:294
+#, c-format
 msgid "Select Interface Font"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -16936,68 +12688,54 @@ msgstr ""
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "අකුරු"
 
-#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr ""
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr ""
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
 
-#: ../pidgin/plugins/raw.c:178
 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 ""
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr ""
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
-msgstr ""
+msgstr "නව සංස්කරණයක් නිකුත් වී ඇත"
 
 #. *< type
 #. *< ui_requirement
@@ -17005,86 +12743,90 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
-msgstr ""
+msgstr "නච සංස්කරණ නිකුත් වී ඇතිදැයි වරින් වර සොයාබලන්න"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:1962
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Send Button"
+msgstr "වෙතට යවන්න"
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+
 msgid "Duplicate Correction"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
-msgstr ""
+msgstr "සම්පූර්ණ වදන් පමණි"
 
-#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr ""
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr ""
 
-#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
@@ -17094,7 +12836,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -17102,11 +12843,9 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr ""
 
-#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr ""
 
@@ -17116,49 +12855,38 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr ""
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr ""
 
-#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr ""
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr ""
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr ""
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr ""
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr ""
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr ""
 
@@ -17168,64 +12896,49 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr ""
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
-msgstr ""
+msgstr "ක්ෂණික පණිවුඩ සංවාද කවුළු"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
-msgstr ""
+msgstr "ක්ෂණි_ක පණිවුඩ කවුළු විනිවිද පෙනුම"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr ""
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
-msgstr ""
+msgstr "ක්‍ෂණික පණිවුඩ කවුළුව මතට පැමිණීමේදී එහි විනිවිද භාවය නැති කරන්න"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
-msgstr ""
+msgstr "සැමවිටම ඉහලින්ම පෙන්වන්න"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
-msgstr ""
+msgstr "මිතුරු ලැයිස්තු කවුඑව"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
-msgstr ""
+msgstr "_මිතුරු ලැයිස්තු කවුඑ විනිවිද පෙනුම"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
-msgstr ""
+msgstr "මිතුරු ලැයිස්තු කවුඑව මතට පැමිණීමේදී එහි විනිවිද පෙනුම නැති කරන්න"
 
 #. *< type
 #. *< ui_requirement
@@ -17233,73 +12946,63 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
-msgstr ""
+msgstr "විනිවිද පෙනුම"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr ""
+msgstr "මිතුරු ලැයිස්තුව සහ සංවාද සඳහා විචල්‍ය විනිවිද පෙනුම භාවිත කරන්න"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
+"මෙම ඈඳුම සංවාද කවුඵ සහ මිතුරු ලැයිස්තුව සඳහා alpha විනිවිදපෙනුම ක්‍රියාත්මක කරයි.\n"
+"\n"
+"* සටහන: මෙම ඈඳුතුව සඳහා Win2000 හෝ නව සංස්කරණයක් අවශ්‍යයි."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
-msgstr ""
+msgstr "GTK+ ධාවනකාල අනුවාදය"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
-msgstr ""
+msgstr "පණගැන්වුම"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
-msgstr ""
+msgstr "වින්ඩෝස් පණගැන්වුමේදී %s _ආරම්භ කරන්න"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
-msgstr ""
+msgstr "_යාකල හැකි මිතුරු ලැයිස්තුව"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
-msgstr ""
+msgstr "මිතුරු ලැයිස්තුව_ සියල්ලටම ඉහලින් _තබන්න:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
-msgstr ""
+msgstr "යාකර ඇති විටදී පමණක්"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
-msgstr ""
+msgstr "සංවාද_ පණිවුඩ ලැබීමේදී _කවුළුව දීප්තිමත් කරන්න"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
-msgstr ""
+msgstr "වින්ඩෝස් Pidgin වෛකල්පිත"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
-msgstr ""
+msgstr "වින්ඩෝස් මත Pidgin සඳහා වූ වෛකල්පිතයන් ලබාදෙයි."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "වින්ඩෝස් මත Pidgin වලට අදාල, මිතුරු ලැයිස්තුව යාකිරීම වැනි, වෛකල්පිතයන් ලබා දෙයි."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>ඉවත් විය.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -17307,40 +13010,36 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
-msgstr ""
+msgstr "XMPP ආදායකය"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
-msgstr ""
+msgstr "ගිණුම:"
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>XMPP සමඟ සම්බන්ධ වී නොමැත</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
+msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හි නිරවද්‍යකරනයන් කිරීමට ප්‍රයෝජනවත් වේ."
+
+#~ msgid "E-Mail"
+#~ msgstr "විද්‍යුත් තැපැල:"
 
+#~ msgid "E-mail"
+#~ msgstr "විද්‍යුත් තැපෑල"
diff --git a/po/sl.po b/po/sl.po
index 125637c553..b1f1a75625 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 08:57-0400\n"
-"PO-Revision-Date: 2008-05-07 12:03+0100\n"
+"POT-Creation-Date: 2008-08-15 11:20-0400\n"
+"PO-Revision-Date: 2008-07-08 17:58+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
@@ -99,6 +99,10 @@ msgstr "Geslo:"
 msgid "Alias:"
 msgstr "Psevdonim:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Ustvari ta račun na strežniku"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -327,6 +331,7 @@ msgstr "Pokaži/skrij oznako"
 msgid "Nickname"
 msgstr "Vzdevek"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "Nedejaven"
@@ -408,6 +413,9 @@ msgstr "Pridruži se klepetu ..."
 msgid "View Log..."
 msgstr "Pokaži dnevnik ..."
 
+msgid "View All Logs"
+msgstr "Pokaži vse dnevnike"
+
 msgid "Show"
 msgstr "Pokaži"
 
@@ -606,6 +614,19 @@ msgstr ""
 msgid "Send To"
 msgstr "Pošlji k"
 
+msgid "Invite message"
+msgstr "Sporočilo povabila"
+
+msgid "Invite"
+msgstr "Povabi"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Vnesite ime uporabnika, ki ga želite povabiti,\n"
+"dodate lahko tudi sporočilo-povabilo."
+
 msgid "Conversation"
 msgstr "Pogovor"
 
@@ -618,6 +639,9 @@ msgstr "Pokaži časovne žige"
 msgid "Add Buddy Pounce..."
 msgstr "Dodaj opozorilo prijatelju ..."
 
+msgid "Invite..."
+msgstr "Povabi ..."
+
 msgid "Enable Logging"
 msgstr "Vključi dnevnik"
 
@@ -627,9 +651,13 @@ msgstr "Vključi zvoke"
 msgid "<AUTO-REPLY> "
 msgstr "<SAMODEJNI ODGOVOR>"
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "Seznam uporabnikov:\n"
+#, fuzzy, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Seznam uporabnikov:\n"
+msgstr[1] "Seznam uporabnikov:\n"
+msgstr[2] "Seznam uporabnikov:\n"
+msgstr[3] "Seznam uporabnikov:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "Podprte možnosti razhroščevanja:  različica"
@@ -644,6 +672,20 @@ msgstr ""
 "Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s ni veljaven razred sporočil. Oglejte si '/help msgcolor', kjer so "
+"navedeni veljavni razredi sporočil."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s ni veljavna barva. Oglejte si '/help msgcolor', kjer so opisane veljavne "
+"barve."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -689,6 +731,14 @@ msgstr "prefs: Pokaži okno nastavitev."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Pokaži okno savedstatuses."
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
@@ -709,8 +759,12 @@ msgid "Pause"
 msgstr "Premor"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Prenosi datotek - %d%% od %d datotek"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Prenosi datotek - %d%% od %d datotek"
+msgstr[1] "Prenosi datotek - %d%% od %d datoteke"
+msgstr[2] "Prenosi datotek - %d%% od %d datotek"
+msgstr[3] "Prenosi datotek - %d%% od %d datotek"
 
 #. Create the window.
 msgid "File Transfers"
@@ -825,6 +879,9 @@ msgstr "Pomenki v %s"
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
+msgid "All Conversations"
+msgstr "Vsi pogovori"
+
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
@@ -864,9 +921,6 @@ msgstr "Nadaljuj"
 msgid "IM"
 msgstr "Sporoči"
 
-msgid "Invite"
-msgstr "Povabi"
-
 msgid "(none)"
 msgstr "(brez)"
 
@@ -1070,6 +1124,7 @@ msgstr "%s je postal odsoten. (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
@@ -1436,6 +1491,7 @@ msgid ""
 msgstr ""
 "Ko je odprt nov pogovor, ta vtičnik vstavi zadnji pogovor v trenuten pogovor."
 
+#, c-format
 msgid "Online"
 msgstr "Prisoten"
 
@@ -1772,6 +1828,7 @@ msgstr ""
 "Napaka pri branju iz procesa razločevanja:\n"
 "%s"
 
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF pri branju iz procesa razločevanja"
 
@@ -1861,6 +1918,7 @@ msgstr "Začetek prenosa %s od %s"
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokončan."
 
+#, c-format
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokončan."
 
@@ -1868,6 +1926,7 @@ msgstr "Prenos datoteke je dokončan."
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
@@ -2073,6 +2132,7 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Uporabljate %s, a ta vtičnik zahteva %s."
 
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Ta vtičnik ni definiral vrednosti ID."
 
@@ -2084,8 +2144,11 @@ msgstr "Neustrezna %d vtičnika (potrebuje %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Neustrezna različica ABI %d.%d.x (potrebna je %d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "Vtičnik ne vsebuje implementacije vseh potrebnih funkcij"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Vtičnik ne vsebuje implementacije vseh potrebnih funkcij (list_icon, login "
+"in close)"
 
 #, c-format
 msgid ""
@@ -2167,6 +2230,10 @@ msgstr ""
 "datoteke\n"
 "(le če ni pomenka s pošiljateljem)"
 
+#, fuzzy
+msgid "Create a new directory for each user"
+msgstr "Izberite imenik za iskanje"
+
 msgid "Notes"
 msgstr "Opombe"
 
@@ -2763,13 +2830,12 @@ msgstr ""
 "namestite ActiveTCL z naslova http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
 "Paketa orodij Apple Bonjour za Windows ni mogoče najti, oglejte si pogosto "
-"zastavljena vprašanja na naslovu: http://developer.pidgin.im/wiki/Using%"
-"20Pidgin#CanIusePidginforBonjourLink-LocalMessaging za več podrobnosti."
+"zastavljena vprašanja na naslovu: http://d.pidgin.im/BonjourWindows za več "
+"podrobnosti."
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Dohodnim povezavam IM ni mogoče prisluhniti\n"
@@ -2825,9 +2891,6 @@ msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 msgid "Cannot open socket"
 msgstr "Vtičnice ni mogoče odpreti"
 
-msgid "Error setting socket options"
-msgstr "Napaka pri nastavljanju možnosti vtičnice"
-
 msgid "Could not bind socket to port"
 msgstr "Povezava vtičnice z vrati ni uspela"
 
@@ -2878,6 +2941,9 @@ msgstr "Seznam prijateljev je bil uspešno naložen"
 msgid "Save buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
+msgid "Load buddylist from file..."
+msgstr "Uvozi seznam prijateljev iz datoteke ..."
+
 msgid "Fill in the registration fields."
 msgstr "Izpolnite polja za registracijo."
 
@@ -2975,6 +3041,7 @@ msgstr "Na voljo"
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
+#, c-format
 msgid "Away"
 msgstr "Odsoten"
 
@@ -3053,9 +3120,6 @@ msgstr "Izbriši seznam prijateljev na strežniku"
 msgid "Save buddylist to file..."
 msgstr "Shrani seznam prijateljev v datoteko ..."
 
-msgid "Load buddylist from file..."
-msgstr "Uvozi seznam prijateljev iz datoteke ..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -3171,6 +3235,9 @@ msgstr "Vrata"
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
+
 msgid "Real name"
 msgstr "Resnično ime"
 
@@ -3184,8 +3251,8 @@ msgstr "Uporabi SSL"
 msgid "Bad mode"
 msgstr "Neveljaven način"
 
-#, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
+#, fuzzy, c-format
+msgid "Ban on %s by %s, set %s ago"
 msgstr "Prepoved za %s s strani %s, nastavljeno %ld sekund nazaj"
 
 #, c-format
@@ -3356,6 +3423,9 @@ msgstr ""
 "odsoten [sporočilo]:  Nastavite sporočilo za odsotnost ali ne uporabite "
 "sporočila za vrnitev iz odsotnosti."
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:  pošlji ukaz chanservu"
 
@@ -3614,6 +3684,8 @@ msgstr "Poštna številka"
 msgid "Country"
 msgstr "Država"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -3799,12 +3871,12 @@ msgstr "Preveri hop"
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-msgid "Resource"
-msgstr "Vir"
-
 msgid "Priority"
 msgstr "Prednost stika"
 
+msgid "Resource"
+msgstr "Vir"
+
 msgid "Middle Name"
 msgstr "Drugo ime"
 
@@ -3851,6 +3923,7 @@ msgstr "Pomenek"
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
@@ -4493,8 +4566,8 @@ msgid "XMPP Message Error"
 msgstr "Napaka sporočila XMPP"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (Koda %s)"
+msgid "(Code %s)"
+msgstr "(Koda %s)"
 
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
@@ -4519,14 +4592,14 @@ msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Napaka v pomenku %s"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "Napaka v pomenku %s"
+
+#, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
@@ -4612,162 +4685,215 @@ msgstr ""
 "%s je na lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati "
 "tega prijatelja?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "Ni mogoče razčleniti sporočila"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Skladenjska napaka (verjetno hrošč v odjemalcu)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "Neveljaven naslov e-pošte"
 
+#, c-format
 msgid "User does not exist"
 msgstr "Uporabnik ne obstaja"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manjka povsem veljavno ime domene"
 
+#, c-format
 msgid "Already logged in"
 msgstr "Že prijavljeni"
 
+#, c-format
 msgid "Invalid username"
 msgstr "Neveljavno uporabniško ime"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Neveljavno prijateljsko ime"
 
+#, c-format
 msgid "List full"
 msgstr "Seznam poln"
 
+#, c-format
 msgid "Already there"
 msgstr "Že tam"
 
+#, c-format
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
+#, c-format
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "Že v stanju"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "Že na sogovornikovem seznamu"
 
+#, c-format
 msgid "Too many groups"
 msgstr "Preveč skupin"
 
+#, c-format
 msgid "Invalid group"
 msgstr "Neveljavna skupina"
 
+#, c-format
 msgid "User not in group"
 msgstr "Uporabnik ni v skupini"
 
+#, c-format
 msgid "Group name too long"
 msgstr "Predolgo ime skupine"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ni mogoče odstraniti skupine nič"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Uporabnika ste želeli dodati v skupino, ki ne obstaja"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Stikalna plošča ni uspela"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Prenos obvestila ni uspel"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "Obvezna polja niso bila izpolnjena"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Preveč zadetkov za FND"
 
+#, c-format
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Storitev trenutno ni na voljo"
 
+#, c-format
 msgid "Database server error"
 msgstr "Napaka v podatkovni bazi strežnika"
 
+#, c-format
 msgid "Command disabled"
 msgstr "Ukaz onemogočen"
 
+#, c-format
 msgid "File operation error"
 msgstr "Napaka pri operaciji z datoteko"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "Napaka ob rezervaciji pomnilnika"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Strežniku je bila poslana napačna vrednost CHL"
 
+#, c-format
 msgid "Server busy"
 msgstr "Strežnik je zaposlen"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "Strežnik je nedostopen"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "Strežnik za obveščanje vrstnikov je nedelujoč"
 
+#, c-format
 msgid "Database connect error"
 msgstr "Napaka pri povezavi v podatkovno bazo"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Strežnik se zaustavlja (skočite iz ladje!)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "Napaka pri ustvarjanju povezave"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameter je bodisi neznan ali nedovoljen"
 
+#, c-format
 msgid "Unable to write"
 msgstr "Ni bilo mogoče pisati"
 
+#, c-format
 msgid "Session overload"
 msgstr "Preobremenitev seje"
 
+#, c-format
 msgid "User is too active"
 msgstr "Uporabnik je preveč aktiven"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "Preveč sej"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "Potni list ni preverjen"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "Neveljavna datoteka s prijatelji"
 
+#, c-format
 msgid "Not expected"
 msgstr "Nepričakovano"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Prijateljsko ime se spreminja preveč pogosto"
 
+#, c-format
 msgid "Server too busy"
 msgstr "Strežnik preveč zaposlen"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Ni dovoljeno brez povezave"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "Brez sprejemanja novih uporabnikov"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Otroški potni list brez privolitve staršev"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Račun še ni bil potrjen"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "Napačna vstopnica"
 
@@ -4790,6 +4916,9 @@ msgstr "%s vam je pomežiknil(a)."
 msgid "Nudging %s..."
 msgstr "Mežikanje %s ..."
 
+msgid "Email Address..."
+msgstr "E-naslov ..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN poimenovanje je predolgo."
 
@@ -4824,7 +4953,21 @@ msgstr "Dovoli"
 msgid "Disallow"
 msgstr "Prepovej"
 
-msgid "This Hotmail account may not be active."
+#, fuzzy, c-format
+msgid "Blocked Text for %s"
+msgstr "Komentar o prijatelju %s"
+
+#, fuzzy
+msgid "No text is blocked for this account."
+msgstr "Za ta račun uporabi to _ikono prijatelja:"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+#, fuzzy
+msgid "This account does not have email enabled."
 msgstr "Ta račun Hotmail morda ni aktiven."
 
 msgid "Send a mobile message."
@@ -4884,6 +5027,9 @@ msgstr "Omogoči/onemogoči mobilne naprave ..."
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dovoli/prepovej mobilne strani ..."
 
+msgid "View Blocked Text..."
+msgstr ""
+
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo pošto Hotmail"
 
@@ -5092,16 +5238,9 @@ msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Overjanje Windows Live ID: Povezava ni mogoča"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Overjanje Windows Live ID: Žetona overovitve v odzivu strežnika ni mogoče "
-"najti"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "Overovitev Windows Live ID ni uspela"
+#, fuzzy
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Overjanje Windows Live ID: Povezava ni mogoča"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5148,6 +5287,10 @@ msgstr "%s ni veljaven račun potnega lista."
 msgid "Service Temporarily Unavailable."
 msgstr "Storitev je trenutno nedosegljiva."
 
+#, fuzzy
+msgid "Mobile message was not sent because it was too long."
+msgstr "Sporočila ni mogoče poslati, saj niste prijavljeni."
+
 msgid "Unable to rename group"
 msgstr "Skupine ni mogoče preimenovati"
 
@@ -5190,6 +5333,23 @@ msgstr[3] ""
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+#, fuzzy
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Sporočila ni mogoče poslati, saj je poslano prehitro:"
+
+#, fuzzy
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
+
+#, fuzzy
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
+
 msgid "Unable to connect"
 msgstr "Ni se mogoče povezati"
 
@@ -5310,6 +5470,9 @@ msgstr "\"%s\" ni bilo mogoče dodati."
 msgid "The username specified is invalid."
 msgstr "Navedeno uporabniško ime ni veljavno."
 
+msgid "This Hotmail account may not be active."
+msgstr "Ta račun Hotmail morda ni aktiven."
+
 msgid "Has you"
 msgstr "Vas ima"
 
@@ -5349,8 +5512,15 @@ msgid "Logging in"
 msgstr "Prijavljanje"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+"Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih podatkov)"
+msgstr[1] ""
+"Povezava s strežnikom je izgubljena (v %d sekundi ni bilo prejetih podatkov)"
+msgstr[2] ""
+"Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih podatkov)"
+msgstr[3] ""
 "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih podatkov)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
@@ -5448,11 +5618,23 @@ msgstr "Prijatelji za klepet"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
 "%d prijateljev je bilo dodanih ali posodobljenih s strežnika (vključno s "
 "prijatelji, ki so že strežniškem seznamu)"
+msgstr[1] ""
+"%d prijatelj je bil dodan ali posodobljen s strežnika (vključno s "
+"prijatelji, ki so že strežniškem seznamu)"
+msgstr[2] ""
+"%d prijatelja sta bila dodana ali posodobljena s strežnika (vključno s "
+"prijatelji, ki so že strežniškem seznamu)"
+msgstr[3] ""
+"%d prijatelji so bili dodani ali posodobljeni s strežnika (vključno s "
+"prijatelji, ki so že strežniškem seznamu)"
 
 msgid "Add contacts from server"
 msgstr "Dodaj stike s strežnika"
@@ -5921,6 +6103,7 @@ msgstr ""
 msgid "Error. SSL support is not installed."
 msgstr "Napaka. Podpora SSL ni nameščena."
 
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spročil se ne da pošiljati več.več."
 
@@ -6072,11 +6255,11 @@ msgstr "Premalo pravic"
 msgid "In local permit/deny"
 msgstr "V lokalnem dovoljenju/prepovedi"
 
-msgid "Too evil (sender)"
-msgstr "Preveč zloben (pošiljatelj)"
+msgid "Warning level too high (sender)"
+msgstr "Raven opozoril previsoka (pošiljatelj)"
 
-msgid "Too evil (receiver)"
-msgstr "Preveč zloben (prejemnik)"
+msgid "Warning level too high (receiver)"
+msgstr "Raven opozoril previsoka (prejemnik)"
 
 msgid "User temporarily unavailable"
 msgstr "Uporabnik začasno ni dostopen"
@@ -6179,18 +6362,26 @@ msgstr "Video v živo"
 msgid "Camera"
 msgstr "Kamera"
 
+msgid "Screen Sharing"
+msgstr "Skupna raba zaslona"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
+#, c-format
 msgid "Not Available"
 msgstr "Ni na voljo"
 
+#, c-format
 msgid "Occupied"
 msgstr "Zaseden"
 
+#, c-format
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
+#, c-format
 msgid "Invisible"
 msgstr "Neviden"
 
@@ -6264,7 +6455,6 @@ msgstr ""
 "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
 "poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6310,6 +6500,7 @@ msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
 msgid "Unable to get a valid login hash."
 msgstr "Veljavnega prijavnega izvlečka ni mogoče pridobiti."
 
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Geslo poslano"
 
@@ -6425,20 +6616,35 @@ msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
 #, 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] "Spregledali ste %hu sporočil od %s, ker so bila neveljavna."
-msgstr[1] "Spregledali ste %hu sporočilo od %s, ker je bilo neveljavno."
-msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
-msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Spregledali ste %hu sporočil od %s, ker je njegova/njena raven opozoril "
+"previsoka."
+msgstr[1] ""
+"Spregledali ste %hu sporočilo od %s, ker je njegova/njena raven opozoril "
+"previsoka."
+msgstr[2] ""
+"Spregledali ste %hu sporočili od %s, ker je njegova/njena raven opozoril "
+"previsoka."
+msgstr[3] ""
+"Spregledali ste %hu sporočila od %s, ker je njegova/njena raven opozoril "
+"previsoka."
 
 #, 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] "Spregledali ste %hu sporočil od %s, ker so bila neveljavna."
-msgstr[1] "Spregledali ste %hu sporočilo od %s, ker je bilo neveljavno."
-msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
-msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Spregledali ste %hu sporočil od %s, ker je vaša raven opozoril previsoka."
+msgstr[1] ""
+"Spregledali ste %hu sporočilo od %s, ker je vaša raven opozoril previsoka."
+msgstr[2] ""
+"Spregledali ste %hu sporočili od %s, ker je vaša raven opozoril previsoka."
+msgstr[3] ""
+"Spregledali ste %hu sporočila od %s, ker je vaša raven opozoril previsoka."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6471,9 +6677,6 @@ msgstr "Na zvezi od"
 msgid "Member Since"
 msgstr "Član od"
 
-msgid "Available Message"
-msgstr "Sporočilo o dosegljivosti"
-
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
@@ -6503,12 +6706,17 @@ msgstr "Mobilni telefon"
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
 msgid "Zip Code"
 msgstr "Poštna številka"
 
+msgid "Work Information"
+msgstr "Informacije o zaposlitvi"
+
 msgid "Division"
 msgstr "Oddelek"
 
@@ -6518,9 +6726,6 @@ msgstr "Delovno mesto"
 msgid "Web Page"
 msgstr "Spletna stran"
 
-msgid "Work Information"
-msgstr "Informacije o zaposlitvi"
-
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
@@ -6746,12 +6951,6 @@ msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-msgid "Away Message"
-msgstr "Sporočilo o odsotnosti"
-
-msgid "<i>(retrieving)</i>"
-msgstr "<i>(pridobivanje ...)</i>"
-
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
@@ -6877,6 +7076,9 @@ msgstr ""
 "za prenos datotek in neposredno sporočanje\n"
 "(počasneje, vendar ne razkrije vašega naslova IP)"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "Dovoli več hkratnih prijav"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spraševanje %s za povezavo z nami pri %s:%hu za neposredno sporočanje."
@@ -6885,6 +7087,7 @@ msgstr "Spraševanje %s za povezavo z nami pri %s:%hu za neposredno sporočanje.
 msgid "Attempting to connect to %s:%hu."
 msgstr "Poskus povezave na %s:%hu."
 
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Poskus povezave prek strežnika-prehoda."
 
@@ -7181,13 +7384,6 @@ msgstr ""
 "Če ste ustvarjalec, upoštevajte: \n"
 "ta operacija bo spotoma odstranila ta Qun."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Koda [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "Napaka skupinske operacije"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Želite odobriti zahtevo?"
@@ -7216,34 +7412,44 @@ msgstr "Sistemsko sporočilo"
 msgid "Failed to send IM."
 msgstr "Neposrednega sporočila ni bilo mogoče poslati."
 
-msgid "Keep alive error"
-msgstr "Napaka pri ohranjanju živega"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Neznano-%d"
 
-msgid "Error requesting login token"
-msgstr "Napaka pri zahtevanju prijavnega žetona"
+msgid "Level"
+msgstr "Raven"
 
-msgid "Unable to login. Check debug log."
-msgstr "Prijava ni uspela. Preverite zapisnik razhroščevanja."
+#, fuzzy
+msgid "Member"
+msgstr "Član od"
 
-msgid "Unable to login"
-msgstr "Prijava ni uspela"
+msgid " VIP"
+msgstr ""
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Ni se bilo mogoče povezati."
+msgid " TCP"
+msgstr ""
 
-#, c-format
-msgid "Unknown-%d"
-msgstr "Neznano-%d"
+#, fuzzy
+msgid " FromMobile"
+msgstr "Mobilec"
 
-msgid "TCP Address"
-msgstr "Naslov TCP"
+#, fuzzy
+msgid " BindMobile"
+msgstr "Mobilec"
 
-msgid "UDP Address"
-msgstr "Naslov UDP"
+#, fuzzy
+msgid " Video"
+msgstr "Video v živo"
 
-msgid "Level"
-msgstr "Raven"
+#, fuzzy
+msgid " Space"
+msgstr "MySpace"
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr ""
 
 msgid "Invalid name"
 msgstr "Neveljavno ime"
@@ -7257,12 +7463,16 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Zadnja osvežitev</b>: %s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Strežnik</b>: %s: %d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Način povezovanja</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP strežnika</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Ime strežnika</b>: %s: %d<br>\n"
 
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
@@ -7314,12 +7524,92 @@ msgstr "Protokol QQ\tVtičnik"
 msgid "Connect using TCP"
 msgstr "Povezovanje prek TCP"
 
+msgid "resend interval(s)"
+msgstr ""
+
+#, fuzzy
+msgid "Keep alive interval(s)"
+msgstr "Napaka pri ohranjanju živega"
+
+msgid "Update interval(s)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "Neveljaven naslov"
+
+msgid "Keep alive error"
+msgstr "Napaka pri ohranjanju živega"
+
+msgid "Failed to connect server"
+msgstr "Povezava na strežnik neuspešna"
+
 msgid "Socket error"
 msgstr "Napaka vtičnice"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Izgubljena povezava s strežnikom:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "Ni mogoče brati iz vtičnice"
 
+msgid "Write Error"
+msgstr "Napaka pri pisanju"
+
+msgid "Connection lost"
+msgstr "Povezava izgubljena"
+
+msgid "Couldn't resolve host"
+msgstr "Gostitelja ni mogoče razbrati"
+
+msgid "hostname is NULL or port is 0"
+msgstr "ime gostitelja je NULL ali pa so vrata 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Povezovanje s strežnikom %s, ponovni poskusi: %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Ni se bilo mogoče povezati."
+
+msgid "Could not resolve hostname"
+msgstr "Imena strežnika ni mogoče razločiti"
+
+msgid "Unable to login. Check debug log."
+msgstr "Prijava ni uspela. Preverite zapisnik razhroščevanja."
+
+msgid "Unable to login"
+msgstr "Prijava ni uspela"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Prijava spodletela, ni odziva!"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Dodani ste [%d] bili v skupino \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "Uporabnik %d je zavrnil datoteko %s"
@@ -7331,12 +7621,6 @@ msgstr "Datoteka poslana"
 msgid "%d canceled the transfer of %s"
 msgstr "Uporabnik %d je prekinil prenos %s"
 
-msgid "Connection lost"
-msgstr "Povezava izgubljena"
-
-msgid "Login failed, no reply"
-msgstr "Prijava spodletela, ni odziva!"
-
 msgid "Do you want to add this buddy?"
 msgstr "Ali želite dodati tega prijatelja?"
 
@@ -7373,6 +7657,14 @@ msgstr "Sporočilo: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s ni na vašem seznamu prijateljev."
 
+#, fuzzy, c-format
+msgid "Notice from: %s"
+msgstr "Oznanilo od %s"
+
+#, c-format
+msgid "%s"
+msgstr ""
+
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
 
@@ -7963,6 +8255,7 @@ msgstr "<br><b>HMAC kanala:</b> %s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tema kanala:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Načini kanala:</b> "
 
@@ -7987,6 +8280,7 @@ msgstr "Geslo kanala"
 msgid "Channel Public Keys List"
 msgstr "Seznam javnih ključev kanala"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8374,9 +8668,14 @@ msgstr "Protokola SILC ni mogoče inicializirati"
 msgid "Error loading SILC key pair"
 msgstr "Napaka pri nalaganju para ključev SILC"
 
+#, c-format
+msgid "Download %s: %s"
+msgstr "Prenesi %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Vaše trenutno razpoloženje"
 
+#, c-format
 msgid "Normal"
 msgstr "Navadno"
 
@@ -8754,33 +9053,43 @@ msgstr "Tabla"
 msgid "No server statistics available"
 msgstr "Statistika strežnika ni na voljo."
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna različica, nadgradite svojega odjemalca"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Napaka: Oddaljeni ne podpira vašega ključa ali mu ne zaupa"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Napaka: Oddaljeni ne podpira predlagane skupine KE"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Napaka: Oddaljeni ne podpira predlagane cifre"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega PKCS"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Napaka: Oddaljeni ne podpira predlagane razpršene možnosti"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega HMAC"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Napaka: Napačen podpis"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Napaka: Napačen piškot"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
@@ -8806,12 +9115,6 @@ msgstr "Neznan odgovor strežnika."
 msgid "Could not create listen socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-msgid "Couldn't resolve host"
-msgstr "Gostitelja ni mogoče razbrati"
-
-msgid "Could not resolve hostname"
-msgstr "Imena strežnika ni mogoče razločiti"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabniška imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -8880,6 +9183,7 @@ msgstr "%s trenutno ni prijavljen."
 msgid "Warning of %s not allowed."
 msgstr "Opozarjanje %s ni dovoljeno."
 
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
@@ -8900,30 +9204,39 @@ msgstr "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s.
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
 
+#, c-format
 msgid "Failure."
 msgstr "Neuspeh."
 
+#, c-format
 msgid "Too many matches."
 msgstr "Preveč zadetkov."
 
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Potrebujem več selekcije."
 
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Imeniška storitev je trenutno nedosegljiva."
 
+#, c-format
 msgid "Email lookup restricted."
 msgstr "Poizvedba po e-poštnem naslovu je omejena."
 
+#, c-format
 msgid "Keyword ignored."
 msgstr "Ključna beseda zanemarjena."
 
+#, c-format
 msgid "No keywords."
 msgstr "Brez ključnih besed."
 
+#, c-format
 msgid "User has no directory information."
 msgstr "Uporabnik nima imeniških informacij."
 
+#, c-format
 msgid "Country not supported."
 msgstr "Država ni podprta."
 
@@ -8931,15 +9244,19 @@ msgstr "Država ni podprta."
 msgid "Failure unknown: %s."
 msgstr "Neznan vzrok neuspeha: %s."
 
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Neveljavno uporabniško ime ali geslo."
 
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Storitev je trenutno nedostopna."
 
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
 
+#, c-format
 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."
@@ -9249,9 +9566,6 @@ msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s vam skuša poslati skupino %d datotek.\n"
 
-msgid "Write Error"
-msgstr "Napaka pri pisanju"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
@@ -9551,6 +9865,14 @@ msgstr "Napaka pri razločanju %s"
 msgid "Could not resolve host name"
 msgstr "Imena strežnika ni možno razločiti"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Zahtevanje pozornosti uporabnika %s ..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s želi vaše pozornosti!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9580,14 +9902,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "Zahtevanje pozornosti uporabnika %s ..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s želi vaše pozornosti!"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9602,6 +9916,20 @@ msgstr "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "Tipke za bližnjico"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Tipke za bližnjico smejčka"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Shranjena slika"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Shranjena slika."
+
 msgid "SSL Connection Failed"
 msgstr "Povezava SSL ni uspela"
 
@@ -9657,6 +9985,12 @@ msgstr "+++ %s je postal nedejaven"
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9764,21 +10098,30 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Povezavo je prekinil nek program vašega računalnika."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "Oddaljeni gostitelj je zaprl povezavo."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "Časovna omejitev povezave potekla."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "Povezava zavrnjena."
 
+#. 10048
+#, fuzzy, c-format
+msgid "Address already in use."
+msgstr "Ime za pomenek že obstaja"
+
 msgid "Internet Messenger"
 msgstr "Spletni sel"
 
@@ -9886,8 +10229,8 @@ msgstr "Dodaj račun"
 msgid "_Basic"
 msgstr "_Osnovno"
 
-msgid "Create this new account on the server"
-msgstr "Ta nov račun ustvarite na strežniku"
+msgid "Create _this new account on the server"
+msgstr "_Ustvari ta nov račun na strežniku"
 
 msgid "_Advanced"
 msgstr "N_apredno"
@@ -9988,6 +10331,12 @@ msgstr "Psevdo_nim ..."
 msgid "_Remove"
 msgstr "Odst_rani"
 
+msgid "Set Custom Icon"
+msgstr "Nastavi ikono po meri"
+
+msgid "Remove Custom Icon"
+msgstr "Odstrani ikono po meri"
+
 msgid "Add _Buddy..."
 msgstr "Dodaj _prijatelja ..."
 
@@ -10086,8 +10435,8 @@ msgstr "/Prijatelji/Iz_hod"
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-msgid "/Accounts/Manage"
-msgstr "/Računi/Upravljaj"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Računi/Upravljaj z računi"
 
 #. Tools
 msgid "/_Tools"
@@ -10108,6 +10457,9 @@ msgstr "/Orodja/_Nastavitve"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
+msgid "/Tools/Smile_y"
+msgstr "/Orodja/Smej_ček"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
@@ -10277,15 +10629,15 @@ 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Dobrodošli v %s!</span>\n"
 "\n"
 "Nimate aktiviranih računov. Vključite svoje račune za neposredno sporočanje "
-"(IM) prek okna <b>Računi</b> z ukazom <b>Računi->Dodaj/Uredi</b>. Ko račune "
-"omogočite, se boste lahko prijavili, nastavili svoje stanje in klepetali s "
-"svojimi prijatelji."
+"(IM) prek okna <b>Računi</b> z ukazom <b>Računi->Upravljaj z računi</b>. Ko "
+"račune omogočite, se boste lahko prijavili, nastavili svoje stanje in "
+"klepetali s svojimi prijatelji."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10345,6 +10697,12 @@ msgstr "_Skrij klepet, ko je okno zaprto."
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
+msgid "Enable Account"
+msgstr "Omogoči račun"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Računi/Omogoči račun"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Računi/"
 
@@ -10357,12 +10715,6 @@ msgstr "Na voljo ni nobenega ukaza"
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-msgid "Enable Account"
-msgstr "Omogoči račun"
-
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Računi/Omogoči račun"
-
 msgid "/Tools"
 msgstr "/Orodja"
 
@@ -10447,9 +10799,6 @@ msgstr "Nastavi ikono po meri ..."
 msgid "Change Size"
 msgstr "Spremeni velikost"
 
-msgid "Remove Custom Icon"
-msgstr "Odstrani ikono po meri"
-
 msgid "Show All"
 msgstr "Pokaži vse"
 
@@ -10718,12 +11067,13 @@ msgstr "Napaka"
 msgid "Fatal Error"
 msgstr "Usodna napaka"
 
-msgid "lead developer"
-msgstr "glavni razvijalec"
-
 msgid "developer"
 msgstr "razvijalec"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
 msgid "support"
 msgstr "podpora"
 
@@ -10755,6 +11105,9 @@ msgstr "Razvijalec XMPP"
 msgid "original author"
 msgstr "prvotni avtor"
 
+msgid "lead developer"
+msgstr "glavni razvijalec"
+
 msgid "Afrikaans"
 msgstr "afrikansko"
 
@@ -10890,6 +11243,9 @@ msgstr "nizozemsko, flamsko"
 msgid "Norwegian Nynorsk"
 msgstr "norveško (Nyorsk)"
 
+msgid "Occitan"
+msgstr "okcitansko"
+
 msgid "Punjabi"
 msgstr "pundžabsko"
 
@@ -10988,6 +11344,7 @@ msgstr ""
 "seznam avtorjev prispevkov.  Za program ni na voljo nikakršna garancija."
 "<BR><BR>"
 
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
@@ -11131,23 +11488,35 @@ msgstr "_Odstrani pomenek"
 msgid "Right-click for more unread messages...\n"
 msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
 
-msgid "Change Status"
-msgstr "Spremeni stanje"
+msgid "_Change Status"
+msgstr "Spre_meni stanje"
+
+msgid "Show Buddy _List"
+msgstr "Poka_ži seznam prijateljev"
+
+msgid "_Unread Messages"
+msgstr "_Neprebrana sporočila"
 
-msgid "Show Buddy List"
-msgstr "Pokaži seznam prijateljev"
+msgid "New _Message..."
+msgstr "Novo s_poročilo ..."
 
-msgid "New Message..."
-msgstr "Novo sporočilo ..."
+msgid "_Accounts"
+msgstr "_Računi"
 
-msgid "Mute Sounds"
-msgstr "Utišaj zvoke"
+msgid "Plu_gins"
+msgstr "Vti_čniki"
 
-msgid "Blink on New Message"
-msgstr "Utripaj ob novem sporočilu"
+msgid "Pr_eferences"
+msgstr "_Nastavitve"
 
-msgid "Quit"
-msgstr "Končaj"
+msgid "Mute _Sounds"
+msgstr "_Utišaj zvoke"
+
+msgid "_Blink on New Message"
+msgstr "_Utripaj ob novem sporočilu"
+
+msgid "_Quit"
+msgstr "I_zhod"
 
 msgid "Not started"
 msgstr "Ni zagnano"
@@ -11207,6 +11576,14 @@ msgstr "_Počisti dokončane prenose"
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
+#. Pause button
+msgid "_Pause"
+msgstr "_Premor"
+
+#. Resume button
+msgid "_Resume"
+msgstr "_Nadaljuj"
+
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
@@ -11253,6 +11630,12 @@ msgstr "Ime barve sporočila dejanja"
 msgid "Color to draw the name of an action message."
 msgstr "Barva izrisa imena na sporočilo dejanja."
 
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Ime barve sporočila dejanja za šepetano sporočilo"
+
+msgid "Whisper Message Name Color"
+msgstr "Barva imena šepetanega sporočila"
+
 msgid "Typing notification color"
 msgstr "Barva obvestila o tipkanju"
 
@@ -11318,9 +11701,14 @@ msgstr ""
 msgid "Save Image"
 msgstr "Shrani sliko"
 
+#, c-format
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Dodai smejčka po meri ..."
+
 msgid "Select Font"
 msgstr "Nastavi pisavo"
 
@@ -11357,9 +11745,21 @@ msgstr "Slike: %s ni mogoče shraniti.\n"
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Ta smejček je onemogočen, ker za to kombinacijo tipk obstaja smejček po "
+"meri:\n"
+" %s"
+
 msgid "Smile!"
 msgstr "Nasmeh!"
 
+msgid "_Manage custom smileys"
+msgstr "_Upravljaj s smejčki po meri"
+
 msgid "This theme has no available smileys."
 msgstr "Ta tema nima smeškov."
 
@@ -12030,21 +12430,27 @@ msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
+#, c-format
 msgid "Quietest"
 msgstr "najtišje"
 
+#, c-format
 msgid "Quieter"
 msgstr "tišje"
 
+#, c-format
 msgid "Quiet"
 msgstr "tiho"
 
+#, c-format
 msgid "Loud"
 msgstr "glasno"
 
+#, c-format
 msgid "Louder"
 msgstr "glasneje"
 
+#, c-format
 msgid "Loudest"
 msgstr "najglasneje"
 
@@ -12077,6 +12483,12 @@ msgstr "Glasnost:"
 msgid "Play"
 msgstr "Predvajaj"
 
+msgid "_Browse..."
+msgstr "Pre_brskaj ..."
+
+msgid "_Reset"
+msgstr "_Ponastavi"
+
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
@@ -12247,6 +12659,47 @@ msgstr "Shra_ni in uporabi"
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
+msgid "Custom Smiley"
+msgstr "Smejček po meri"
+
+msgid "Duplicate Shortcut"
+msgstr "Podvojena tipka za bližnjico"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Smejček po meri za izbrano kombinacijo tipk že obstaja. Navedite druge tipke "
+"za bližnjico."
+
+msgid "More Data needed"
+msgstr "Potrebnih je več podatkov"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Podajte tipke za bližnjico, ki bodo povezane s smejčkom."
+
+msgid "Please select an image for the smiley."
+msgstr "Izberite sliko smejčka."
+
+msgid "Edit Smiley"
+msgstr "Uredi smejčka"
+
+msgid "Add Smiley"
+msgstr "Dodaj smejčka"
+
+msgid "Smiley _Image"
+msgstr "Sli_ka smejčka"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "_Tipke za bližnjice smejčka"
+
+msgid "Smiley"
+msgstr "Smejček"
+
+msgid "Custom Smiley Manager"
+msgstr "Upravitelj smejčkov po meri"
+
 msgid "Waiting for network connection"
 msgstr "Čakanje na omrežno povezavo"
 
@@ -12385,9 +12838,6 @@ msgstr "_Spremeni"
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
-msgid "_Pause"
-msgstr "_Premor"
-
 msgid "Pidgin Tooltip"
 msgstr "Nasvet Pidgin"
 
@@ -12403,9 +12853,6 @@ msgstr "S to izbiro onemogočite grafične smejčke."
 msgid "none"
 msgstr "brez"
 
-msgid "Display Statistics"
-msgstr "Pokaži statistiko"
-
 msgid "Response Probability:"
 msgstr "Verjetnost odgovora:"
 
@@ -12978,6 +13425,7 @@ msgstr "Pogovorno okno obvestila"
 msgid "Select Color"
 msgstr "Nastavite barvo"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "Nastavite pisavo vmesnika"
 
@@ -13204,6 +13652,7 @@ msgstr "Pokaži čase nastanka vsakih N minut v slogu iChata."
 msgid "Timestamp Format Options"
 msgstr "Možnosti zapisa časovnega žiga"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Vsili 24-urni časovni zapis"
 
@@ -13376,15 +13825,55 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
-#~ msgid "_Resume"
-#~ msgstr "_Nadaljuj"
+#~ msgid "Error setting socket options"
+#~ msgstr "Napaka pri nastavljanju možnosti vtičnice"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Overjanje Windows Live ID: Žetona overovitve v odzivu strežnika ni mogoče "
+#~ "najti"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Overovitev Windows Live ID ni uspela"
+
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Koda [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Napaka skupinske operacije"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Napaka pri zahtevanju prijavnega žetona"
+
+#~ msgid "TCP Address"
+#~ msgstr "Naslov TCP"
+
+#~ msgid "UDP Address"
+#~ msgstr "Naslov UDP"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "Preveč zloben (pošiljatelj)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Preveč zloben (prejemnik)"
+
+#~ msgid "Available Message"
+#~ msgstr "Sporočilo o dosegljivosti"
+
+#~ msgid "Away Message"
+#~ msgstr "Sporočilo o odsotnosti"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr "<i>(pridobivanje ...)</i>"
+
+#~ msgid "Display Statistics"
+#~ msgstr "Pokaži statistiko"
 
 #~ msgid "Screen name:"
 #~ msgstr "Zaslonsko ime:"
 
-#~ msgid "Screen Name"
-#~ msgstr "Ime"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Nekdo omeni vaše pojavno ime v sobi"
 
diff --git a/po/sq.po b/po/sq.po
index b7e0ff2192..e4f2cb8ec5 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,38 +1,36 @@
-# translation of gaim.po to Albanian
+# Pidgin Albanian Translation
+# translation of pidgin.po into Albanian
+# Copyright (C) 2004-2008, Besnik Bleta <besnik@programeshqip.org>
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Besnik Bleta <besnik@programeshqip.org>, 2004, 2005.
+# Besnik Bleta <besnik@programeshqip.org>, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim_sq\n"
+"Project-Id-Version: 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2006-10-29 14:30+0200\n"
-"Last-Translator: Besnik Bleta <besnik@programeshqip>\n"
+"POT-Creation-Date: 2008-08-15 11:34-0400\n"
+"PO-Revision-Date: 2008-08-10 14:42+0200\n"
+"Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.0.2\n"
+"X-Generator: Poedit 1.3.6\n"
 "X-Poedit-Language: Albanian\n"
 "X-Poedit-Country: ALBANIA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
-#, fuzzy
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
 msgid "Finch"
-msgstr "Frënge"
+msgstr "Finch"
 
 #  short message
-#: ../finch/finch.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Për më tepër të dhëna provoni `%s -h'.\n"
+msgstr "%s. Për më tepër të dhëna provoni `%s -h'.\n"
 
-#: ../finch/finch.c:208
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -43,745 +41,464 @@ msgid ""
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Gaim %s\n"
+"%s\n"
 "Përdorimi: %s [MUNDËSI]...\n"
 "\n"
 "  -c, --config=DIR    përdor DIR për kartela formësimi\n"
 "  -d, --debug         shtyp mesazhe diagnostikimi te stdout\n"
 "  -h, --help          shfaq këtë ndihmë dhe dil\n"
 "  -n, --nologin       mos u fut vetvetiu\n"
-"  -l, --login[=EMËR]  futu vetvetiu (argumenti opsional EMËR përcakton\n"
-"                      llogarinë(të) që duhet përdorur, ndarë me presje)\n"
 "  -v, --version       shfaq versionin e çastit dhe dil\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, 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 hasi në gabime gjatë migrimit të rregullimeve tuaja prej %s te %s. Ju "
+"lutem hetojeni problemin dhe plotësoni migrimin dorazi. Ju lutem raportojeni "
+"këtë gabim te http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Gabim"
 
-#: ../finch/gntaccount.c:124
-#, fuzzy
 msgid "Account was not added"
-msgstr "Llogaria është çaktivizuar"
+msgstr "Nuk u shtua llogaria"
 
-#: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
-msgstr ""
+msgid "Username of an account must be non-empty."
+msgstr "Emri i përdoruesit për një llogari nuk mund të jetë bosh."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Njoftime poste të re"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Mbaj mend fjalëkalim"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
-msgstr ""
+msgstr "Nuk ka shtojca protokolli të instaluara."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "(Ka të ngjarë harruat të bënit 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "Ndrysho Llogari"
 
-#: ../finch/gntaccount.c:496
-#, fuzzy
 msgid "New Account"
-msgstr "Llogari"
+msgstr "Llogari e Re"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
-#, fuzzy
-msgid "Screen name:"
-msgstr "Emër në ekran:"
+msgid "Username:"
+msgstr "Emër përdoruesi:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Fjalëkalim:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Krijoje këtë llogari te shërbyesi"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../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:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
 msgstr "Anulo"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Ruaj"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "jeni të sigurtë se doni të fshini %s?"
 
-#: ../finch/gntaccount.c:635
-#, fuzzy
 msgid "Delete Account"
-msgstr "Llogari"
+msgstr "Fshi Llogari"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr "Fshij"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Llogari"
 
-#: ../finch/gntaccount.c:675
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "Po prisni autorizim prej shokëve vijues"
+msgstr "Mund të aktivizoni/çaktivizoni llogarira prej listës vijuese."
 
 #  Add button
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Shto"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
-#, fuzzy
 msgid "Modify"
-msgstr "_Ndrysho"
+msgstr "Ndrysho"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s ka bërë %s shok apo shoqe të vetën%s%s%s"
+msgstr "%s%s%s%s ka bërë %s shok apo shoqe të vetën%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Të shtoj shok te lista juaj?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "Përdoruesi %s dëshiron të shtojë %s te lista e tij/saj e shokëve%s%s."
+msgstr "%s%s%s%s don të shtojë %s te listë e tij ose e saj shokësh%s%s"
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
-#, fuzzy
 msgid "Authorize buddy?"
-msgstr "Autorizo"
+msgstr "Të autorizoj shok?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autorizo"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Moho"
 
-#: ../finch/gntblist.c:289
-msgid "You must provide a screename for the buddy."
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
 msgstr ""
+"Online: %d\n"
+"Gjithsej: %d"
 
-#: ../finch/gntblist.c:291
-msgid "You must provide a group."
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Llogari: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
 msgstr ""
+"\n"
+"Parë Së fundmi: %s më parë"
+
+msgid "Default"
+msgstr "Parazgjedhje"
+
+msgid "You must provide a username for the buddy."
+msgstr "Duhet të jepni një emër përdoruesi për shokun."
+
+msgid "You must provide a group."
+msgstr "Lypset të jepni një grup."
 
-#: ../finch/gntblist.c:293
-#, fuzzy
 msgid "You must select an account."
-msgstr "Duhet të përcaktoni nofkë"
+msgstr "Lypset të përzgjidhni një llogari."
 
-#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
-msgstr ""
+msgstr "Llogaria e përzgjedhur nuk është \"online\""
 
-#: ../finch/gntblist.c:300
-#, fuzzy
 msgid "Error adding buddy"
-msgstr "Gabim në Leximin e %s"
+msgstr "Gabim në shtim shoku"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
-msgid "Screen Name"
-msgstr "Emër në Ekran"
-
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
-msgid "Alias"
-msgstr "Alias"
+msgid "Username"
+msgstr "Emër përdoruesi"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-#, fuzzy
-msgid "Group"
-msgstr "Grup:"
+msgid "Alias (optional)"
+msgstr "Alias (opsional)"
+
+msgid "Add in group"
+msgstr "Shto në grup"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Llogari"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Shto Shok"
 
-#: ../finch/gntblist.c:341
-#, fuzzy
 msgid "Please enter buddy information."
-msgstr "Ju lutem jepni një shok për ta cytur."
+msgstr "Ju lutem jepni të dhëna shoku."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "Fjalosje"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Emër"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
-#, fuzzy
+msgid "Alias"
+msgstr "Alias"
+
+msgid "Group"
+msgstr "Grup"
+
 msgid "Auto-join"
 msgstr "Vetë-bashkoju"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr "Shto Fjalosje"
 
-#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr ""
+"Nga menuja e kontekstit mund të përpunoni më të tepër të dhëna më vonë "
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
-#, fuzzy
 msgid "Error adding group"
-msgstr "Gabim në Leximin e %s"
+msgstr "Gabim në shtim grupi"
 
-#: ../finch/gntblist.c:434
-#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "Ju lutem jepni emrin e grupit që duhet shtuar."
+msgstr "Lypset t'i jepni një emër grupit që duhet shtuar."
 
-#: ../finch/gntblist.c:447
-#, fuzzy
 msgid "A group with the name already exists."
-msgstr "Ka tashmë një dosje me këtë emër"
+msgstr "Ka tashmë një grup me këtë emër."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr "Shto Grup"
 
-#: ../finch/gntblist.c:454
-#, fuzzy
 msgid "Enter the name of the group"
-msgstr "Ju lutem jepni emrin e grupit që duhet shtuar."
+msgstr "Jepni emrin e grupit"
 
-#: ../finch/gntblist.c:802
-#, fuzzy
 msgid "Edit Chat"
-msgstr "Shto Fjalosje"
+msgstr "Përpunoni Fjalosjeje"
 
-#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
-msgstr ""
+msgstr "Ju lutem përditësoni fushat e nevojshme."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
-msgstr ""
+msgstr "Përpunoni"
 
-#: ../finch/gntblist.c:828
-#, fuzzy
 msgid "Edit Settings"
-msgstr "Rregullime për Stealth"
+msgstr "Përpunoni Rregullime"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-#, fuzzy
 msgid "Information"
-msgstr "Të dhëna Pune"
+msgstr "Të dhëna"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-#, fuzzy
 msgid "Retrieving..."
-msgstr "Përdoruesi po shkruan..."
+msgstr "Po merret..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Ki të Dhëna"
 
-#: ../finch/gntblist.c:908
-#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "Shto _Cytje Shoku"
+msgstr "Shto Cytje Shoku"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "Dërgo Kartelë"
 
-#: ../finch/gntblist.c:919
-#, fuzzy
+#  Block button
+msgid "Blocked"
+msgstr "Bllokuar"
+
 msgid "View Log"
-msgstr "Shih _Regjistrim"
+msgstr "Shihni Regjistrim"
 
-#: ../finch/gntblist.c:1000
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "Ju lutem jepni fjalëkalimin tuaj të ri"
+msgstr "Ju lutem jepni emër të ri për %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
-#, fuzzy
 msgid "Rename"
-msgstr "_Riemërto"
+msgstr "Riemërto"
 
-#: ../finch/gntblist.c:1002
-#, fuzzy
 msgid "Set Alias"
-msgstr "Alias"
+msgstr "Caktoni Alias"
 
-#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "Jepni varg bosh për ricaktim të emrit."
 
-#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "Heqja e këtij kontakti do të heqë gjithashtu tërë shokët te kontakti"
 
-#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
+msgstr "Heqja e këtij grupi do të heqë gjithashtu tërë shokët te grupi"
 
-#: ../finch/gntblist.c:1092
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "jeni të sigurtë se doni të fshini %s?"
+msgstr "Jeni i sigurt se doni të hiqet %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "Ripohoni mbylljen"
+msgstr "Ripohoni Heqjen"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Hiq"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Listë Shokësh"
 
-#: ../finch/gntblist.c:1257
 msgid "Place tagged"
-msgstr ""
+msgstr "Vendi u etiketua"
 
-#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
-msgstr ""
+msgstr "Këmbeni Etiketën"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr "Nofkë"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "I plogësht"
 
-#: ../finch/gntblist.c:1334
-#, fuzzy
 msgid "On Mobile"
-msgstr "Dërgoje te Celular"
-
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-
-#: ../finch/gntblist.c:1424
-#, fuzzy, c-format
-msgid "Account: %s (%s)"
-msgstr "%s në %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"<b>Parë Së fundi:</b> %s më parë"
+msgstr "Në Telefon Celular"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
-#, fuzzy
 msgid "New..."
-msgstr "Parje..."
+msgstr "I ri..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "U ruajt..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
-#, fuzzy
 msgid "Plugins"
-msgstr "/Mjete/Shtojca"
+msgstr "Shtojca"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Emër"
+#  Block button
+msgid "Block/Unblock"
+msgstr "Blloko/Zhblloko"
 
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Llogari"
+#  Block button
+msgid "Block"
+msgstr "Blloko"
 
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
-msgid "New Instant Message"
-msgstr "Mesazh i Ri i Atypëratyshëm"
+#  Block button
+msgid "Unblock"
+msgstr "Zhblloko"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
 msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
 msgstr ""
-"Ju lutem jepni emër ekrani ose alias të personit që do të donit për IM."
+"Ju lutem jepni emër përdoruesi ose alias të personit që do të donit të "
+"Bllokohet/Zhbllokohet."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
+msgid "New Instant Message"
+msgstr "Mesazh i Ri i Atypëratyshëm"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+"Ju lutem jepni emër përdoruesi ose alias të personit që do të donit për MA."
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Join a Chat"
+msgstr "Bashkoju një Fjalosjeje"
+
+msgid "Please enter the name of the chat you want to join."
+msgstr "Ju lutem jepni emrin e fjalosjes ku doni të futteni."
+
+#  join button
+msgid "Join"
+msgstr "Bashkojuni"
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Ju lutem jepni emër përdoruesi ose alias të personit regjistrimet e të cilit "
+"do të donit të shihnit."
+
 #  Options
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
-#, fuzzy
 msgid "Options"
-msgstr "/_Mundësi"
+msgstr "Mundësi"
 
-#: ../finch/gntblist.c:2247
-#, fuzzy
 msgid "Send IM..."
-msgstr "U ruajt..."
+msgstr "Dërgo MA..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Sipas grupesh"
+#  Block button
+msgid "Block/Unblock..."
+msgstr "Blloko/Zhblloko"
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
+msgid "Join Chat..."
+msgstr "Bashkoju një Fjalosjeje..."
 
-#: ../finch/gntblist.c:2263
-#, fuzzy
-msgid "Sort by status"
-msgstr "Gjendje"
+msgid "View Log..."
+msgstr "Shih Regjistrim..."
 
-#: ../finch/gntblist.c:2267
-#, fuzzy
-msgid "Sort alphabetically"
+msgid "View All Logs"
+msgstr "Shihni Tërë Regjistrimet"
+
+msgid "Show"
+msgstr "Shfaq"
+
+msgid "Empty groups"
+msgstr "Grupe bosh"
+
+msgid "Offline buddies"
+msgstr "Shokë jo të lidhur"
+
+msgid "Sort"
+msgstr "Rendit"
+
+msgid "By Status"
+msgstr "Sipas Gjendjeje"
+
+msgid "Alphabetically"
 msgstr "Sipas abc-së"
 
-#: ../finch/gntblist.c:2271
-#, fuzzy
-msgid "Sort by log size"
-msgstr "Sipas madhësie regjistrimi"
+msgid "By Log Size"
+msgstr "Sipas Madhësie Regjistrimi"
+
+msgid "Buddy"
+msgstr "Shok"
+
+msgid "Chat"
+msgstr "Fjalosje"
+
+msgid "Grouping"
+msgstr "Grupim"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "Portë lidhjeje"
+msgstr "Import Dëshmish"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Tregoni një emërstrehë"
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Shtypni emrin e strehës për të cilën është dëshmia."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Kartela %s nuk u importua dot.\n"
+"Sigurohuni që kartela është e lexueshme dhe në formatin PEM.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Gabim Importimi Dëshmie"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "Importimi i dëshmisë X.509 dështoi"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Përzgjidhni një kartelë"
+msgstr "Përzgjidhni një dëshmi PEM"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Eksportimi te kartela %s dështoi.\n"
+"Kontrolloni në keni leje shkrimi te shtegu i synuar\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Gabim Eksportimi Dëshmie"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Eksportimi i dëshmisë X.509 dështoi X."
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "Eksport Dëshmie PEM X.509"
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
-msgstr ""
+msgstr "Dëshmi për %s"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -789,191 +506,171 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Emër i zakonshëm: %s\n"
+"\n"
+"Shenjë gishtash SHA1:\n"
+"%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "Dëshmi strehe SSL"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Ta fshij vërtet dëshminë për %s?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Ripohoni fshirje dëshmie"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Përgjegjës Dëshmish"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-#, fuzzy
 msgid "Hostname"
-msgstr "Emër strehe"
+msgstr "Emërstrehë"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Të dhëna"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Mbyll"
 
-#: ../finch/gntconn.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s)"
-msgstr "%s në %s (%s)"
+msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "%s disconnected."
-msgstr "%s u shkëput"
+msgstr "%s u shkëput."
 
-#: ../finch/gntconn.c:128
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-"%s u shkëput për shkak të një gabimi. %s Llogaria është çaktivizuar. ndreqni "
-"gabimin dhe riaktivizoni llogarinë për t´u lidhur."
+"%s\n"
+"\n"
+"Finch-i nuk do të provojë të rilidhë llogarinë përpara se të ndreqni gabimin "
+"dhe riaktivizoni llogarinë."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
-#, fuzzy
 msgid "Re-enable Account"
-msgstr "Regjistro Llogari të Re Jabber"
+msgstr "Riaktivizo Llogarinë"
+
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"Llogaria është shkëputur dhe nuk gjendeni më në fjalosje. Do të futeni "
+"vetvetiu në fjalosje kur të rilidhet llogaria."
 
-#: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "S'ka të tillë urdhër."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Gabim Sintakse:  Shtypët numër të gabuar argumentesh te ky urdhër."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 msgid "Your command failed for an unknown reason."
 msgstr "Urdhri juaj dështoi për një arsye të panjohur."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
-msgstr "Ai urdhër punon vetëm në fjalosje, jo në IM."
+msgstr "Ai urdhër punon vetëm në fjalosje, jo në MA."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
-msgstr "Ai urdhër punon vetëm në IM, jo në fjalosje."
+msgstr "Ai urdhër punon vetëm në MA, jo në fjalosje."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "Ai urdhër nuk punon nën këtë protokoll."
 
-#: ../finch/gntconv.c:168
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "Mesazhi nuk u dërgua dot ngaqë përdoruesi është i palidhur:"
+msgstr "Mesazhi nuk u dërgua dot, ngaqë nuk keni nënshkruar për hyrje."
 
-#: ../finch/gntconv.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s -- %s)"
-msgstr "%s në %s (%s)"
+msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
-msgstr ""
+msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr "Përdoruesi po shkruan..."
+msgstr ""
+"\n"
+"%s po shkruan..."
 
-#: ../finch/gntconv.c:298
-#, fuzzy
 msgid "You have left this chat."
-msgstr "Flisni në fjalosje"
+msgstr "Dolët prej kësaj fjalosje."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Regjistrimi nisi. Mesazhet e ardhshëm në këtë bashkëbisedim do të "
 "regjistrohen."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Regjistrimi u ndal. Mesazhet e ardhshëm në këtë bashkëbisedim nuk do të "
 "regjistrohen."
 
-#: ../finch/gntconv.c:442
-#, fuzzy
 msgid "Send To"
-msgstr "_Dërgo Te"
+msgstr "Dërgoje Te"
+
+msgid "Invite message"
+msgstr "Mesazh ftese"
+
+#  Invite
+msgid "Invite"
+msgstr "Fto"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Ju lutem jepni emrin e përdoruesit që doni të ftoni,\n"
+"bashkë me një mesazh ftese në daçi."
 
 #  Conversations
-#: ../finch/gntconv.c:486
-#, fuzzy
 msgid "Conversation"
-msgstr "bashkëbisedime"
+msgstr "Bashkëbisedim"
 
-#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
-#, fuzzy
 msgid "Show Timestamps"
-msgstr "Vula Kohore"
+msgstr "Shfaq Vula kohore"
 
-#: ../finch/gntconv.c:512
-#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "Shto _Cytje Shoku"
+msgstr "Shtoni Cytje Shoku..."
+
+#  Invite
+msgid "Invite..."
+msgstr "Fto..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
 msgid "Enable Logging"
-msgstr "/Mundësi/Aktivizo Hyrje"
+msgstr "Aktivizo Regjistrim"
 
-#: ../finch/gntconv.c:533
-#, fuzzy
 msgid "Enable Sounds"
-msgstr "/Mundësi/Aktivizo Tinguj"
+msgstr "Aktivizo Tinguj"
 
-#: ../finch/gntconv.c:739
-#, fuzzy
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <VETË-PËRGJIGJU>: %s\n"
+msgstr "<VETËPËRGJIGJU>"
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:861
-msgid "List of users:\n"
-msgstr ""
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Listë e %d përdoruesi:\n"
+msgstr[1] "Listë e %d përdoruesash:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "Versione të mbuluar diagnostikimi janë: version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "Pa urdhër të tillë (në këtë kontekst)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -981,7 +678,20 @@ msgstr ""
 "Përdorni \"/help &lt;command&gt;\" për ndihmë mbi një urdhër të caktuar.\n"
 "Në këtë frymë, janë të mundshëm urdhërat vijues:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s nuk është klasë e vlefshme mesazhesh. Shihni '/help msgcolor' rreth "
+"klasash të vlefshme mesazhesh."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s nuk është njgjyrë e vlefshme. Shihni '/help msgcolor' rreth ngjyrash të "
+"vlefshme."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -989,13 +699,11 @@ msgstr ""
 "thoni &lt;mesazh&gt;:  Dërgoni një mesazh normalisht si të mos ishit duke "
 "përdorur një urdhër."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;veprim&gt;:  Dërgoji një shoku a një fjalosjeje një veprim në stil "
 "IRC."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1003,43 +711,49 @@ msgstr ""
 "debug &lt;mundësi&gt;:  Dërgo te bashkëbisedimi i çastit të dhëna të "
 "ndryshme diagnostikimi."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Pastron rreshtat e bashkëbisedimit."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;urdhër&gt;:  Ndihmë rreth një urdhri të caktuar."
 
-#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "users: Shfaq listën e përdoruesve në fjalosje."
 
-#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
-msgstr ""
+msgstr "plugins: Shfaq dritare shtojcash."
 
-#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
-msgstr ""
+msgstr "buddylist: Shfaq listën e shokëve."
 
-#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
-msgstr ""
+msgstr "accounts: Shfaq dritare llogarish."
 
-#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debugwin: Shfaq dritarene diagnostikimeve."
 
-#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "prefs: Shfaq dritare parapëlqimesh."
 
-#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Shfaq dritaren e gjendjeve të ruajtura."
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Cakton ngjyrën "
+"për klasa të ndryshme mesazhesh te dritarja e bashkëbisedimeve.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>SHEMBULL:<br>    msgcolor send cyan default"
+
+msgid "Unable to open file."
+msgstr "I pazoti të hap kartelë."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Dritare Diagnostikimesh"
 
@@ -1047,203 +761,194 @@ msgstr "Dritare Diagnostikimesh"
 #. * 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:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Pastro"
 
-#: ../finch/gntdebug.c:262
-#, fuzzy
-msgid "Filter: "
-msgstr "Filtër"
+msgid "Filter:"
+msgstr "Filtër:"
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Pushim"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
-#, fuzzy, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Shpërngulja e kartelës drejt %s dështoi."
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Shpërngulje Kartelash - %d%% e %d kartele"
+msgstr[1] "Shpërngulje Kartelash - %d%% e %d kartelave"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Shpërngulje Kartelash"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr " Përparim"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Emër kartele"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Madhësi"
 
-#: ../finch/gntft.c:201
-#, fuzzy
 msgid "Speed"
-msgstr "Shpejtësi:"
+msgstr "Shpejtësi"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Mbetur"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Gjendje"
 
-#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
-msgstr ""
+msgstr "Mbylle këtë dritare kur të përfundojnë tërë shpërnguljet"
 
-#: ../finch/gntft.c:218
-#, fuzzy
 msgid "Clear finished transfers"
-msgstr "_Pastro shpërngulje të përfunduara"
+msgstr "Pastro shpërngulje të përfunduara"
 
-#: ../finch/gntft.c:232
-#, fuzzy
 msgid "Stop"
-msgstr "Hiptop"
+msgstr "Ndal"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
-msgstr "Po pres të fillojë shpërngulja"
+msgstr "Po pritet të fillojë shpërngulja"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Anuluar"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Dështova"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "Dërguar"
+
+msgid "Received"
+msgstr "Marrë"
+
+msgid "Finished"
+msgstr "Përfunduar"
 
-#: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
+msgstr "Kartela u ruajt si %s."
+
+msgid "Sending"
+msgstr "Po dërgohet"
+
+msgid "Receiving"
+msgstr "Po merret"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Bashkëbisedim në %s te %s"
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Bashkëbisedim me %s te %s"
+
+msgid "%B %Y"
+msgstr "%B %Y"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
 msgstr ""
+"Ngjarje sistemi do të regjistrohen vetëm nëse është i aktivizuar parapëlqimi "
+"\"Regjistro tërë ndryshimet e gjendjes te regjistri i sistemit\"."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
-msgid "Finished"
-msgstr "Përfunduar"
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"mesazhe të atypëratyshëm do të regjistrohen vetëm nëse është i aktivizuar "
+"parapëlqimi \"Regjistro tërë mesazhet e atypëratyshëm\"."
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
-msgid "Transferring"
-msgstr "Po shpërngul"
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Fjalosjet do të regjistrohen vetëm nëse është veprues parapëlqimi "
+"\"Regjistro tërë fjalosjet\"."
+
+msgid "No logs were found"
+msgstr "Nuk u gjetën regjistrime"
+
+msgid "Total log size:"
+msgstr "Madhësi tërësore regjistrimi:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "Parakaloji/Kërko:"
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "Bashkëbisedime në %s"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "Bashkëbisedime me %s"
+
+#  Conversations
+msgid "All Conversations"
+msgstr "Tërë Bashkëbisedimet"
+
+#  Window **********
+msgid "System Log"
+msgstr "Regjistrim Sistemi"
 
-#: ../finch/gntnotify.c:165
-#, fuzzy
 msgid "Emails"
-msgstr "Email"
+msgstr "Email-e"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
-msgstr ""
+msgstr "Ju ka ardhur postë!"
 
 #  Gender
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
-#, fuzzy
 msgid "Sender"
-msgstr "Gjini"
+msgstr "Dërgues"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
-msgstr ""
+msgstr "Subjekt"
 
-#: ../finch/gntnotify.c:201
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s ka %d mesazh të ri."
-msgstr[1] "%s ka %d mesazhe të rinj."
+msgstr[0] "%s (%s) ka %d mesazh të ri."
+msgstr[1] "%s (%s) ka %d mesazhe të rinj."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
-#, fuzzy
 msgid "New Mail"
-msgstr "Email"
+msgstr "Postë e Re"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "Të dhëna për %s"
 
 #  res[0] == username
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "Të dhëna Shoku"
 
 #  connect to the server
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
-#, fuzzy
 msgid "Continue"
-msgstr "Po lidhem"
+msgstr "Vazhdo"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
-msgstr "IM"
-
-#  join button
-#: ../finch/gntnotify.c:389
-#, fuzzy
-msgid "Join"
-msgstr "_Bashkojuni"
-
-#  Invite
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
-#, fuzzy
-msgid "Invite"
-msgstr "_Ftoni"
+msgstr "MA"
 
-#: ../finch/gntnotify.c:395
-#, fuzzy
 msgid "(none)"
-msgstr "(pa emër)"
+msgstr "(asnjë)"
+
+msgid "URI"
+msgstr "URI"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
 msgid "ERROR"
-msgstr ""
+msgstr "GABIM"
 
-#: ../finch/gntplugin.c:75
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "Pingu dështoi"
+msgstr "ngarkimi i shtojcës dështoi"
 
-#: ../finch/gntplugin.c:84
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "çngarkimi i shtojcës dështoi"
 
-#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1253,519 +958,399 @@ msgid ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
+"Emër: %s\n"
+"Version: %s\n"
+"Përshkrim: %s\n"
+"Autor: %s\n"
+"Website: %s\n"
+"Emër kartele: %s\n"
 
-#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "Shtojca lypset të jetë e ngarkuar përpara se ta formësoni."
 
-#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
+msgstr "Nuk ka mundësi formësimi për këtë shtojcë."
+
+#  *< name
+#  *< version
+#  *< summary
+msgid "Error loading plugin"
+msgstr "Gabim në ngarkimin e shtojcës"
+
+msgid "The selected file is not a valid plugin."
+msgstr "Kartela e përzgjedhur nuk është shtojcë e vlefshme."
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
 msgstr ""
+"Ju lutem hapni dritaren e diagnostikimeve dhe provoni sërish të shihni "
+"mesazhin e saktë për gabimin."
+
+msgid "Select plugin to install"
+msgstr "Përzgjidhni një shtojcë për ta instaluar"
 
-#: ../finch/gntplugin.c:260
-#, fuzzy
 msgid "You can (un)load plugins from the following list."
-msgstr "Po prisni autorizim prej shokëve vijues"
+msgstr "Mund të (ç)ngarkoni shtojca prej listës vijuese."
+
+msgid "Install Plugin..."
+msgstr "Instalo Shtojcë..."
 
-#: ../finch/gntplugin.c:315
-#, fuzzy
 msgid "Configure Plugin"
-msgstr "Formëso Dhomë"
+msgstr "Formësoni Shtojcën"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Parapëlqime"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Ju lutem jepni një shok për ta cytur."
 
 #  "New Buddy Pounce"
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "Cytje e Re Shoku"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "Përpunoni Cytje Shoku"
 
 #  Create the "Pounce Who" frame.
-#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "Kë Të Cys"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Llogari:"
 
-#: ../finch/gntpounce.c:358
-#, fuzzy
 msgid "Buddy name:"
-msgstr "Emër _shoku:"
+msgstr "Emër shoku:"
 
 #  Create the "Pounce When" frame.
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
-#, fuzzy
 msgid "Pounce When Buddy..."
-msgstr "Kur Ta Cys"
+msgstr "Cyt Kur Shoku..."
 
-#: ../finch/gntpounce.c:376
-#, fuzzy
 msgid "Signs on"
-msgstr "Nënshkruani"
+msgstr "Nënshkruan"
 
-#: ../finch/gntpounce.c:377
-#, fuzzy
 msgid "Signs off"
-msgstr "_Çnënshkruani"
+msgstr "Çnënshkruan"
 
-#: ../finch/gntpounce.c:378
-#, fuzzy
 msgid "Goes away"
-msgstr "Gjatë largimesh"
+msgstr "Largohet"
 
-#: ../finch/gntpounce.c:379
-#, fuzzy
 msgid "Returns from away"
-msgstr "_Kthehet prej largimi"
+msgstr "Kthehet prej largimi"
 
-#: ../finch/gntpounce.c:380
-#, fuzzy
 msgid "Becomes idle"
-msgstr "%s u plogështua"
+msgstr "Plogështohet"
 
-#: ../finch/gntpounce.c:381
-#, fuzzy
 msgid "Is no longer idle"
-msgstr "%s nuk është më i plogësht."
+msgstr "Nuk është më i plogësht"
 
-#: ../finch/gntpounce.c:382
-#, fuzzy
 msgid "Starts typing"
-msgstr "Shoku fillon të sh_typë"
+msgstr "Zë e shtyp"
 
-#: ../finch/gntpounce.c:383
-#, fuzzy
 msgid "Pauses while typing"
-msgstr "Përdoruesi po shkruan..."
+msgstr "Pushon ndërkohë që po shtypte"
 
-#: ../finch/gntpounce.c:384
-#, fuzzy
 msgid "Stops typing"
-msgstr "Shoku mbaron së sht_ypuri"
+msgstr "Resht së shtypuri"
 
-#: ../finch/gntpounce.c:385
-#, fuzzy
 msgid "Sends a message"
-msgstr "Dërgo një mesa_zh"
+msgstr "Dërgon mesazh"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
-#, fuzzy
 msgid "Action"
-msgstr "Vendndodhje"
+msgstr "Veprim"
 
-#: ../finch/gntpounce.c:416
-#, fuzzy
 msgid "Open an IM window"
-msgstr "H_ap dritare IM"
+msgstr "Hap një dritare MA"
 
-#: ../finch/gntpounce.c:417
-#, fuzzy
 msgid "Pop up a notification"
-msgstr "_Hap njoftim"
+msgstr "Shfaq një njoftim"
 
-#: ../finch/gntpounce.c:418
-#, fuzzy
 msgid "Send a message"
-msgstr "Dërgo një mesa_zh"
+msgstr "Dërgo mesazh"
 
-#: ../finch/gntpounce.c:419
-#, fuzzy
 msgid "Execute a command"
-msgstr "Përmb_ush një urdhër"
+msgstr "Përmbush urdhër"
 
-#: ../finch/gntpounce.c:420
-#, fuzzy
 msgid "Play a sound"
-msgstr "_Luaj një tingull"
+msgstr "Luaj një tingull"
 
-#: ../finch/gntpounce.c:448
-msgid "Pounce only when my status is not available"
-msgstr ""
+msgid "Pounce only when my status is not Available"
+msgstr "Cyt vetëm kur gjendja ime nuk është e Passhme"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
-msgstr ""
+msgstr "E ripërsëritshme"
 
-#: ../finch/gntpounce.c:618
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "S'ndryshoj dot nofkë"
+msgstr "Nuk krijohet dot cytje"
 
-#: ../finch/gntpounce.c:619
 msgid "You do not have any accounts."
-msgstr ""
+msgstr "Nuk keni ndonjë llogari."
 
-#: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Duhet të krijoni një llogari përpara se të mund të krijonit një cytje."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "jeni të sigurtë se doni të fshini %s?"
+msgstr "Jeni i sigurtë se doni të fshini cytjen te %s për %s?"
 
 #  "New Buddy Pounce"
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
-#, fuzzy
 msgid "Buddy Pounces"
-msgstr "Cytje e Re Shoku"
+msgstr "Cytje Shokësh"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ka filluar të shtypë për ju (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
-#, fuzzy, c-format
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s ka filluar të shtypë për ju (%s)"
+msgstr "%s reshti ndërkohë që po shtypte për ju (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s ka nënshkruar (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s është kthyer prej plogështie (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s është kthyer nga largimi (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ka reshtur së shkruajturi për ju (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s ka çnënshkruar (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s është plogështuar (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s është larguar. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
-#, fuzzy, c-format
+#, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s don t'ju dërgojë %s (%s)"
+msgstr "%s ju ka dërguar një mesazh. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Akt i panjohur cytjeje. Ju lutem njoftojeni këtë!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
-msgstr ""
+msgstr "Bazuar në përdorim tastiere"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
-#, fuzzy
 msgid "From last sent message"
-msgstr "Regjistro tërë mesazhet e _atypëratyshëm"
+msgstr "Prej mesazhit të dërguar së fundmi"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Kurrë"
 
-#: ../finch/gntprefs.c:184
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "Caktoni Kohë Plogështie Llogarie"
+msgstr "Shfaq Kohë Plogështie"
 
-#: ../finch/gntprefs.c:185
-#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
+msgstr "Shfaq Shokë Jo të lidhur"
 
-#: ../finch/gntprefs.c:192
-#, fuzzy
 msgid "Notify buddies when you are typing"
-msgstr "_Njofto shokë që po shtypni për ta"
+msgstr "Njofto shokë kur shtypni"
 
-#: ../finch/gntprefs.c:198
-#, fuzzy
 msgid "Log format"
-msgstr "_Format Regjistrimi:"
+msgstr "Format regjistrimi"
 
-#: ../finch/gntprefs.c:199
 msgid "Log IMs"
-msgstr ""
+msgstr "Regjistro MA"
 
-#: ../finch/gntprefs.c:200
-#, fuzzy
 msgid "Log chats"
-msgstr "Regjistro tërë _fjalosjet"
+msgstr "Regjistro fjalosje"
 
-#: ../finch/gntprefs.c:201
-#, fuzzy
 msgid "Log status change events"
-msgstr "Regjistro tërë ndryshime _gjendjeje te regjistri i sistemit"
+msgstr "Regjistro ndryshime gjendjesh"
 
-#: ../finch/gntprefs.c:207
-#, fuzzy
 msgid "Report Idle time"
-msgstr "_Raporto kohë plogështie"
+msgstr "Raporto Kohë plogështie"
 
-#: ../finch/gntprefs.c:208
-#, fuzzy
 msgid "Change status when idle"
-msgstr "Ndrysho gjendjen po qe i _plogësht"
+msgstr "Ndryshoji gjendjen po qe i plogësht"
 
-#: ../finch/gntprefs.c:209
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "_Minuta para ndryshimit të gjendjes:"
+msgstr "Minuta para ndryshimit të gjendjes"
 
-#: ../finch/gntprefs.c:210
-#, fuzzy
 msgid "Change status to"
-msgstr "Ndrysho _gjendje si:"
+msgstr "Ndryshoji gjendjen si"
 
 #  Conversations
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "bashkëbisedime"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "Hyrje"
 
-#: ../finch/gntrequest.c:583
-#, fuzzy
+msgid "You must fill all the required fields."
+msgstr "Duhet të plotësoni tërë fushat e domosdoshme."
+
+msgid "The required fields are underlined."
+msgstr "Fushat e domosdoshme janë të nënvizuara."
+
 msgid "Not implemented yet."
-msgstr "Karakteristikë e Pajetësuar"
+msgstr "Ende i parealizuar."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Ruaj Kartelë..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Hap Kartelë..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Choose Location..."
+msgstr "Zgjidhni Vend..."
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Shtypni 'Enter' për të gjetur më tepër dhoma të kësaj kategorie."
+
+msgid "Get"
+msgstr "Merr"
+
+#. Create the window.
+msgid "Room List"
+msgstr "Listë Dhomash"
+
 msgid "Buddy logs in"
 msgstr "Shoku futet"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "Shoku del"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "Mesazh i marrë"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Mesazh i marrë, fillon bashkëbisedimi"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "Mesazh i dërguar"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "Personi hyn në fjalosje"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Personi del nga fjalosje"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "Flisni në fjalosje"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "Të tjerë flasin në fjalosje"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
-#, fuzzy
-msgid "Someone says your screen name in chat"
+msgid "Someone says your username in chat"
 msgstr "Dikush thotë emrin tuaj në fjalosje"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer Failure"
-msgstr ""
+msgstr "Dështim i GStreamer-it"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
 msgid "GStreamer failed to initialize."
-msgstr ""
+msgstr "GStreamer dështoi gatitjen."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
-#, fuzzy
 msgid "(default)"
-msgstr "Parazgjedhje"
+msgstr "(parazgjedhje)"
 
-#: ../finch/gntsound.c:729
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "Përzgjidhni një kartelë"
+msgstr "Përzgjidhni Kartelë Zanore ..."
 
-#: ../finch/gntsound.c:904
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "Parapëlqime"
+msgstr "Parapëlqime Zanore"
 
-#: ../finch/gntsound.c:915
-#, fuzzy
 msgid "Profiles"
-msgstr "Profil MSN"
+msgstr "Profile"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Automatike"
 
-#: ../finch/gntsound.c:957
-#, fuzzy
 msgid "Console Beep"
 msgstr "Tingull Konsole"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Urdhër"
 
-#: ../finch/gntsound.c:959
-#, fuzzy
 msgid "No Sound"
-msgstr "Pa tinguj"
+msgstr "Pa Zë"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "Metodë Tingulli"
 
-#: ../finch/gntsound.c:966
-#, fuzzy
 msgid "Method: "
-msgstr "_Metodë:"
+msgstr "Metodë:"
 
-#: ../finch/gntsound.c:973
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"_Urdhër tingulli:\n"
+"Urdhër Tingulli\n"
 "(%s për emër kartele)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Mundësi Tingulli"
 
-#: ../finch/gntsound.c:982
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "Tinguj kur bashkëbisedimi ka _fokus"
+msgstr "Tinguj kur bashkëbisedimi ka fokus"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Përherë"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
-#, fuzzy
 msgid "Only when available"
-msgstr "E pamundur"
+msgstr "Vetëm kur mundet"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
-#, fuzzy
 msgid "Only when not available"
-msgstr "Fjalosja në %s nuk është e mundshme."
+msgstr "Vetëm kur nuk mundet"
 
-#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
-msgstr ""
+msgstr "Volum(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Ngjarje Tingulli"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Ngjarje"
 
-#: ../finch/gntsound.c:1020
-#, fuzzy
 msgid "File"
-msgstr "Filtër"
+msgstr "Kartelë"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "Provoni"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "Ricaktoni"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "Zgjidhni..."
 
-#: ../finch/gntstatus.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "jeni të sigurtë se doni të fshini %s?"
+msgstr "Jeni i sigurt se doni të fshini \"%s\""
 
-#: ../finch/gntstatus.c:141
-#, fuzzy
 msgid "Delete Status"
-msgstr "Gjendje për I lidhur "
+msgstr "Fshije Gjendjen"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Gjendje të Ruajtura"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titull"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tip"
 
@@ -1777,224 +1362,137 @@ msgstr "Tip"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../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:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../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/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Mesazh"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
-#, fuzzy
 msgid "Use"
-msgstr "_Përdor"
+msgstr "Përdor"
 
-#: ../finch/gntstatus.c:301
-#, fuzzy
 msgid "Invalid title"
-msgstr "ID autorizimi i pavlefshëm"
+msgstr "Titull i pavlefshëm"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
-msgstr ""
+msgstr "Ju lutem jepni për gjendjen një titull jo bosh."
 
-#: ../finch/gntstatus.c:310
-#, fuzzy
 msgid "Duplicate title"
-msgstr "Dyfishim Ndreqjeje"
+msgstr "Dyfisho Titullin"
 
-#: ../finch/gntstatus.c:311
-#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "Përdor gjendje të _ndryshme për disa llogari"
+msgstr "Ju lutem jepni një tjetër titull për gjendjen."
 
-#: ../finch/gntstatus.c:452
-#, fuzzy
 msgid "Substatus"
-msgstr "Gjendje"
+msgstr "Nëngjendje"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Gjendje:"
 
-#: ../finch/gntstatus.c:479
-#, fuzzy
 msgid "Message:"
-msgstr "_Mesazh:"
+msgstr "Mesazh:"
 
-#: ../finch/gntstatus.c:528
-#, fuzzy
 msgid "Edit Status"
-msgstr "Gjendje Civile"
+msgstr "Përpunoni Gjendje"
 
-#: ../finch/gntstatus.c:570
-#, fuzzy
 msgid "Use different status for following accounts"
-msgstr "Përdor gjendje të _ndryshme për disa llogari"
+msgstr "Përdor tjetër gjendje për llogaritë vijuese"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
-#, fuzzy
 msgid "Save & Use"
-msgstr "Ruaj Pamje"
+msgstr "Ruaje & Përdore"
 
-#: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
+msgstr "Dëshmi"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Tinguj"
 
-#: ../finch/gntui.c:91
-#, fuzzy
 msgid "Statuses"
 msgstr "Gjendje"
 
 #  *< name
 #  *< version
 #  *< summary
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "Mundëson suport për ngarkim shtojcash perl"
+msgstr "Gabim në ngarkimin e shtojcës."
 
-#: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "S'hapa dot kartelë"
+msgstr "Nuk u gjet dot mekanizëm ekrani X"
 
-#: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "S'hapa dot kartelë"
+msgstr "Nuk u gjet dot dritare"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
+"Kjo shtojcë nuk mund të ngarkohet, ngaqë nuk qe krijuar për mbulim edhe të "
+"X11-s."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
-msgstr ""
+msgstr "Shtojcë për Të papastrën"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"Kur ndryshon përmbajtja e të papastrës gnt, përmbajtja bëhet e passhme për X-"
+"in, në qoftë e mundur."
 
-#: ../finch/plugins/gntgf.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed on"
-msgstr "%s ka nënshkruar (%s)"
+msgstr "%s sapo nënshkroi"
 
-#: ../finch/plugins/gntgf.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed off"
-msgstr "%s ka çnënshkruar (%s)"
+msgstr "%s sapo çnënshkroi"
 
-#: ../finch/plugins/gntgf.c:246
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a message"
-msgstr "Dërgo një mesa_zh"
+msgstr "%s ju dërgoi një mesazh"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
+msgstr "%s përmendi nofkën tuaj te %s"
 
-#: ../finch/plugins/gntgf.c:267
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "Dërgo një mesa_zh"
+msgstr "%s dërgoi një mesazh te %s"
 
-#: ../finch/plugins/gntgf.c:305
-#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "Shoku është i shkëputur:"
+msgstr "Shoku nënshkruan/çnënshkruan"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
-msgstr ""
+msgstr "Merrni një MA"
 
-#: ../finch/plugins/gntgf.c:307
-#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "Dikush thotë emrin tuaj në fjalosje"
+msgstr "Dikush flet në fjalosje"
 
-#: ../finch/plugins/gntgf.c:308
-#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "Dikush thotë emrin tuaj në fjalosje"
+msgstr "Dikush thotë emrin tuaj në një fjalosje"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "Cakto \"URGENT\" për dritaren e terminalit."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
-msgstr ""
+msgstr "Shtojcë për Toaster"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "Bashkëbisedim me %s te %s"
+msgstr "<b>Bashkëbisedim me %s te %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Shtojca për Historikun Lyp Regjistrim"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2006,263 +1504,241 @@ msgstr ""
 "Aktivizimi i regjistrimit të mesazheve të atypëratyshëm dhe/ose fjalosjeve "
 "aktivizon historikun për të njëjtin tip bashkëbisedimi."
 
-#: ../finch/plugins/gnthistory.c:179
-#, fuzzy
 msgid "GntHistory"
-msgstr "Historik"
+msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shfaq në bashkëbisedime të rinj bashkëbisedime të përdorur së fundmi ."
 
-#: ../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 ""
+"Kur hapet një bashkëbisedim i ri kjo shtojcë do të fusë bashkëbisedimin e "
+"fundit te bashkëbisedimi i çastit."
+
+#, c-format
+msgid "Online"
+msgstr "I lidhur"
+
+msgid "Offline"
+msgstr "Jo i lidhur"
+
+msgid "Online Buddies"
+msgstr "Shokë të Lidhur"
+
+msgid "Offline Buddies"
+msgstr "Shokë Jo të lidhur"
+
+msgid "Online/Offline"
+msgstr "Online/Offline"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "Pa Grupim"
+
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+msgid "Provides alternate buddylist grouping options."
+msgstr "Furnizon mundësi alternative për grupim listash shokësh."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
-msgstr ""
+msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog: Kërkon në \"backlog\" për një nënvarg."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "Shtojcë për \"lastlog\"."
 
-#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "llogari"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Për të nënshkruar lipset fjalëkalim."
 
-#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Jepni fjalëkalim për %s (%s) "
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "Jepni Fjalëkalimin"
 
-#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "Ruaj fjalëkalimin"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Mungon shtojcë protokolli për %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Gabim Lidhjeje"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "Fjalëkalimi i ri nuk përputhet."
 
-#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "Plotësoni tërë kutitë."
 
-#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Fjalëkalimi fillestar"
 
-#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "Fjalëkalim i ri"
 
-#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "Fjalëkalim i ri (sërish)"
 
-#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "Ndrysho fjalëklim për %s"
 
-#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr ""
 "Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri."
 
-#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ndrysho të dhëna përdoruesi për %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Rregulloni Të dhëna Përdoruesi"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "E panjohur"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Shokë"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "listë shokësh"
 
-#: ../libpurple/certificate.c:545
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(NUK PËRPUTHET)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s ka paraqitur dëshminë vijuese për përdorim vetëm-këtë-herë:"
 
-#: ../libpurple/certificate.c:550
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Emër i zakonshëm: %s %s\n"
+"Shenjë gishtash (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Verifikim Dëshmie Njëpërdorimshe"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Autoritete Dëshmish"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "Fshehtinë Ortakësh SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Të pranoj ftesë fjalosjeje?"
+msgstr "Të pranohet dëshmia për %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "Verifikim Dëshmie SSL"
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #. Number of actions
-#: ../libpurple/certificate.c:1186
 msgid "Accept"
 msgstr "Prano"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-#, fuzzy
 msgid "Reject"
-msgstr "Ricaktoni"
+msgstr "Hidh tej"
 
-#: ../libpurple/certificate.c:1188
 msgid "_View Certificate..."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
+msgstr "_Shihni Dëshmi..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
+"Dëshmia e paraqitur nga \"%s\" është e vetënënshkruar.  Nuk mund të "
+"kontrollohet vetvetiu."
 
-#: ../libpurple/certificate.c:1331
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Zinxhiri i dëshmive i paraqitur për %s nuk është i vlefshëm."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
 msgid "SSL Certificate Error"
-msgstr ""
+msgstr "Gabim Dëshmie SSL"
 
-#: ../libpurple/certificate.c:1340
-#, fuzzy
 msgid "Invalid certificate chain"
-msgstr "Mekanizëm Autorizimi i Pasaktë"
+msgstr "Zinxhir i pavlefshëm dëshmish"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"Nuk keni bazë të dhënash për dëshmi rrënjë, ndaj kjo dëshmi nuk mund të "
+"vleftësohet."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
+"Dëshmia rrënjë që pretendohet të jetë e lëshuar nga kjo, është e panjohur "
+"për Pidgin."
 
-#: ../libpurple/certificate.c:1408
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
+"Zinxhiri i dëshmive i paraqitur nga %s nuk përmban ndonjë nënshkrim shifror "
+"të vlefshëm prej Autoritetit të Dëshmive prej të cilit pretendon se ka "
+"nënshkrim."
 
-#: ../libpurple/certificate.c:1417
 msgid "Invalid certificate authority signature"
+msgstr "Nënshkrim i pavlefshëm autoriteti dëshmish"
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
+"Dëshmia e paraqitur nga \"%s\" pretendon të jetë prej \"%s\".  Kjo mundet të "
+"thotë që nuk po lidheni te shërbimi që kujtoni se po lidheni."
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2272,175 +1748,135 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Emër i zakonshëm: %s\n"
+"\n"
+"Shenjë gishtash (SHA1): %s\n"
+"\n"
+"Datë aktivizimi: %s\n"
+"Datë shfuqizimi: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
 msgid "Certificate Information"
-msgstr "Të dhëna Shërbyesi"
+msgstr "Të dhëna Dëhsmie"
 
-#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Gabim Regjistrimi"
 
-#: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Gabim Regjistrimi"
+msgstr "Gabim Çregjistrimi"
 
-#: ../libpurple/connection.c:350
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed on"
-msgstr "%s ka nënshkruar (%s)"
+msgstr "+++ %s nënshkroi"
 
-#: ../libpurple/connection.c:380
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed off"
-msgstr "%s ka çnënshkruar (%s)"
+msgstr "+++ %s çnënshkroi"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "I pazoti të dërgoj mesazh: Mesazhi është shumë i madh."
 
 #  TODO: Improve this! message to who or for what conference?
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "I pazoti të dërgoj mesazh te %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Mesazhi është shumë i madh."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "I pazoti të dërgoj mesazh."
 
-#: ../libpurple/conversation.c:1211
-#, fuzzy
 msgid "Send Message"
-msgstr "Dërgo një mesa_zh"
+msgstr "Dërgo Mesazh"
 
-#: ../libpurple/conversation.c:1214
-#, fuzzy
 msgid "_Send Message"
-msgstr "Dërgo një mesa_zh"
+msgstr "_Dërgo Mesazh"
 
-#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s u fut në dhomë."
 
-#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] u fut në dhomë."
 
-#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
-msgstr "Tani jeni i njohur si %s"
+msgstr "Tani njiheni si %s"
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s tani njihet si %s"
 
-#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s doli prej dhomës."
 
-#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s doli prej dhomës (%s)."
 
-#: ../libpurple/dbus-server.c:584
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "Dështova në caktimin e \"cmodes\" për %s "
+msgstr "Pasja e lidhjes dështoi: %s"
 
-#: ../libpurple/dbus-server.c:596
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "Dështova në ruajtje pamjeje: %s\n"
+msgstr "Pasja e emrit dështoi: %s"
 
-#: ../libpurple/dbus-server.c:610
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Dështova në ruajtje pamjeje: %s\n"
+msgstr "Pasja e emrit të shërbyesit dështoi: %s"
 
-#: ../libpurple/dbus-server.h:85
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
+"Për arsyet e radhitura më poshtë, shërbyesi D-BUS i të purpurit nuk po xhiron"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
-#, fuzzy
 msgid "No name"
-msgstr "Emër strehe"
+msgstr "Pa emër"
 
-#: ../libpurple/dnsquery.c:511
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "I pazoti të krijoj \"socket\""
+msgstr "I pazoti të krijoj proces të ri shquajtjeje\n"
 
 #  TODO: Improve this! message to who or for what conference?
-#: ../libpurple/dnsquery.c:516
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "I pazoti të dërgoj mesazh te %s."
+msgstr "I pazoti të dërgoj kërkesë te proces shquajtjeje\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Gabim në leximin e %s: \n"
-"%s.\n"
+"Gabim në shquajtjen e %s:\n"
+"%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"Gabim në leximin e %s: \n"
-"%s.\n"
+msgstr "Gabim në shquajtjen e %s: %d"
 
-#: ../libpurple/dnsquery.c:574
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-"Gabim në leximin e %s: \n"
-"%s.\n"
+"Gabim gjatë leximit prej procesi të shquajtjes:\n"
+"%s"
 
-#: ../libpurple/dnsquery.c:578
 #, c-format
 msgid "EOF while reading from resolver process"
-msgstr ""
+msgstr "EOF ndërkohë që po lexohej prej procesi shquajtjeje"
 
-#: ../libpurple/dnsquery.c:761
-#, fuzzy, c-format
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "Dështim Mirëfilltësimi"
+msgstr "Dështim krijimi rrjedhe: %s"
 
-#: ../libpurple/dnsquery.c:762
-#, fuzzy
 msgid "Unknown reason"
-msgstr "Arsye e panjohur."
+msgstr "Arsye e panjohur"
 
-#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2449,7 +1885,6 @@ msgstr ""
 "Gabim në leximin e %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2458,7 +1893,6 @@ msgstr ""
 "Gabim në shkrimin e %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2467,40 +1901,33 @@ msgstr ""
 "Gabim në hyrjen te %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
-msgstr ""
+msgstr "Drejtoria nuk është e shkruajtshme."
 
-#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "S'dërgoj dot kartelë me 0 bajt."
 
-#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Nuk mund të dërgoj një drejtori."
 
-#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
-"%s nuk është kartelë e rregullt. Po kundërshtoj, me frikë, ta mbishkruaj.\n"
+"%s nuk është kartelë e rregullt. Po kundërshtohet, me frikë, të "
+"mbishkruhet.\n"
 
-#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s don t'ju dërgojë %s (%s)"
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s don t'ju dërgojë një kartelë"
 
-#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Të pranoj kërkesë shpërnguljeje kartelash prej %s?"
 
-#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2511,245 +1938,218 @@ msgstr ""
 "Strehë e largët: %s\n"
 "Portë e largët: %d"
 
-#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s po ofron dërgimin e kartelës %s"
 
-#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s nuk është një emër i vlefshëm kartele.\n"
 
-#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "Po i ofroj %s dërgimin e %s"
+msgstr "Po i ofrohet %s dërgimi i %s"
 
-#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Po nis shpërnguljen e %s prej %s"
+msgstr "Po niset shpërngulja e %s prej %s"
 
-#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Shpërngulje e kartelës %s e plotësuar"
 
-#: ../libpurple/ft.c:685
 #, c-format
 msgid "File transfer complete"
 msgstr "Shpërngulje kartelash e plotësuar"
 
-#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Anuluat shpërnguljen e %s"
 
-#: ../libpurple/ft.c:1108
 #, c-format
 msgid "File transfer cancelled"
 msgstr "Shpërngulje kartelash e anuluar"
 
-#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s anuloi shpërnguljen e %s"
 
-#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s anuloi shpërnguljen e kartelës"
 
-#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Shpërngulja e kartelës drejt %s dështoi."
 
-#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Shpërngulja e kartelës prej %s dështoi."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "Xhiroje urdhrin në terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"aim\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"gg\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"icq\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"irc\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"msnim\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"sip\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"xmpp\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
+"Urdhri i përdorur për të trajtuar URL-ra \"ymsgr\", në qoftë i aktivizuar."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "Trajtuesi për URL-ra \"ymsgr\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"aim\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"gg\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"icq\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"irc\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"msnim\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"sip\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"xmpp\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"E vërtetë nëse urdhri i treguar te pjesa \"command\" do të duhej të "
+"trajtonte URL-ra \"ymsgr\"."
 
-#: ../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 ""
+"E vërtetë nëse urdhri i përdorur për trajtimin e këtij lloji URL-je do të "
+"duhej xhiruar në një terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"aim\" urdhri i treguar"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"gg\" urdhri i treguar"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"icq\" urdhri i treguar"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"irc\" urdhri i treguar"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"msnim\" urdhri i treguar"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"sip\" urdhri i treguar"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"xmpp\" urdhri i treguar"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "Në duhet a jo të trajtojë URL-ra  \"ymsgr\" urdhri i treguar"
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Regjistruesi nuk ka funksion leximi</font></b>"
 
-#: ../libpurple/log.c:598
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
-#: ../libpurple/log.c:612
 msgid "Plain text"
-msgstr ""
+msgstr "Tekst i thjeshtë"
 
-#: ../libpurple/log.c:626
 msgid "Old flat format"
-msgstr ""
+msgstr "Format i vjetër i thjeshtë"
 
-#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "Regjistrimi i këtij bashkëbisedimi dështoi."
 
-#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2758,7 +2158,6 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;VETË-"
 "PËRGJIGJU&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2767,45 +2166,39 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;VETË-"
 "PËRGJIGJU&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>I pazoti të gjej shteg regjistrimi!</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Nuk mund të lexoj kartelë: %s</b></font>"
 
-#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <VETË-PËRGJIGJU>: %s\n"
 
-#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "Po përdorni %s, por kjo shtojcë lyp %s."
 
-#: ../libpurple/plugin.c:380
 #, c-format
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "Kjo shtojcë nuk ka ID të përcaktuar."
 
-#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "Mospërputhje versioni ABI %d.%d.x (lypset %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
-msgid "Plugin does not implement all required functions"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
+"Shtojca nuk sendërton tërë funksionet e domosdoshëm (list_icon, login dhe "
+"close)"
 
-#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2814,93 +2207,57 @@ msgstr ""
 "Shtojca e nevojshme %s nuk u gjet. Ju lutem instaloni këtë shtojcë dhe "
 "riprovoni."
 
-#: ../libpurple/plugin.c:552
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "Gaim-i s'qe në gjendje të ngarkonte shtojcën tuaj."
+msgstr "Nuk qe e mundur të ngarkohet shtojca"
 
-#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Nuk qe e mundur të ngarkohet shtojca e nevojshme %s."
 
-#: ../libpurple/plugin.c:578
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "Gaim-i s'qe në gjendje të ngarkonte shtojcën tuaj."
+msgstr "Nuk qe e mundur të ngarkohej shtojca juaj."
 
-#: ../libpurple/plugin.c:677
-#, fuzzy, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Nuk qe e mundur të ngarkohet shtojca e nevojshme %s."
-
-#  *< name
-#  *< version
-#  *< summary
-#: ../libpurple/plugin.c:681
-#, fuzzy
-msgid "There were errors unloading the plugin."
-msgstr "Mundëson suport për ngarkim shtojcash perl"
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s lyp %s, por ky nuk arriti të çshkarkohej."
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#: ../libpurple/plugins/autoaccept.c:23
-#, fuzzy
 msgid "Autoaccept"
-msgstr "Prano"
+msgstr "Vetëprano"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
-#, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "Të pranoj kërkesë shpërnguljeje kartelash prej %s?"
+msgstr ""
+"Vetëprano kërkesa shpërnguljeje kartelash prej përdoruesa të përzgjedhur."
 
-#: ../libpurple/plugins/autoaccept.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Të pranoj kërkesë shpërnguljeje kartelash prej %s?"
+msgstr ""
+"Shpërngulja e vetëpranuar e kartelave për \"%s\" prej \"%s\" u plotësua."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "Vetëpranim i plotësuar"
 
-#: ../libpurple/plugins/autoaccept.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "Të pranoj kërkesë shpërnguljeje kartelash prej %s?"
+msgstr "Kur një kërkesë shpërnguljeje kartelash vjen prej %s"
 
-#: ../libpurple/plugins/autoaccept.c:162
-#, fuzzy
 msgid "Set Autoaccept Setting"
-msgstr "Rregullime për Stealth"
+msgstr "Caktoni Rregullime për Vetëpranime"
 
-#: ../libpurple/plugins/autoaccept.c:164
-#, fuzzy
 msgid "_Save"
-msgstr "Ruaj"
+msgstr "_Ruaj"
 
-#: ../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:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "_Anulo"
 
-#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
-msgstr ""
+msgstr "Pyet"
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#: ../libpurple/plugins/autoaccept.c:169
-#, fuzzy
 msgid "Auto Accept"
-msgstr "Prano"
+msgstr "Vetëprano"
 
 #  *< api_version
 #  *< type
@@ -2909,47 +2266,42 @@ msgstr "Prano"
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/plugins/autoaccept.c:170
-#, fuzzy
 msgid "Auto Reject"
-msgstr "Vetërilidhu"
+msgstr "Hidh tej Vetvetiu"
 
-#: ../libpurple/plugins/autoaccept.c:185
-#, fuzzy
 msgid "Autoaccept File Transfers..."
-msgstr "Shpërngulje Kartelash"
+msgstr "Vetëprano Shpërngulje Kartelash..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
+"Shteg për ruajte kartelash\n"
+"(Ju lutem jepni shtegun e plotë)"
 
-#: ../libpurple/plugins/autoaccept.c:220
-#, fuzzy
 msgid "Automatically reject from users not in buddy list"
-msgstr "Lejo vetëm përdoruesit në listën time të shokëve"
+msgstr "Hidh tej vetvetiu kërkesa prej përdoruesish jashtë listës së shokëve"
 
-#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"Njofto përmes një fllucke kur plotësohet një shpërngulje e vetëpranuar "
+"kartelash\n"
+"(vetëm kur nuk ka bashkëbisedim me dërguesin)"
+
+msgid "Create a new directory for each user"
+msgstr "Krijo drejtori të re për secilin përdorues"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
-#, fuzzy
 msgid "Notes"
-msgstr "Shënim"
+msgstr "Shënime"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "Jepni më poshtë shënimet tuaja..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
-msgstr ""
+msgstr "Përpunoni Shënime..."
 
 #. *< major version
 #. *< minor version
@@ -2959,21 +2311,18 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "Shokë"
+msgstr "Shënime Shoku"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "Ruaj shënime për shokë të veçantë."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
+"Shton mundësinë për ruajtje shënimesh rreth shokësh te lista juaj e shokëve."
 
 #. *< type
 #. *< ui_requirement
@@ -2981,17 +2330,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
-msgstr ""
+msgstr "Provë Shifre"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "Teston shifrat që vijnë me libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -2999,18 +2346,15 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
-msgstr ""
+msgstr "Shembull DBus"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
-msgstr ""
+msgstr "Shembull Shtojce DBus"
 
 #  *< api_version
 #  *< type
@@ -3025,10 +2369,8 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
-#, fuzzy
 msgid "File Control"
-msgstr "Kontroll Gaim Kartelash"
+msgstr "Kontroll Kartelash"
 
 #  *< name
 #  *< version
@@ -3038,53 +2380,38 @@ msgstr "Kontroll Gaim Kartelash"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr "Ju lejon të kontrolloni Gaim-in duke dhënë urdhra në një kartelë."
+msgstr "Lejon kontrolle duke dhënë urdhra në një kartelë."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuta"
 
 #. 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
 msgid "I'dle Mak'er"
 msgstr "Plogështibërësi"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Caktoni Kohë Plogështie Llogarie"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Caktoni"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
-msgstr ""
+msgstr "Asnjë prej llogarive tuaja nuk është e plogësht."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Hiq Kohë Plogështie Llogarie"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Hiq"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
-#, fuzzy
 msgid "Set Idle Time for All Accounts"
-msgstr "Hiq Kohë Plogështie Për Tërë Llogaritë e Plogështa"
+msgstr "Cakto Kohë Plogështie për Tërë Llogaritë"
 
-#: ../libpurple/plugins/idle.c:271
-#, fuzzy
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Hiq Kohë Plogështie Për Tërë Llogaritë e Plogështa"
+msgstr "Hiq Kohë Plogështie për Tërë Llogaritë e Plogështa"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Ju lejon të formësoni dorazi sa gjatë keni qenë i plogësht"
 
@@ -3101,7 +2428,6 @@ msgstr "Ju lejon të formësoni dorazi sa gjatë keni qenë i plogësht"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Klient Prove IPC"
 
@@ -3111,13 +2437,11 @@ msgstr "Klient Prove IPC"
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Provo mbulim të shtojcës IPC, si një klient."
 
 #  *  description
 #. *  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."
@@ -3138,7 +2462,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Shërbyes Prove IPC"
 
@@ -3148,28 +2471,22 @@ msgstr "Shërbyes Prove IPC"
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Provo mbulim të shtojcës IPC, si shërbyes."
 
 #  *  description
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Provo mbulim të shtojcës IPC, si shërbyes. Kjo regjistron urdhrat IPC."
 
-#: ../libpurple/plugins/joinpart.c:229
-#, fuzzy
 msgid "Join/Part Hiding Configuration"
-msgstr "Formësim Integrimi me Evolucionin"
+msgstr "Formësim për Fshjehjen e Hyrje/Daljeve"
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
-msgstr ""
+msgstr "Madhësi Më e Vogël e Dhomës"
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
+msgstr "Mbarim Kohe Mosveprimtarie për Përdoruesin (në minuta)"
 
 #. *< type
 #. *< ui_requirement
@@ -3177,36 +2494,32 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "Fshjehje Hyrje/Daljesh"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
-msgstr ""
+msgstr "Fsheh mesazhe të parëndësishëm hyrje/daljesh."
 
 #. *  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."
 msgstr ""
+"Kjo shtojcë fsheh mesazhe ardhjesh/ikjesh në dhoma të dendura, hiq për ata "
+"përdorues që marrin pjesë aktivish në një bashkëbisedim."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
-msgstr ""
+msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
-#, fuzzy
 msgid "User is offline."
-msgstr "Përdoruesi është i palidhur"
+msgstr "Përdoruesi është i palidhur."
 
 #  *< api_version
 #  *< type
@@ -3215,112 +2528,87 @@ msgstr "Përdoruesi është i palidhur"
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/plugins/log_reader.c:1583
-#, fuzzy
 msgid "Auto-response sent:"
-msgstr "Vetërilidhu"
+msgstr "Vetëpërgjigje e dërguar:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
-#: ../libpurple/plugins/statenotify.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed off."
-msgstr "%s ka çnënshkruar (%s)"
+msgstr "%s ka çnënshkruar."
 
-#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "Një ose më tepër mesazhe mund të jenë të padërgueshëm."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Ishit shkëputur prej shërbyesit."
 
-#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
+"Për çastin jeni i palidhur. Nuk do të merren mesazhe po qe se nuk bëni "
+"hyrjen."
 
-#: ../libpurple/plugins/log_reader.c:1643
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Mesazhi nuk u dërgua dot ngaqë përdoruesi është i palidhur:"
+msgstr "Mesazhi nuk u dërgua dot ngaqë u tejkalua gjatësia më e madhe."
 
-#: ../libpurple/plugins/log_reader.c:1648
-#, fuzzy
 msgid "Message could not be sent."
-msgstr "Mesazhi juaj Yahoo! nuk u dërgua."
+msgstr "Mesazhi nuk mund të dërgohej."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
-msgstr ""
+msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
-#, fuzzy
 msgid "Fire"
-msgstr "Firefox"
+msgstr "Zjarr"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
-#, fuzzy
 msgid "Messenger Plus!"
-msgstr "Mesazh prej %s"
+msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "Lajmësjellës Internet"
+msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
-msgstr ""
+msgstr "Trillian"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
-#, fuzzy
 msgid "General Log Reading Configuration"
-msgstr "Formësim Integrimi me Evolucionin"
+msgstr "Formësim i Përgjithshëm për Lexim Regjistrimesh"
 
-#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
-msgstr ""
+msgstr "Llogaritje të shpejta madhësie"
 
-#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
-msgstr ""
+msgstr "Përdor heuristikë emrash"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
-#, fuzzy
 msgid "Log Directory"
-msgstr "Drejtori Kërkimi:"
+msgstr "Drejtori Regjistrimesh"
 
 #. *< type
 #. *< ui_requirement
@@ -3328,20 +2616,16 @@ msgstr "Drejtori Kërkimi:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
-#, fuzzy
 msgid "Log Reader"
-msgstr "Parës Regjistrimi"
+msgstr "Lexues Regjistrimesh"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "Përfshin te parës regjistrimesh regjistrim prej tjetër klienti MA-sh."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3349,16 +2633,24 @@ msgid ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"Kjo shtojcë do të përfshijë regjistrime prej klientësh të tjerë MA, kur "
+"shihen regjistrime. Hëpërhë, kjo përfshin Adium-in, MSN Messenger-in, dhe "
+"Trillian-in.\n"
+"\n"
+"KUJDES: Kjo shtojcë është ende kod në gjendje fillestare dhe mund të "
+"vithiset shpesh.  Qari dhe zarari... i juaji!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
-#, fuzzy
 msgid "Mono Plugin Loader"
-msgstr "Ngarkues Shtojce Tcl"
+msgstr "Ngarkues Shtojcash Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
-msgstr ""
+msgstr "Ngarkon shtojca .NET me Mono-n."
+
+msgid "Add new line in IMs"
+msgstr "Shto rresht të ri te MA-të"
+
+msgid "Add new line in Chats"
+msgstr "Shto rresht të ri te Fjalosjet"
 
 #. *< magic
 #. *< major version
@@ -3369,88 +2661,62 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
-#, fuzzy
 msgid "New Line"
-msgstr "Dritare e re"
+msgstr "Resht i Ri"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "I pazoti të dërgoj mesazh."
+msgstr "Shton një rresht të ri bosh përpara mesazhit të shfaqur."
 
 #. *< 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."
+"the username in the conversation window."
 msgstr ""
+"Shton te mesazhi një simbol rreshti të ri, kështu që pjesa e mbetur e "
+"mesazhit të shfaqet nën emrin e përdoruesit te dritarja e bashkëbisedimit."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "Simulim Mesazhi për Offline"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+msgstr "Ruaji si cytje mesazhet e dërguar te një përdorues jo në linjë."
 
-#: ../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 ""
+"Ç'mbetet nga mesazhi do të ruhet si cytje. Mund ta përpunoni/fshini cytjen "
+"përmes dialogut  `Cytje Shoku'."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, 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\" këtë çast nuk është i lidhur. Doni të ruhen pjesa e mbetur e "
+"mesazheve si cytje dhe të dërgohen vetvetiu kur të rifutet \"%s\"?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#, fuzzy
 msgid "Offline Message"
-msgstr "Jo i lidhur "
+msgstr "Mesazh për Offline"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "Mund ta përpunoni/fshini cytjen përmes dialogut  `Cytje Shoku'."
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Po"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Jo"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "Ruaji mesazhet offline si cytje"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "Mos pyet. Ruaji përherë si cytje."
 
 #  *< api_version
 #  *< type
@@ -3465,7 +2731,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Ngarkues Shtojcash Perl"
 
@@ -3475,47 +2740,37 @@ msgstr "Ngarkues Shtojcash Perl"
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Mundëson suport për ngarkim shtojcash perl"
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
-msgstr ""
+msgstr "Gjendje Psiqike"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "Gjendje psikike për bashkëbisedime të kërkuar nga të tjerë"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
+"Bën që të shfaqen dritare bashkëbisedimi sapo përdoruesa të tjerë nisin të "
+"shkruajnë mesazhe për ju. Funksionon për AIM, ICQ, XMPP, Sametime dhe Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:91
-#, fuzzy
 msgid "Only enable for users on the buddy list"
-msgstr "Lejo vetëm përdoruesit në listën time të shokëve"
+msgstr "Aktivizoje vetëm për përdoruesa në listën e shokëve"
 
-#: ../libpurple/plugins/psychic.c:96
-#, fuzzy
 msgid "Disable when away"
-msgstr "%s u largua"
+msgstr "Çaktivizoje, në qoftë i larguar"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
-msgstr ""
+msgstr "Shfaq mesazh njoftimi në bashkëbisedime"
 
 #  IM Convo trans options
-#: ../libpurple/plugins/psychic.c:105
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "N_gri dritare bashkëbisedimi"
+msgstr ""
 
 #  *< api_version
 #  *< type
@@ -3530,7 +2785,6 @@ msgstr "N_gri dritare bashkëbisedimi"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Provë Sinjalesh"
 
@@ -3542,8 +2796,6 @@ msgstr "Provë Sinjalesh"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Provo për të parë që tërë sinjalet punojnë në rregull."
 
@@ -3560,7 +2812,6 @@ msgstr "Provo për të parë që tërë sinjalet punojnë në rregull."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Shtojcë e Thjeshtë"
 
@@ -3572,15 +2823,12 @@ msgstr "Shtojcë e Thjeshtë"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Provon nëse shumica e gjërave funksionojnë."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "Dëshmi X.509"
 
 #  *< api_version
 #  *< type
@@ -3595,7 +2843,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3607,8 +2854,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "Mundëson suport SSL përmes GNUTLS."
 
@@ -3625,7 +2870,6 @@ msgstr "Mundëson suport SSL përmes GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
 msgid "NSS"
 msgstr "NSS"
 
@@ -3637,8 +2881,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Mundëson suport SSL përmes Mozilla NSS."
 
@@ -3655,7 +2897,6 @@ msgstr "Mundëson suport SSL përmes Mozilla NSS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3667,51 +2908,40 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Ofron librari suporti për mbështjellës rreth SSL-je."
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s nuk është më i larguar."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s është larguar."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s është plogështuar."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s nuk është më i plogësht."
 
-#: ../libpurple/plugins/statenotify.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed on."
-msgstr "%s ka nënshkruar (%s)"
+msgstr "%s ka nënshkruar."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Njofto Kur"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Shoku Po _Largohet"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
-msgstr "Shoku Po Plogështohet"
+msgstr "Shoku Po _Plogështohet"
 
-#: ../libpurple/plugins/statenotify.c:100
-#, fuzzy
 msgid "Buddy _Signs On/Off"
-msgstr "Shoku futet"
+msgstr "Shoku _Nënshkruan/Çnënshkruan"
 
 #  *< api_version
 #  *< type
@@ -3726,7 +2956,6 @@ msgstr "Shoku futet"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Njoftim Gjendjeje Shoku"
 
@@ -3738,8 +2967,6 @@ msgstr "Njoftim Gjendjeje Shoku"
 #. *< version
 #. *  summary
 #. *  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."
@@ -3747,70 +2974,49 @@ msgstr ""
 "Njofton në dritare bashkëbisedimi kur një shok largohet ose kthehet prej "
 "plogështimi ose largimi."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Ngarkues Shtojce Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mundëson suport për ngarkim shtojcash Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
+"Nuk u gjet dot instalim i Active TCL. Nëse dëshironi të përdorni shtojca "
+"TCL, instaloni ActiveTCL prej http://www.activestate.com\n"
+
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
+msgstr ""
+"Nuk u gjet grupi i mjeteve Apple Bonjour For Windows, për më tepër të dhëna "
+"shihni FAQ te: http://d.pidgin.im/BonjourWindows."
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
-#, fuzzy
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "I pazoti të krijoj lidhje të re."
+msgstr "I pazoti të pres për lidhje MA ardhëse\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
+"I pazoti të vendos lidhje me shërbyesin mDNS vendor.  A është duke xhiruar?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Emër"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Mbiemër"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "Email"
 msgstr "Email"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
-#, fuzzy
 msgid "AIM Account"
-msgstr "Shto Llogari"
+msgstr "Llogari AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
-#, fuzzy
 msgid "XMPP Account"
-msgstr "Llogari"
+msgstr "Llogari XMPP"
 
 #  *< api_version
 #  *< type
@@ -3833,57 +3039,37 @@ msgstr "Llogari"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Shtojcë Protokolli Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#, fuzzy
 msgid "Purple Person"
-msgstr "Person i Ri"
+msgstr "Person i Purpurt"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
-#, fuzzy, c-format
+#, c-format
 msgid "%s has closed the conversation."
-msgstr "%s është ftuar te ky bashkëbisedim."
+msgstr "%s mbylli bashkëbisedimin"
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
-#, fuzzy
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "I pazoti të dërgoj mesazh: Mesazhi është shumë i madh."
+msgstr "I pazoti të dërgoj mesazh, nuk u nis dot bashkëbisedimi."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
-#, fuzzy
 msgid "Cannot open socket"
-msgstr "S'bashkohem dot me %s:"
-
-#: ../libpurple/protocols/bonjour/jabber.c:591
-#, fuzzy
-msgid "Error setting socket options"
-msgstr "Gabim në krijimin e lidhjes"
+msgstr "S'hap dot \"socket\""
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
-#, fuzzy
 msgid "Could not bind socket to port"
-msgstr "S'munda të krijoj \"listen socket\""
+msgstr "Nuk lidha dot \"socket\"-in te porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
-#, fuzzy
 msgid "Could not listen on socket"
-msgstr "S'munda të krijoj \"listen socket\""
+msgstr "Nuk u dëgjua dot te \"socket\"-i"
+
+msgid "Error communicating with local mDNSResponder."
+msgstr "Gabim gjatë komunikimit me mDNSResponder vendor."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr "Rregullime \"proxy\" të pavlefshme"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3891,379 +3077,220 @@ msgstr ""
 "Ose emri i strehës, ose numri i portës së treguar për tipin tuaj të \"proxy"
 "\"-it  është i pavlefshëm."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
-msgstr ""
+msgstr "Gabim \"Token\"-i"
 
-#: ../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 ""
+msgstr "I pazoti të bie \"token\"-in.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Ruaj Listë shokësh..."
 
-#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Lista juaj e shokëve është bosh, nuk u shkruajt gjë tek kartela."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "S'hapa dot kartelë"
-
-#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Lista e shokëve u ruajt me sukses"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
-#, fuzzy
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "S'u shkruajt dot listë shokësh për %s te %s"
+
 msgid "Couldn't load buddylist"
-msgstr "S'munda të shtoj shok te listë shërbyesi"
+msgstr "Nuk ngarkova dot listë shokësh"
 
-#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Ngarko Listë shokësh..."
 
-#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Lista e shokëve u ngarkua me sukses!"
 
-#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Ruaj listë shokësh..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+msgid "Load buddylist from file..."
+msgstr "Ngarko listë shokësh prej kartele..."
+
 msgid "Fill in the registration fields."
 msgstr "Plotësoni fushat e regjistrimin."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Fjalëkalimet nuk përputhen."
 
-#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "I pazoti të regjistroj llogari të re. ndodhi një gabim.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Loogaria e re Gadu-Gadu u Regjistrua"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Regjistrimi u plotësua me sukses!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Fjalëkalim"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Fjalëkalim (rishtypeni)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
-msgstr ""
+msgstr "Jepni \"token\"-in e çastit"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
-msgstr ""
+msgstr "\"Token\" i çastit"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Regjistro Llogari të Re Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Ju lutem, plotësoni fushat vijuese"
 
 #  City
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Qytet"
 
-#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Viti i lindjes"
 
 #  Gender
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Gjini"
 
-#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
-msgstr ""
+msgstr "Mashkull apo femër"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mashkull"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Femër"
 
-#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Vetëm i lidhur"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Gjej shokë"
 
-#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Ju lutem jepni më poshtë kriterin tuaj të kërkimit"
 
-#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Plotësoni fushat."
 
-#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Fjalëkalimi juaj i çastit është i ndryshëm nga ai që keni treguar."
 
-#: ../libpurple/protocols/gg/gg.c:727
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
-msgstr "I pazoti të ndryshoj fjalëkalimin. Ndodhi një gabim.\n"
+msgstr "I pazoti të ndryshoj fjalëkalim. Pati një gabim.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Ndrysho fjalëklimin për llogari Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Fjalëkalimi u ndryshua me sukses!"
 
-#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Fjalëkalim i çastit."
 
-#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri për "
 "UIN:"
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Ndrysho fjalëkalim Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Përzgjidhni fjalosje për shokun: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Shto te fjalosje..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Jo i lidhur"
-
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../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/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "I mundshëm"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
-#: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Larguar"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
 #  First Name
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Emër"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
-#, fuzzy
 msgid "Birth Year"
-msgstr "Ditë Lindjeje"
+msgstr "Vit Lindjeje"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
-#, fuzzy
 msgid "Unable to display the search results."
-msgstr "I pazoti të ftoj përdorues (%s)"
+msgstr "I pazoti të shfaq përfundimet e kërkimit."
 
-#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Drejtori Publike Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Përfundime kërkimi"
 
-#: ../libpurple/protocols/gg/gg.c:1215
-#, fuzzy
 msgid "No matching users found"
-msgstr "Nuk u gjetën regjistrime"
+msgstr "S'u gjetën përputhje me ndonjë përdorues"
 
-#: ../libpurple/protocols/gg/gg.c:1216
-#, fuzzy
 msgid "There are no users matching your search criteria."
-msgstr "Ju lutem jepni më poshtë kriterin tuaj të kërkimit"
+msgstr "Kriteri juaj i kërkimit nuk ka përputhje për asnjë përdorues. "
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "I pazoti të lexoj \"socket\"-in"
 
-#: ../libpurple/protocols/gg/gg.c:1395
-#, fuzzy
 msgid "Buddy list downloaded"
-msgstr "Shoku është i plogësht:"
+msgstr "Listë shokësh e shkarkuar"
 
-#: ../libpurple/protocols/gg/gg.c:1396
-#, fuzzy
 msgid "Your buddy list was downloaded from the server."
-msgstr "Ishit shkëputur prej shërbyesit."
+msgstr "Lista juaj e shokëve u shkarkua prej shërbyesit."
 
-#: ../libpurple/protocols/gg/gg.c:1403
-#, fuzzy
 msgid "Buddy list uploaded"
-msgstr "Shoku është i plogësht:"
+msgstr "Listë shokësh e ngarkuar"
 
-#: ../libpurple/protocols/gg/gg.c:1404
-#, fuzzy
 msgid "Your buddy list was stored on the server."
-msgstr "Ishit shkëputur prej shërbyesit."
+msgstr "Lista juaj e shokëve është ruajtur në shërbyes."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Lidhja dështoi"
 
-#  Block button
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
-msgid "Blocked"
-msgstr "Bllokuar"
-
-#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Shto te fjalosje"
 
-#  Block button
-#: ../libpurple/protocols/gg/gg.c:1653
-msgid "Unblock"
-msgstr "Zhblloko"
-
-#  Block button
-#: ../libpurple/protocols/gg/gg.c:1657
-msgid "Block"
-msgstr "Blloko"
-
-#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "_Emër fjalosjeje:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Gabim fjalosjeje"
 
-#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Ky emër fjalosjeje është tashmë në përdorim"
 
-#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "I palidhur te shërbyesi."
 
-#: ../libpurple/protocols/gg/gg.c:2021
-#, fuzzy
 msgid "Find buddies..."
-msgstr "Gjej shokë"
+msgstr "Gjeni shokë..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
-#, fuzzy
 msgid "Change password..."
-msgstr "Ndrysho Fjalëkalim..."
+msgstr "Ndryshoni fjalëkalimin..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Eksporto listë shokësh te Shërbyesi"
 
-#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Shkarko listë shokësh prej Shërbyesi"
 
-#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Fshij listë shokësh prej Shërbyesi"
 
-#: ../libpurple/protocols/gg/gg.c:2045
-#, fuzzy
 msgid "Save buddylist to file..."
-msgstr "Ruaj listë shokësh në kartelë"
-
-#: ../libpurple/protocols/gg/gg.c:2049
-#, fuzzy
-msgid "Load buddylist from file..."
-msgstr "Ngarko listë shokësh prej kartele"
+msgstr "Ruaj listë shokësh në kartelë..."
 
 #  *< api_version
 #  *< type
@@ -4287,153 +3314,82 @@ msgstr "Ngarko listë shokësh prej kartele"
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Shtojcë Protokolli Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
-msgstr "IM popullor polak"
+msgstr "MA popullor polak"
 
-#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Përdorues Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Urdhër i panjohur: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "tema e çastit është: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Nuk është caktuar temë"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "Shpërngulja e Kartelave Dështoi"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
-#, fuzzy
 msgid "Could not open a listening port."
-msgstr "Gaim-i  s'mundi të hapë një portë dëgjuese."
+msgstr "S'u hap dot një portë dëgjuese."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Gabim në shfaqjen e MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "S'ka MOTD të mundshme"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Nuk ka MOTD shoqëruar kësaj lidhjeje."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD për %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "Shërbyesi është shkëputur"
 
-#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "Shihni MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Fjalëkalim:"
 
-#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "Nofka IRC nuk duhet të përmbajnë hapësira"
 
 #  connect to the server
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
-msgstr "Po lidhem"
+msgstr "Po bëhet lidhja"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "Suport SSL jo i mundshëm"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "S'munda të krijoj \"socket\""
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "S'munda të lidhem te strehë"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Gabim leximi"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Përdoruesa"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Temë"
 
@@ -4454,67 +3410,28 @@ msgstr "Temë"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Shtojcë Protokolli IRC"
 
 #  *  summary
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Shtojca e Protokollit IRC e cila Është më pak e Bezdishme"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Shërbyes"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portë"
 
-#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kodime"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
-msgid "Username"
-msgstr "Emër përdoruesi"
+msgid "Auto-detect incoming UTF-8"
+msgstr "Vetëzbulo UTF-8 ardhës"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Emër i vërtetë"
 
@@ -4529,172 +3446,137 @@ msgstr "Emër i vërtetë"
 #. 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:960
 msgid "Use SSL"
 msgstr "Përdor SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Mënyrë e gabuar"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Përzënë prej %s nga %s, vendosur %s më parë"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "Ndalim te %s"
+
+msgid "End of ban list"
+msgstr "Fund i listës së ndalimeve"
+
 #, c-format
 msgid "You are banned from %s."
 msgstr "Ju është ndaluar %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "I ndaluar"
 
-#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Nuk mund të ndaloj %s: lista e ndalimeve është plot"
 
-#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikuar)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Nofkë"
 
-#: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Për çastin në"
 
-#: ../libpurple/protocols/irc/msgs.c:334
-#, fuzzy
 msgid "Idle for"
-msgstr "I plogësht"
+msgstr "I plogësht prej"
 
-#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "I lidhur që prej"
 
-#: ../libpurple/protocols/irc/msgs.c:341
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>Mbiemër përcaktues:</b> I lavdishëm<br>"
+msgstr "<b>Mbiemër përcaktues:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
-msgstr ""
+msgstr "I lavdishëm"
 
-#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ka ndryshuar temën në: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "%s has cleared the topic."
-msgstr "%s ka ndryshuar temën në: %s"
+msgstr "%s ka pastruar temën."
 
-#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema për %s është: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mesazh i panjohur '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Mesazh i panjohur "
 
-#: ../libpurple/protocols/irc/msgs.c:449
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "Gaim-i ka dërguar një mesazh që shërbyesi IRC nuk e kuptoi."
+msgstr "Shërbyesi IRC mori një mesazh që nuk e kuptoi."
 
-#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Përdoruesa në %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Kohë Përgjigjjeje"
 
-#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "Koha vendore e shërbyesit IRC është:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "S'ka kanal të tillë"
 
 #  does this happen?
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "s'ka kanal të tillë"
 
-#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Përdoruesi nuk ka hyrë"
 
-#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "S'ka kanal apo nofkë të tillë!"
 
-#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "S'munda të dërgoj"
 
-#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Bashkimi me %s lyp ftesë."
 
-#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Vetëm me ftesa"
 
-#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Jeni përzënë prej %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Përzënë prej %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mënyrë (%s %s) prej %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
-#, fuzzy
 msgid "Invalid nickname"
-msgstr "Emër përdoruesi i Pavlefshëm"
+msgstr "Nofkë e pavlefshme"
 
-#: ../libpurple/protocols/irc/msgs.c:910
-#, fuzzy
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Emri i llogarisë përzgjedhur prej jush u hodh tej nga shërbyesi. Ka të "
-"ngjarë përmban shenja të pavlefshme."
+"Emri i përzgjedhur prej jush si nofkë u hodh tej nga shërbyesi. Ka të ngjarë "
+"përmban shenja të pavlefshme."
 
-#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4702,66 +3584,53 @@ msgstr ""
 "Emri i llogarisë përzgjedhur prej jush u hodh tej nga shërbyesi. Ka të "
 "ngjarë përmban shenja të pavlefshme."
 
-#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "S'ndryshoj dot nofkë"
 
-#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "S'munda të ndryshoj nofkë"
 
-#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Keni ikur prej kanalit%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Gabim: PONG i pavlefshëm prej shërbyesit"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Përgjigje PING-u -- Vonesë: %lu sekonda"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Lipset Regjistrim"
+msgstr "S'hyhet dot te %s: Lypset regjistrim."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "S'bashkohem dot me kanal"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nofka ose kanali është përkohësisht i pamundshëm."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "\"Wallops\" prej %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "veprim &lt;veprim për t'u kryer&gt;:  Kryej një veprim."
 
-#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [mesazh]:  Cakton mesazh largimi, ose nuk fare përdor gjatë kthimit "
+"away [mesazh]:  Cakto mesazh largimi, ose mos përdor mesazh gjatë kthimit "
 "prej largimesh."
 
-#: ../libpurple/protocols/irc/parse.c:124
-#, fuzzy
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <nofkë> <mesazh>, i dërgon nofkës mesazh ctcp-je."
+
 msgid "chanserv: Send a command to chanserv"
-msgstr "quote [...]:  Dërgo një urdhër të papërpunuar te shërbyesi."
+msgstr "chanserv:  Dërgo një urdhër te chanserv."
 
-#: ../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."
@@ -4769,7 +3638,6 @@ msgstr ""
 "deop &lt;nofkë1&gt; [nofkë2] ...:  Hiqi dikujt gjendje operatori kanali. "
 "Duhet të jeni operator kanali pët të bërë këtë."
 
-#: ../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 "
@@ -4779,7 +3647,6 @@ msgstr ""
 "mos e lënë të flasë nëse kanali është i moderuar (+m). Duhet të jeni "
 "operator kanali për të bërë këtë."
 
-#: ../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."
@@ -4787,7 +3654,6 @@ msgstr ""
 "invite &lt;nofkë&gt; [dhomë]:  Ftoni dikë të bashkohet me ju te kanali i "
 "treguar, ose te kanali i çastit."
 
-#: ../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."
@@ -4796,7 +3662,6 @@ msgstr ""
 "shumë kanale, mbase edhe duke dhënë një kyç kanali për secilin nëse "
 "nevojitet."
 
-#: ../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."
@@ -4805,7 +3670,6 @@ msgstr ""
 "më shumë kanale, mbase edhe duke dhënë një kyç kanali për secilin nëse "
 "nevojitet"
 
-#: ../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."
@@ -4813,7 +3677,6 @@ msgstr ""
 "kick &lt;nofkë&gt; [mesazh]:  Hiqni dikë prej një kanali. Duhet të jeni "
 "operator kanali për të bërë këtë."
 
-#: ../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>"
@@ -4821,16 +3684,12 @@ msgstr ""
 "list:  Shfaq një listë dhomash fjalosjeje të rrjetit. <i>Kujdes, disa "
 "shërbyes mund t'ju shkëpusin nëse kryeni këtë.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;veprim për t'u kryer&gt;:  Kryej një veprim."
 
-#: ../libpurple/protocols/irc/parse.c:133
-#, fuzzy
 msgid "memoserv: Send a command to memoserv"
-msgstr "quote [...]:  Dërgo një urdhër të papërpunuar te shërbyesi."
+msgstr "memoserv: Dërgo një urdhër te memoserv"
 
-#: ../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."
@@ -4838,7 +3697,6 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Vër ose hiq mënyrë për "
 "kanal ose përdorues."
 
-#: ../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)."
@@ -4846,21 +3704,19 @@ msgstr ""
 "msg &lt;nofkë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh vetjak "
 "(jo një kanali)."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [kanal]:  Listo përdoruesit e çastit në një kanal."
+msgstr "names [kanal]:  Shfaq përdoruesit e çastit në një kanal."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nofkë e re&gt;:  Ndryshoni nofkën tuaj."
 
-#: ../libpurple/protocols/irc/parse.c:138
-#, fuzzy
 msgid "nickserv: Send a command to nickserv"
-msgstr "quote [...]:  Dërgo një urdhër të papërpunuar te shërbyesi."
+msgstr "nickserv: Dërgo një urdhër te nickserv"
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+"notice &lt;target&lt;:  Dërgoji një përdoruesi a një kanali një njoftim."
 
-#: ../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."
@@ -4868,7 +3724,6 @@ msgstr ""
 "op &lt;nofkë1&gt; [nofkë2] ...:  Jepi dikujt gjendje operatori kanali. Duhet "
 "të jeni operator kanali për të bërë këtë."
 
-#: ../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."
@@ -4876,12 +3731,9 @@ msgstr ""
 "operwall &lt;mesazh&gt;:  Nëse nuk e njihni këtë, ka gjasa të mos arrini ta "
 "përdorni."
 
-#: ../libpurple/protocols/irc/parse.c:141
-#, fuzzy
 msgid "operserv: Send a command to operserv"
-msgstr "quote [...]:  Dërgo një urdhër të papërpunuar te shërbyesi."
+msgstr "operserv: Dërgo një urdhër te operserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4889,7 +3741,6 @@ msgstr ""
 "part [dhomë] [mesazh]:  Lër kanalin e çastit, ose një kanal të treguar, me "
 "një mesazh të mundshëm."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4897,7 +3748,6 @@ msgstr ""
 "ping [nofkë]:  Kontrollon se sa vonesë ka një përdorues (ose shërbyesi, nëse "
 "nuk jepet përdorues)."
 
-#: ../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)."
@@ -4905,16 +3755,13 @@ msgstr ""
 "query &lt;nofkë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh "
 "vetjak (jo një kanali)."
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [mesazh]:  Shkëputu prej një shërbyesi, me një mesazh të mundshëm."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Dërgo një urdhër të papërpunuar te shërbyesi."
 
-#: ../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."
@@ -4922,23 +3769,18 @@ msgstr ""
 "remove &lt;nofkë&gt; [mesazh]:  Hiq dikë prej një dhome. Duhet të jeni "
 "operator kanali për të bërë këtë."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Shfaq kohën vendore të çastit të shërbyesit IRC."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [temë e re]:  Shihni ose ndryshoni temën e kanalit."
 
-#: ../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;:  Vër ose hiq mënyrë përdoruesi."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [nofkë]: dërgo kërkesë CTCP VERSION rreth një përdoruesi"
 
-#: ../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."
@@ -4946,225 +3788,128 @@ msgstr ""
 "voice &lt;nofkë1&gt; [nofkë2] ...:  Dhuro gjendje kanali të zëshme për dikë. "
 "Duhet të jeni operator kanali për të bërë këtë."
 
-#: ../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."
 msgstr ""
 "wallops &lt;mesazh&gt;:  Nëse nuk dini ç'është kjo, mbase nuk e përdorni dot."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;: Merr të dhëna mbi një përdorues."
 
-#: ../libpurple/protocols/irc/parse.c:155
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [server] &lt;nick&gt;: Merr të dhëna mbi një përdorues."
+msgstr "whowas &lt;nick&gt;: Merr të dhëna mbi një përdorues që doli."
 
-#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Kohë përgjigjjeje prej %s: %lu sekonda"
 
-#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "Përgjigje CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../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 "I shkëputur."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Unknown Error"
 msgstr "Gabim i Panjohur "
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Urdhër i çaktivizuar"
+msgstr "Urdhri Ad-Hoc Dështoi"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
 msgid "execute"
-msgstr "I papritur"
+msgstr "përmbush"
 
-#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Shërbyesi lyp TLS/SSL për hyrje. Nuk u gjet suport për TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr "Shërbyesi lyp kodim, por nuk u gjet mbulim për TLS/SSL-në."
+
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "karshi një rrjedhe të pakoduar shërbyesi lyp mirëfilltësim me bazë tekst të "
 "thjeshtë"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"Ky shërbyes lyp mirëfilltësim në trajtë teksti të thjeshtë përmes një "
-"lidhjeje të pakoduar. Ta lejoj këtë dhe të vazhdoj me mirëfilltësimin? "
+"%s lyp mirëfilltësim në trajtë teksti të thjeshtë përmes një lidhjeje të "
+"pakoduar. Ta lejoj këtë dhe të vazhdoj me mirëfilltësimin? "
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr "Mirëfilltësim me bazë Tekst të Thjeshtë"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
-msgid "Server does not use any supported authentication method"
-msgstr "Shërbyesi nuk përdor ndonjë metodë mirëfilltësimi që mbulohet"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "Përgjigje e pavlefshme prej shërbyesit."
 
-#: ../libpurple/protocols/jabber/auth.c:600
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"Ky shërbyes lyp mirëfilltësim në trajtë teksti të thjeshtë përmes një "
-"lidhjeje të pakoduar. Ta lejoj këtë dhe të vazhdoj me mirëfilltësimin? "
+msgid "Server does not use any supported authentication method"
+msgstr "Shërbyesi nuk përdor ndonjë metodë mirëfilltësimi që mbulohet"
 
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
 msgid "Invalid challenge from server"
 msgstr "Sfidë e pavlefshme prej shërbyesit."
 
-#: ../libpurple/protocols/jabber/auth.c:892
-#, fuzzy
 msgid "SASL error"
-msgstr "Gabim fjalosjeje"
+msgstr "Gabim SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Emër i Plotë"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Emër i Familjes"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Emër Tjetër"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Vendndodhje Rruge"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Vendndodhje e Zgjeruar"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Rajon"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Kod Postal"
 
 #  Country
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Vend"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Emër Organizmi"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Njësi Organizative"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "Ditëlindje"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Përshkrim"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "Përpuno vCard për Jabber"
+msgstr "Përpuno vCard për XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5173,98 +3918,56 @@ msgstr ""
 "mendoni se nuk ju prishin punë. "
 
 #  City
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
-#, fuzzy
 msgid "Client"
-msgstr "Qytet"
+msgstr "Klient"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
-msgstr ""
+msgstr "Sistem Operativ"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "Veprimtaria e Fundit"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "Caktoni Të dhëna Drejt."
+msgstr "Të dhëna Zbulimi Shërbimesh"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "Objekte Zbulimi Shërbimesh"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "Vendndodhje e Zgjeruar"
+msgstr "Adresim i Zgjeruar Stanza"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "Alias Fjalosjeje"
+msgstr "Fjalosje me Shumë Përdorues"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "Përdoruesi nuk ka të dhëna drejtorie."
+msgstr "Të dhëna Pranie të Zgjeruar në Fjalosje me Shumë Përdorues"
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Urdhër"
+msgstr "Urdhra Ad-Hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "Shërbim PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "SOCKS5 Bytestreams"
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
-msgstr ""
+msgstr "Pa të Dhëna Bande"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "XHTML-IM"
-msgstr ""
+msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "Gabim Regjistrimi"
+msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "Vendndodhje"
+msgstr "Vendndodhje Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Avatar"
-msgstr ""
+msgstr "Avatar Përdoruesi"
 
 #  *< api_version
 #  *< type
@@ -5273,271 +3976,148 @@ msgstr ""
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "Njoftim Gjendjeje Shoku"
+msgstr "Njoftime Gjendjeje Fjalosjeje"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "Version i Pambuluar"
+msgstr "Version Software-i"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "Të dhëna Shërbyesi"
+msgstr "Fillim Rrjedhe"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
-#, fuzzy
 msgid "File Transfer"
-msgstr "Shpërngulje Kartelash"
+msgstr "Shpërngulje Kartele"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "Mënyra Përdoruesi"
+msgstr "Humor Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "Kufi Përdoruesi"
+msgstr "Veprimtari Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "Aftësi"
+msgstr "Aftësi Njësie"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Negociata Sesioni të Koduar"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "Emër përdoruesi"
+msgstr "Melodi Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 #, fuzzy
 msgid "Roster Item Exchange"
-msgstr "IM me Shkëmbim Kyçesh"
+msgstr "Shkëmbim Objektesh Roster"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 #, fuzzy
 msgid "Reachability Address"
-msgstr "Vendndodhje Email"
+msgstr "Vendndodhje Kapshmërie"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "Profil MSN"
+msgstr "Profil Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
 msgid "Jingle"
-msgstr "Ping"
+msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Audio Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "Nofkë"
+msgstr "Nofkë Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
-msgstr ""
+msgstr "Jingle Raw UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "Live Video"
+msgstr "Video Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Jingle DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
 msgid "Message Receipts"
-msgstr "Mesazh i marrë"
+msgstr "Fatura Mesazhesh"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
 msgid "Public Key Publishing"
-msgstr "\"Babbleprint\" Kyçi Publik"
+msgstr "Botim Kyçi Publik"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "Mundësi Përdoruesi"
+msgstr "Fjalosje Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
 msgid "User Browsing"
-msgstr "Mënyra Përdoruesi"
+msgstr "Shfletim Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
 msgid "User Gaming"
-msgstr "Kufi Përdoruesi"
+msgstr "Lojë Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
 msgid "User Viewing"
-msgstr "Kufi Përdoruesi"
+msgstr "Parje Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Kodim Trillian"
+msgstr "Kodim Stanza"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
-msgstr ""
+msgstr "Kohë Njësie"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "Dërgim i Vonuar"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
-msgstr ""
+msgstr "Objekte Të Dhënash Bashkëpunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
-msgstr ""
+msgstr "Depo Kartelash dhe Ndarje"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgstr "STUN Service Discovery për Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "Negociata Sesioni të Koduar të Thjeshtëzuar"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Capabilities"
 msgstr "Aftësi"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
-msgid "Resource"
-msgstr "Burime"
-
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "Përparësi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Burime"
+
 msgid "Middle Name"
 msgstr "Emër i Mesit"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Vendndodhje"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Çfshih Prej"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Fshih Përkohësisht Prej"
 
 #  && NOT ME
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Anulo Njoftim Pranie"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "(Ri-)Kërko autorizim"
 
@@ -5547,878 +4127,580 @@ msgstr "(Ri-)Kërko autorizim"
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "Çregjistrohu"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
 msgid "Log In"
-msgstr "Hyrje"
+msgstr "Hyni"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
 msgid "Log Out"
-msgstr "Mundësi Futjeje"
+msgstr "Dilni"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Muhabetçi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Larguar e Zgjeruar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Mos Bezdis"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
 #  Last Name
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "Mbiemër"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "Çka vijon është përfundimi i kërkimit tuaj"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
+"Gjeni një kontakt duke dhënë kriter kërkimi te fushat e caktuara. Shënim: "
+"Secila fushë pranon edhe kërkime përmes shenjash të gjithëpushtetshme (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
-#, fuzzy
 msgid "Directory Query Failed"
-msgstr "Lidhja e Drejtpërdrejtë dështoi"
+msgstr "Kërkimi për Drejtori Dështoi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
-#, fuzzy
 msgid "Could not query the directory server."
-msgstr "S'munda të nis shpërnguljen e kartelës"
+msgstr "Nuk u kërkua dot te shërbyesi i drejtorisë"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
-#, fuzzy, c-format
+#, c-format
 msgid "Server Instructions: %s"
-msgstr "Të dhëna Shërbyesi"
+msgstr "Udhëzime Shërbyesi: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
-"Plotësoni një ose më tepër fusha për kërkim të cilitdo përdorues Jabber që "
-"ka përputhje."
+"Plotësoni një ose më tepër kuti për të kërkuar përputhje me cilindo "
+"përdorues XMPP"
 
-#  Email Address
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#  E-Mail Address
 msgid "Email Address"
 msgstr "Vendndodhje Email"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "Kërko për përdorues"
+msgstr "Kërko për përdoruesa XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Kërko"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "Drejtori e Pavlefshme"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "Jepni Drejtori Përdoruesi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "Përzgjidhni drejtori përdoruesi për kërkim"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "Drejtori Kërkimi:"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Dhomë:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Shërbyes:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Nofkë:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s nuk është emër i vlefshëm dhome"
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Emër i Pavlefshëm Dhome"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s nuk është emër i vlefshëm shërbyesi"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Emër i Pavlefshëm Shërbyesi"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s nuk është një nofkë e vlefshme dhome"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Nofkë e Pavlefshme Dhome"
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Gabim formësimi"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "I pazoti të formësoj"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Gabim Formësimi Dhome "
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Kjo dhomë nuk është e aftë të formësohet"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Gabim regjistrimi"
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Ndryshim nofke jo i mbuluar në dhoma fjalosjeje jo-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Gabim në marrje liste dhome"
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Shërbyes i Pavlefshëm"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Jepni një Shërbyes Konferencash"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Përzgjidhni një shërbyes konferencash për kërkesë"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Gjej Dhoma"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Gabim në gatitjen e sesionit"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Kërkoni kodim, por ky nuk është i mundshëm në këtë shërbyes."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "Gabim shkrimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+msgid "Ping timeout"
+msgstr "Skadim kohe për ping-un"
+
 msgid "Read Error"
 msgstr "Gabim Leximi"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
+"Nuk u vendos dot lidhje me shërbyesin:\n"
+"%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr "I pazoti të krijoj \"socket\""
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#, fuzzy
 msgid "Invalid XMPP ID"
-msgstr "ID i Pavlefshëm"
+msgstr "ID XMPP i pavlefshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "ID XMPP i pavlefshëm. Duhet caktuar përkatësia."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Regjistrim i %s@%s i suksesshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Regjistrim i %s@%s i suksesshëm"
+msgstr "Regjistrim i sukseshëm te %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr "Regjistrim i Sukseshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "Dështoi Regjistrimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Regjistrim i %s@%s i suksesshëm"
+msgstr "U hoq me sukses regjistrimi te %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "Regjistrim i Sukseshëm"
+msgstr "Çregjistrim i Suksesshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "Dështoi Regjistrimi"
+msgstr "Çregjistrimi Dështoi"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "Tashmë i Regjistruar"
 
 #  State
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "Shtet"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
-#, fuzzy
 msgid "Postal code"
 msgstr "Kod Postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "Datë"
 
 #  Register button
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
 msgid "Unregister"
-msgstr "Regjistrohuni"
+msgstr "Çregjistrohuni"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
-"Për të regjistruar llogarinë tuaj të re, ju lutem plotësoni të dhënat më "
-"poshtë. "
+"Për ndryshimin e regjistrimit të llogarisë suaj, ju lutem plotësoni të "
+"dhënat më poshtë. "
 
-#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Për të regjistruar llogarinë tuaj të re, ju lutem plotësoni të dhënat më "
 "poshtë. "
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "Regjistro Llogari të Re Jabber"
+msgstr "Regjistro Llogari të Re XMPP"
 
 #  Register button
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "Regjistrohuni"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Ndrysho të dhëna përdoruesi për %s"
+msgstr "Ndryshoni Regjistrim Llogarie te %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Regjistro Llogari të Re Jabber"
+msgstr "Regjistro Llogari të Re te %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
 msgid "Change Registration"
-msgstr "Gabim Regjistrimi"
+msgstr "Ndrysho Regjistrimin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "Gabim në Ndryshim Të dhënash Llogarie"
+msgstr "Gabim në çregjistrimin e llogarisë"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "Llogaria u çregjistrua me sukses"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
-msgstr "Po gatis Rrjedhë"
+msgstr "Po gatitet Rrjedha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Po gatis Rrjedhë"
+msgstr "Po gatitet SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
-msgstr "po mirëfilltësoj"
+msgstr "Po kryhet mirëfilltësimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
-msgstr "Po rigatis Rrjedhë"
-
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+msgstr "Po rigatitet Rrjedha"
+
 msgid "Not Authorized"
 msgstr "I pa Autorizuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "Të dyja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "Prej (Në pritje)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From"
 msgstr "Prej"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "Për"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "Askujt (Në pritje)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Asnjë"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "Regjistrim"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Humor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
+msgid "Now Listening"
+msgstr "Në Dëgjim"
+
 msgid "Mood Text"
-msgstr "Humor"
+msgstr "Tekst Humori"
+
+msgid "Allow Buzz"
+msgstr "Lejo Buzz"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
 msgid "Tune Artist"
-msgstr ""
+msgstr "Autor Melodie "
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
 msgid "Tune Title"
-msgstr "Titull"
+msgstr "Titull Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
 msgid "Tune Album"
-msgstr ""
+msgstr "Album Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
 msgid "Tune Genre"
-msgstr ""
+msgstr "Zhanër Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
 msgid "Tune Comment"
-msgstr "Koment Shoku"
+msgstr "Koment Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
 msgid "Tune Track"
-msgstr ""
+msgstr "Gjurmë Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
 msgid "Tune Time"
-msgstr ""
+msgstr "Kohë Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
 msgid "Tune Year"
-msgstr ""
+msgstr "Vit Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
 msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "Lejo"
+msgstr "URL Melodie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "Fjalëkalim i Ndryshuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "Fjalëkalimi juaj është ndryshuar."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "Gabim në ndryshim fjalëkalimi "
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "Fjalëkalim (sërish)"
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "Ndrysho Fjalëkalim"
+msgstr "Ndrysho Fjalëkalimin për XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "Ju lutem jepni fjalëkalimin tuaj të ri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Caktoni Të dhëna Përdoruesi."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Ndrysho Fjalëkalim..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
-#, fuzzy
 msgid "Search for Users..."
-msgstr "Kërko për përdorues"
+msgstr "Kërko për Përdoruesa..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr "Kërkesë e Gabuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "Kundërshti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "Karakteristikë e Pajetësuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "E ndaluar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "Ikur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "Gabim i Brendshëm Shërbyesi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "Objekt i Pagjetur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "ID Jabber-i i Keqformësuar"
+msgstr "ID XMPP-je i Keqformësuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "I papranueshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "I palejuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "Lipset Pagesë"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "Marrës i Pavlefshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "Lipset Regjistrim"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "Nuk u Gjet Shërbyes i Largët"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "Mbaroi Koha për Shërbyes të Largët"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "Shërbyes i Mbingarkuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr "Shërbim i Pamundshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr "Lipset Abonim"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr "Kërkesë e Papritur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr "Autorizimi u Ndërpre"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "Kodim i pasaktë te mirëfilltesimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "ID autorizimi i pavlefshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "Mekanizëm Autorizimi i Pasaktë"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr "Mekanizëm autorizimi tepër i dobët"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr "Dështim Mirëfilltësimi të Përkohshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "Dështim Mirëfilltësimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr "Format i Gabuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr "Parashtesë e Gabuar Emërhapësire"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "Kundërshti Burimesh"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Skadim Lidhjeje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr "Strehë e Humbur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr "Strehë e Panjohur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "Drejtim i Pasaktë"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "ID i Pavlefshëm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "Emërhapësirë e Pavlefshme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "XML e Pavlefshme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr "Strehë të Papërputhshme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "Dhunim Rregullash"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "Dështoi Lidhja e Largët"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "Kufizim Burimesh"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "XML i Kufizuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr "Shih Tjetër Strehë"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr "Fikje Sistemi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "Kusht i Papërcaktuar "
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "Kodim i Pambuluar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr "Tip Stanza i Pambuluar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "Version i Pambuluar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr "XML Jo e MirëFormuar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "Gabim Rrjedhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "I pazoti të ndaloj përdoruesin %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Degëzim i panjohur: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "I pazoti të degëzoj përdoruesin %s si \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Urdhër i panjohur: %s"
+msgstr "Rol i panjohur: \"%s\""
 
 #  TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/jabber/jabber.c:2101
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "I pazoti të dërgoj mesazh: %s"
+msgstr "I pazoti të caktoj rolin \"%s\" për përdoruesin: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "I pazoti të përzë përdoruesin %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "I pazoti të ndaloj përdoruesin %s"
+msgstr "I pazoti të dërgoj ping për përdoruesin %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgstr "Nuk i dërgohet dot bzzzz, ngaqë nuk njihet gjë rreth përdoruesit %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
+"Nuk i dërgohet dot bzzzz, ngaqë përdoruesi %s mund të jetë i shkëputur."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "I pazoti të luaj tingull sepse kartela e zgjedhur (%s) nuk ekziston."
+msgstr ""
+"I pazoti të dërgoj bzzz, ngaqë përdoruesi %s nuk mbulon veprim të tillë."
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr "Buzz"
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s ju ka dërguar bzzz!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Po dërgohet bzzz për %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr "config:  Formëso një dhomë fjalosjeje."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Formëso një dhomë fjalosjeje."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [dhomë]:  Lër dhomë."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register:  Regjistrohu te një dhomë fjalosjeje."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [temë e re]:  Shihni ose ndryshoni temën."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;përdorues&gt; [dhomë]:  Ndaloji një përdoruesi dhomën."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;përdorues&gt; [arsye]:  Ndaloji një përdoruesi dhomën."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6426,44 +4708,34 @@ msgstr ""
 "degëzon &lt;përdorues&gt; &lt;zotërues|admin|anëtar|outcast|asnjë&gt;: "
 "Vendos lidhjen e përdoruesit me dhomën."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
-#, fuzzy
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-"degëzon &lt;përdorues&gt; &lt;zotërues|admin|anëtar|outcast|asnjë&gt;: "
-"Vendos lidhjen e përdoruesit me dhomën."
+"rol &lt;përdorues&gt; &lt;moderator|pjesëmarrës|vizitor|asnjë&gt;: Cakto rol "
+"përdoruesi në dhomë."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;përdorues&gt; [mesazh]:  Fto një përdorues te dhoma."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr ""
-"join: &lt;dhomë&gt; [shërbyes]:  Bashkoju një fjalosjeje në këtë shërbyes."
+"join: &lt;dhomë&gt; [fjalëkalim]:  Hyni një një fjalosje te ky shërbyes."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;përdorues&gt; [dhomë]:  Përzër një përdorues prej dhomës."
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;përdorues&gt; [arsye]:  Përzër një përdorues prej dhomës."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;përdorues&gt; &lt;mesazh&gt;:  Dërgo një mesazh vetjak një "
 "përdoruesi tjetër."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tDërgojini ping një përdoruesi/përbërësi/shërbyesi."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
-#, fuzzy
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Tërhiqi vëmendjen një kontakti"
+msgstr "buzz: Bzzzzzzzzz një përdorues për t'i tërhequr vëmendjen"
 
 #  *< api_version
 #  *< type
@@ -6486,34 +4758,22 @@ msgstr "buzz: Tërhiqi vëmendjen një kontakti"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "Shtojcë Protokolli MSN"
+msgstr "Shtojcë Protokolli XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
-#, fuzzy
 msgid "Domain"
-msgstr "Rumune"
+msgstr "Përkatësi"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#, fuzzy
 msgid "Require SSL/TLS"
-msgstr "Lyp LTS"
+msgstr "Lyp SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "Detyro SSL të vjetër (porta 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Lejo autorizim në formë teksti të thjeshtë në rrjedha të pakoduara"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "Portë lidhjeje"
 
@@ -6521,68 +4781,48 @@ msgstr "Portë lidhjeje"
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Lidhu me shërbyes"
 
-#: ../libpurple/protocols/jabber/message.c:106
-#, fuzzy, c-format
+msgid "File transfer proxies"
+msgstr "Ndërmjetësa shpërnguljesh kartelash"
+
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s është ftuar te ky bashkëbisedim."
+msgstr "%s e la bashkëbisedimin."
 
-#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "Mesazh prej %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ka caktuar si temë: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "Tema është: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Dështoi shpërndarja e mesazhit për %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Gabim Mesazhi Jabber "
+msgstr "Gabim Mesazhi XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "Përdoruesi ju ka bllokuar"
-
-#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
-msgid " (Code %s)"
+msgid "(Code %s)"
 msgstr " (Kod %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Gabim përtypjeje XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Gabim i Panjohur te prania"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Krijo Dhomë të Re"
 
-#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6590,123 +4830,90 @@ msgstr ""
 "Po krijoni një dhomë të re.  Do të donit ta formësoni, apo pranoni "
 "rregullimet parazgjedhje?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
-#, fuzzy
 msgid "_Configure Room"
-msgstr "Formëso Dhomë"
+msgstr "_Formësoni Dhomën"
 
-#: ../libpurple/protocols/jabber/presence.c:517
-#, fuzzy
 msgid "_Accept Defaults"
-msgstr "Prano Parazgjedhjet"
+msgstr "_Prano Parazgjedhjet"
 
-#: ../libpurple/protocols/jabber/presence.c:559
-#, c-format
-msgid "Error in chat %s"
-msgstr "Gabim në fjalosje %s"
-
-#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Gabim në hyrjen te fjalosje %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#, c-format
+msgid "Error in chat %s"
+msgstr "Gabim në fjalosje %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "I pazoti të dërgoj kartelë te %s, përdoruesi nuk mbulon shpërngulje kartelash"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Dështoi Dërgimi i Kartelës  "
 
 #  TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/jabber/si.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "I pazoti të dërgoj mesazh te %s."
+msgstr "I pazoti të dërgoj mesazh te %s, JID i pavlefshëm"
 
-#: ../libpurple/protocols/jabber/si.c:840
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"I pazoti të dërgoj kartelë te %s, përdoruesi nuk mbulon shpërngulje kartelash"
+msgstr "I pazoti të dërgoj kartelë te %s, përdoruesi nuk është i lidhur"
 
-#: ../libpurple/protocols/jabber/si.c:842
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"I pazoti të dërgoj kartelë te %s, përdoruesi nuk mbulon shpërngulje kartelash"
+msgstr "I pazoti të dërgoj kartelë te %s, pa pajtim te prani përdoruesi"
 
-#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
+"Ju lutem përzgjidhni burimin e %s te i cili dëshironi të dërgoni një kartelë"
 
-#: ../libpurple/protocols/jabber/si.c:873
-#, fuzzy
 msgid "Select a Resource"
-msgstr "Përzgjidhni një kartelë"
+msgstr "Përzgjidhni Burim"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
 msgid "Edit User Mood"
-msgstr "Mënyra Përdoruesi"
+msgstr "Përpunoni Humor Përdoruesi"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Ju lutem përzgjidhni  prej listës humorin tuaj."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
-#: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "_Caktoni"
+msgstr "Caktoni"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
 msgid "Set Mood..."
-msgstr "U ruajt..."
+msgstr "Caktoni Humor..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Caktoni Kufi Përdoruesi"
+msgstr "Caktoni Nofkë Përdoruesi"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
-msgstr ""
+msgstr "Ju lutem caktoni një nokë të re për veten."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"Këto të dhëna janë të dukshme për tërë kontaktet në listën tuaj të "
+"kontakteve, ndaj zgjidhni diçka të përshtatshme."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "Nofkë"
+msgstr "Caktoni Nofkë..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "Llogari"
+msgstr "Veprime"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "Përzgjidhni një kartelë"
+msgstr "Përzgjidhni veprim"
+
+msgid "Unable to retrieve MSN Address Book"
+msgstr "I pazoti të marr Libër Vendndodhjesh MSN"
 
-#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problem njëkohësimi liste shokësh në %s (%s)"
 
-#: ../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. "
@@ -6715,7 +4922,6 @@ msgstr ""
 "%s i listës vendore është brenda grupit \"%s\" por jo në listën e "
 "shërbyesit. Doni të shtohet ky shok?"
 
-#: ../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 "
@@ -6724,332 +4930,262 @@ msgstr ""
 "%s është në listën vendore por jo në listën e shërbyesit. Doni të shtohet ky "
 "shok?"
 
-#: ../libpurple/protocols/msn/error.c:36
 #, c-format
 msgid "Unable to parse message"
 msgstr "I pazoti të përtyp mesazh"
 
-#: ../libpurple/protocols/msn/error.c:41
-#, fuzzy, c-format
+#, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "Gabim Sintakse (mundet një e metë Gaim-i)"
+msgstr "Gabim Sintakse (mundet një e metë klienti)"
 
-#: ../libpurple/protocols/msn/error.c:46
 #, c-format
 msgid "Invalid email address"
 msgstr "Vendndodhje email e pavlefshme"
 
-#: ../libpurple/protocols/msn/error.c:49
 #, c-format
 msgid "User does not exist"
 msgstr "Përdoruesi nuk ekziston"
 
-#: ../libpurple/protocols/msn/error.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "Fully qualified domain name missing"
-msgstr "Emër Përkatësie Plotësisht i Përcaktuar mungues"
+msgstr "Mungon emri i përkatësisë plotësisht i përcaktuar"
 
-#: ../libpurple/protocols/msn/error.c:56
-#, fuzzy, c-format
+#, c-format
 msgid "Already logged in"
-msgstr "Tashmë i Futur"
+msgstr "Tashmë i futur"
 
-#: ../libpurple/protocols/msn/error.c:59
-#, fuzzy, c-format
-msgid "Invalid screen name"
-msgstr "Emër përdoruesi i Pavlefshëm"
+#, c-format
+msgid "Invalid username"
+msgstr "Emër përdoruesi i pavlefshëm"
 
-#: ../libpurple/protocols/msn/error.c:62
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid friendly name"
-msgstr "Emër Miqësor i Pavlefshëm"
+msgstr "Emër miqësor i pavlefshëm"
 
-#: ../libpurple/protocols/msn/error.c:65
-#, fuzzy, c-format
+#, c-format
 msgid "List full"
-msgstr "Lista Plot"
+msgstr "Lista plot"
 
-#: ../libpurple/protocols/msn/error.c:68
 #, c-format
 msgid "Already there"
 msgstr "Tashmë atje"
 
-#: ../libpurple/protocols/msn/error.c:72
 #, c-format
 msgid "Not on list"
 msgstr "Jo në listë"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "User is offline"
 msgstr "Përdoruesi është i palidhur"
 
-#: ../libpurple/protocols/msn/error.c:78
 #, c-format
 msgid "Already in the mode"
 msgstr "Tashmë në atë mënyrë"
 
-#: ../libpurple/protocols/msn/error.c:82
 #, c-format
 msgid "Already in opposite list"
 msgstr "Tashmë në listë kundërshtare"
 
-#: ../libpurple/protocols/msn/error.c:86
 #, c-format
 msgid "Too many groups"
 msgstr "Shumë grupe"
 
-#: ../libpurple/protocols/msn/error.c:89
 #, c-format
 msgid "Invalid group"
 msgstr "Grup i pavlefshëm"
 
-#: ../libpurple/protocols/msn/error.c:92
 #, c-format
 msgid "User not in group"
 msgstr "Përdorues jo i grupit"
 
-#: ../libpurple/protocols/msn/error.c:95
 #, c-format
 msgid "Group name too long"
 msgstr "Emër grupi shumë i gjatë"
 
-#: ../libpurple/protocols/msn/error.c:98
 #, c-format
 msgid "Cannot remove group zero"
 msgstr "S'heq dot grup zero"
 
-#: ../libpurple/protocols/msn/error.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Përpjekje për të shtuar kontakt te një grup që nuk ekziston"
+msgstr "Përpjekje për shtim përdoruesi te një grup që nuk ekziston"
 
-#: ../libpurple/protocols/msn/error.c:107
 #, c-format
 msgid "Switchboard failed"
 msgstr "\"Switchboard-i\" dështoi"
 
-#: ../libpurple/protocols/msn/error.c:111
-#, fuzzy, c-format
+#, c-format
 msgid "Notify transfer failed"
-msgstr "Njoftimi i Shpërnguljes dështoi"
+msgstr "Njoftimi i shpërnguljes dështoi"
 
-#: ../libpurple/protocols/msn/error.c:116
 #, c-format
 msgid "Required fields missing"
 msgstr "Mungojnë fusha të nevojshme"
 
-#: ../libpurple/protocols/msn/error.c:120
 #, c-format
 msgid "Too many hits to a FND"
 msgstr "Shumë goditjeje te në FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
 #, c-format
 msgid "Not logged in"
 msgstr "Jo i futur."
 
-#: ../libpurple/protocols/msn/error.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Service temporarily unavailable"
-msgstr "Shërbim Përkohësisht i Pamundshëm"
+msgstr "Shërbim përkohësisht i pakapshëm"
 
-#: ../libpurple/protocols/msn/error.c:131
 #, c-format
 msgid "Database server error"
 msgstr "Gabim shërbyesi baze të dhënash"
 
-#: ../libpurple/protocols/msn/error.c:135
 #, c-format
 msgid "Command disabled"
 msgstr "Urdhër i çaktivizuar"
 
-#: ../libpurple/protocols/msn/error.c:139
 #, c-format
 msgid "File operation error"
 msgstr "Gabim Veprimi mbi Kartelë"
 
-#: ../libpurple/protocols/msn/error.c:143
 #, c-format
 msgid "Memory allocation error"
 msgstr "Gabim sigurimi kujtese"
 
-#: ../libpurple/protocols/msn/error.c:147
 #, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Dërguar te shërbyesi vlerë CHL e gabuar"
 
-#: ../libpurple/protocols/msn/error.c:152
 #, c-format
 msgid "Server busy"
 msgstr "Shërbyes i zënë"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
 #, c-format
 msgid "Server unavailable"
 msgstr "Shërbyes i pavlefshëm"
 
-#: ../libpurple/protocols/msn/error.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "Peer notification server down"
-msgstr "Shërbyes Njoftimi Ortakësh jashtë funksionimi"
+msgstr "Shërbyes njoftimi ortakësh jashtë funksionimi"
 
-#: ../libpurple/protocols/msn/error.c:162
 #, c-format
 msgid "Database connect error"
 msgstr "Gabim lidhjeje me bazë të dhënash"
 
-#: ../libpurple/protocols/msn/error.c:167
 #, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "Shërbyesi po fiket (hidhuni prej anijes)"
+msgstr "Shërbyesi po fiket (të shpëtojë kush mundet nga anija)"
 
-#: ../libpurple/protocols/msn/error.c:174
 #, c-format
 msgid "Error creating connection"
 msgstr "Gabim në krijimin e lidhjes"
 
-#: ../libpurple/protocols/msn/error.c:179
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametrat CVR ose janë të panjohur ose të palejuar"
 
-#: ../libpurple/protocols/msn/error.c:183
 #, c-format
 msgid "Unable to write"
 msgstr "I pazoti të shkruaj"
 
-#: ../libpurple/protocols/msn/error.c:186
 #, c-format
 msgid "Session overload"
 msgstr "Sesion i mbingarkuar"
 
-#: ../libpurple/protocols/msn/error.c:190
 #, c-format
 msgid "User is too active"
 msgstr "Përdoruesi është shumë veprues"
 
-#: ../libpurple/protocols/msn/error.c:193
 #, c-format
 msgid "Too many sessions"
 msgstr "Shumë sesione"
 
-#: ../libpurple/protocols/msn/error.c:196
 #, c-format
 msgid "Passport not verified"
 msgstr "Fjalëkalim i paverifikuar"
 
-#: ../libpurple/protocols/msn/error.c:199
 #, c-format
 msgid "Bad friend file"
 msgstr "Kartelë miku e dëmtuar"
 
-#: ../libpurple/protocols/msn/error.c:203
 #, c-format
 msgid "Not expected"
 msgstr "I papritur"
 
-#: ../libpurple/protocols/msn/error.c:209
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Emri miqësor ndryshon shumë shpejt "
 
-#: ../libpurple/protocols/msn/error.c:218
 #, c-format
 msgid "Server too busy"
 msgstr "Shërbyesi shumë i zënë"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
 #, c-format
 msgid "Authentication failed"
 msgstr "Dështoi mirëflltësimi"
 
-#: ../libpurple/protocols/msn/error.c:225
 #, c-format
 msgid "Not allowed when offline"
 msgstr "E palejueshme kur jeni të lidhur"
 
-#: ../libpurple/protocols/msn/error.c:233
 #, c-format
 msgid "Not accepting new users"
 msgstr "Nuk pranohen përdorues të rinj"
 
-#: ../libpurple/protocols/msn/error.c:237
 #, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Pasaportë të Vegjlish pa miratim prindi"
 
-#: ../libpurple/protocols/msn/error.c:241
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Llogari pasaporte ende e paverifikuar"
 
-#: ../libpurple/protocols/msn/error.c:244
 #, c-format
 msgid "Bad ticket"
 msgstr "Biletë e pavlefshme"
 
-#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Kod i Panjohur Gabimi %d"
 
-#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Gabim MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s është larguar."
+msgstr "%s ju ka prekur me bërryl!"
 
-#: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:174
+#  E-Mail Address
+msgid "Email Address..."
+msgstr "Vendndodhje Email..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Emri juaj miqësor MSN është shumë i gjatë."
 
-#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Caktoni ermin tuaj miqësor."
 
-#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ky është emri me të cilin do t'ju shohin shokë të tjerë MSN-së."
 
-#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Vini numrin tuaj të telefonit."
 
-#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Caktoni numrin e telefonit tuaj të punës."
 
-#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Caktoni numrin e telefonit tuaj celular."
 
-#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Të lejoj faqe MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:351
 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?"
@@ -7057,355 +5193,246 @@ msgstr ""
 "Doni të lejoj ose jo persona në listën tuaj t'ju dërgojnë faqe MSN Mobile në "
 "celularin tuaj ose të tjera pajisje të ngjashme?"
 
-#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Lejo"
 
-#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Ndalo"
 
-#: ../libpurple/protocols/msn/msn.c:374
-msgid "This Hotmail account may not be active."
-msgstr "Kjo llogari Hotmail mund të mos jetë vepruese."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Tekst i Bllokuar për %s"
+
+msgid "No text is blocked for this account."
+msgstr "Nuk ka tekst të bllokuar për këtë llogari."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"Shërbyesat MSN e tanishëm i bllokojnë shprehjet e rregullta vijuese:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Kjo llogari nuk e ka veprues email-in."
 
-#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Dërgo një mesazh celulari."
 
-#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Faqe"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Ju ka"
+msgid "Home Phone Number"
+msgstr "Numër Telefoni i Shtëpisë"
+
+msgid "Work Phone Number"
+msgstr "Numër Telefoni i Punës"
+
+msgid "Mobile Phone Number"
+msgstr "Numër Telefoni Celular"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "Erdha"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../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:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "I zënë"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
-#, fuzzy
 msgid "On the Phone"
 msgstr "Në Telefon"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
-#, fuzzy
 msgid "Out to Lunch"
 msgstr "Jashtë Për Drekë"
 
-#: ../libpurple/protocols/msn/msn.c:619
-#, fuzzy
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+msgid "Artist"
+msgstr "Artist"
+
+msgid "Album"
+msgstr "Album"
+
 msgid "Set Friendly Name..."
-msgstr "Caktoni Emër Miqësor"
+msgstr "Caktoni Emër Miqësor..."
 
-#: ../libpurple/protocols/msn/msn.c:624
-#, fuzzy
 msgid "Set Home Phone Number..."
-msgstr "Vini Numër Telefoni të Shtëpisë"
+msgstr "Vini Numër Telefoni të Shtëpisë..."
 
-#: ../libpurple/protocols/msn/msn.c:628
-#, fuzzy
 msgid "Set Work Phone Number..."
-msgstr "Vini Numër Telefoni të Punës"
+msgstr "Vini Numër Telefoni të Punës..."
 
-#: ../libpurple/protocols/msn/msn.c:632
-#, fuzzy
 msgid "Set Mobile Phone Number..."
-msgstr "Caktoni Numër Telefoni Celular"
+msgstr "Vini Numër Telefoni Celular..."
 
-#: ../libpurple/protocols/msn/msn.c:638
-#, fuzzy
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Aktivizoni/Çaktivizoni Pajisje të Lëvizshme"
+msgstr "Aktivizoni/Çaktivizoni Pajisje të Lëvizshme..."
 
-#: ../libpurple/protocols/msn/msn.c:643
-#, fuzzy
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Lejo/Mos lejo Faqe Celulari"
+msgstr "Lejo/Mos lejo Faqe Celulari..."
+
+msgid "View Blocked Text..."
+msgstr "Shihni Tekst të Bllokuar..."
 
-#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Hap Hotmail Inbox"
 
-#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Dërgoje te Celular"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Nis _Fjalosje"
 
-#: ../libpurple/protocols/msn/msn.c:726
-#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"Lipset mbulim SSL për MSN. Ju lutem instaloni një librari suporti SSL. Për "
-"më tepër të dhëna shihni http://gaim.sf.net/faq-ssl.php."
+msgstr "Lypset mbulim SSL për MSN. Ju lutem instaloni një librari suporti SSL."
 
-#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Dështova të lidhem me shërbyesin."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Gabim në marrje profili"
 
 #  Gender
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
-#, fuzzy
 msgid "General"
-msgstr "Gjini"
+msgstr "Të përgjithshme"
 
 #  Age
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Moshë"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Punësim"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Vendndodhje"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "Hobi dhe Interese"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "Pakëz Rreth Meje"
 
-#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
-msgstr ""
+msgstr "Shoqërore"
 
-#: ../libpurple/protocols/msn/msn.c:1621
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Gjendje Civile"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#, fuzzy
 msgid "Interests"
-msgstr "Përmbys"
+msgstr "Interesa"
 
-#: ../libpurple/protocols/msn/msn.c:1623
-#, fuzzy
 msgid "Pets"
-msgstr "Porta"
+msgstr "Kafshë Shtëpiake"
 
-#: ../libpurple/protocols/msn/msn.c:1624
-#, fuzzy
 msgid "Hometown"
-msgstr "Strehë e Panjohur"
+msgstr "Vendlindja"
 
-#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
-msgstr ""
+msgstr "Vende Ku Është Rrojtur"
 
-#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
-msgstr ""
+msgstr "Modë"
 
-#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
-msgstr ""
+msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
-msgstr ""
+msgstr "Muzikë"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Thënie e Pëlqyer "
 
-#: ../libpurple/protocols/msn/msn.c:1646
-#, fuzzy
 msgid "Contact Info"
-msgstr "Të dhëna Llogarie "
+msgstr "Të dhëna Kontakti"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#, fuzzy
 msgid "Personal"
-msgstr "Titullin Vetjak"
+msgstr "Vetjake"
 
-#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
-msgstr ""
+msgstr "Tjetër i Rëndësishëm"
 
-#: ../libpurple/protocols/msn/msn.c:1651
-#, fuzzy
 msgid "Home Phone"
-msgstr "Faqe Hyrëse"
+msgstr "Telefoni i Shtëpisë"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#, fuzzy
 msgid "Home Phone 2"
-msgstr "Vini Numër Telefoni të Shtëpisë"
+msgstr "Telefoni i Shtëpisë 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "Vendndodhje Shtëpie"
 
-#: ../libpurple/protocols/msn/msn.c:1654
-#, fuzzy
 msgid "Personal Mobile"
-msgstr "Titullin Vetjak"
+msgstr "Celular Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1655
-#, fuzzy
 msgid "Home Fax"
-msgstr "Faqe Hyrëse"
+msgstr "Faks Shtëpie"
 
-#: ../libpurple/protocols/msn/msn.c:1656
-#, fuzzy
 msgid "Personal Email"
-msgstr "Titullin Vetjak"
+msgstr "Email Vetjak"
 
-#: ../libpurple/protocols/msn/msn.c:1657
-#, fuzzy
 msgid "Personal IM"
-msgstr "Titullin Vetjak"
+msgstr "MA Personale"
 
-#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
-msgstr ""
+msgstr "Përvjetor"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
-msgstr ""
+msgstr "Punë"
 
-#: ../libpurple/protocols/msn/msn.c:1677
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Vend Pune"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "Shoqëri"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Degë"
 
-#: ../libpurple/protocols/msn/msn.c:1680
-#, fuzzy
 msgid "Profession"
-msgstr " Përparim"
+msgstr "Zanat"
 
-#: ../libpurple/protocols/msn/msn.c:1681
-#, fuzzy
 msgid "Work Phone"
-msgstr "Telefon"
+msgstr "Telefon i Punës"
 
-#: ../libpurple/protocols/msn/msn.c:1682
-#, fuzzy
 msgid "Work Phone 2"
-msgstr "Vini Numër Telefoni të Punës"
+msgstr "Telefon i Punës 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "Vendndodhje Pune"
 
-#: ../libpurple/protocols/msn/msn.c:1684
-#, fuzzy
 msgid "Work Mobile"
-msgstr "Dërgoje te Celular"
+msgstr "Celular Pune"
 
-#: ../libpurple/protocols/msn/msn.c:1685
-#, fuzzy
 msgid "Work Pager"
-msgstr "Faqe Ëeb"
+msgstr "Faques Pune"
 
-#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
-msgstr ""
+msgstr "Faks Pune"
 
-#: ../libpurple/protocols/msn/msn.c:1687
-#, fuzzy
 msgid "Work Email"
-msgstr "Email"
+msgstr "Email i Punës"
 
-#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
-msgstr ""
+msgstr "MA Pune"
 
 #  State
-#: ../libpurple/protocols/msn/msn.c:1689
-#, fuzzy
 msgid "Start Date"
-msgstr "Shtet"
+msgstr "Datë Fillimi"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "Gjëra të Pëlqyera"
 
-#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Përditësuar së Fundmi"
 
 #  Homepage
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Faqe Hyrëse"
 
-#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "Përdoruesi nuk ka krijuar një profil publik."
 
-#: ../libpurple/protocols/msn/msn.c:1860
 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 "
@@ -7415,17 +5442,13 @@ msgstr ""
 "ose se përdoruesi nuk ekziston, ose që përdoruesi ekziston por nuk ka "
 "krijuar profil publik."
 
-#: ../libpurple/protocols/msn/msn.c:1864
-#, fuzzy
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Gaim-i nuk mundi të gjej ndonjë të dhënë në profilin e përdoruesit. "
-"Përdoruesi ka shumë gjasa nuk ekziston."
+"Nuk u gjet dot ndonjë e dhënë në profilin e përdoruesit. Përdoruesi ka shumë "
+"gjasa të mos ekzistojë."
 
-#: ../libpurple/protocols/msn/msn.c:1872
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL Profili"
 
@@ -7450,12 +5473,9 @@ msgstr "URL Profili"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "Shtojcë Protokolli AIM/ICQ"
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Shtojcë Protokolli Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "Përdor Metodë HTTP"
 
@@ -7466,95 +5486,76 @@ msgstr "Përdor Metodë HTTP"
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "Shërbyes Prove IPC"
+msgstr "Metodë Shërbyesi HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
-msgstr ""
+msgstr "Shfaq emotikone vetjake"
 
-#: ../libpurple/protocols/msn/msn.c:2212
-#, fuzzy
 msgid "nudge: nudge a user to get their attention"
-msgstr "buzz: Tërhiqi vëmendjen një kontakti"
-
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "I pazoti të lidhem"
+msgstr "nudge: preke një përdorues me bërryl për t'i tërhequr vëmendjen"
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Mirëfilltësim ID-je Windows Live:I pazoti të lidhej"
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Mirëfilltësim ID-je Windows Live:Përgjigje e pavlefshme"
 
-#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s nuk është një grup i vlefshëm."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Gabim i panjohur."
 
-#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s në %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s sapo ju dërgoi një Bërryl!"
+
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Gabim i panjohur (%d)"
+
+msgid "Unable to add user"
+msgstr "I pazoti të shtoj përdorues"
+
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "I pazoti të shtoj përdorues te %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "I pazoti të bllokoj përdorues te %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "I pazoti të lejoj përdorues te %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s nuk mund të shtohej sepse lista juaj e shokëve është plot."
 
-#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s nuk është pasaportë e vlefshme llogarie"
 
-#: ../libpurple/protocols/msn/notification.c:528
-#, fuzzy
 msgid "Service Temporarily Unavailable."
-msgstr "Shërbim Përkohësisht i Pamundshëm"
+msgstr "Shërbim Përkohësisht i Pakapshëm"
+
+#, fuzzy
+msgid "Mobile message was not sent because it was too long."
+msgstr "Mesazhi për celular nuk u dërgua dot, ngaqë qe shumë i gjatë."
 
-#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "I pazoti të riemërtoj grup"
 
-#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "I pazoti të fshij grup"
 
-#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7583,647 +5584,591 @@ msgstr[1] ""
 "\n"
 "Do të mund të nënshkruani me sukses pasi të jetë kryer mirëmbajtja."
 
-#: ../libpurple/protocols/msn/servconn.c:137
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Mesazhi nuk u dërgua, ngaqë sistemi nuk u kap dot. Kjo ndodh kur përdoruesi "
+"është bllokuar ose kur ky nuk ekziston."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Mesazhi nuk u dërgua dot ngaqë mesazhet po dërgohen me shumë nxitim."
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur kodimi."
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur."
+
+msgid "Unable to connect"
+msgstr "I pazoti të lidhem"
+
 msgid "Writing error"
 msgstr "Gabim shkrimi"
 
-#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "Gabim leximi"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Gabim lidhjeje i shërbyesit %s (%s):\n"
+"Gabim lidhjeje nga shërbyesi %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Protokolli ynë nuk mbulohet nga shërbyesi."
 
-#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Gabim në përtypjen e HTTP-së."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Keni nënshkruar prej një tjetër vendi."
 
-#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Shërbyesat MSN janë përkohësisht jashtë pune. Ju lutem prisni dhe riprovoni."
 
-#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Shërbyesat MSN po ndalen përkohësisht."
 
 #  TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "I pazoti të mirëfilltësoj: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Lista juaj shokësh MSN është përkohësisht e pakapshme. Ju lutem prisni dhe "
 "riprovoni."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Duarshtrëngim"
 
-#: ../libpurple/protocols/msn/session.c:349
+msgid "Transferring"
+msgstr "Po shpërngulet"
+
 msgid "Starting authentication"
-msgstr "Po filloj mirëfilltësim"
+msgstr "Po fillohet mirëfilltësimi"
 
-#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
-msgstr "Po marr \"cookie\""
+msgstr "Po merret \"cookie\""
 
-#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
-msgstr "Po dërgoj \"cookie\""
+msgstr "Po dërgohet \"cookie\""
 
-#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
-msgstr "Po marr listë shokësh"
+msgstr "Po merret listë shokësh"
 
-#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Larg Prej Kompjuterit"
 
-#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Në Telefon"
 
-#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Jashtë Për Drekë"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Mesazhi mund të mos jetë dërguar ngaqë pati një përfundim afati:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Mesazhi nuk u dërgua dot, e palejuar kur jeni i padukshëm:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Mesazhi nuk u dërgua dot ngaqë përdoruesi është i palidhur:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim lidhjeje:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
-#, fuzzy
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Mesazhi nuk u dërgua dot ngaqë përdoruesi është i palidhur:"
+msgstr "Mesazhi nuk u dërgua dot ngaqë po i dërgojmë me shumë nxitim:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
+"Mesazhi nuk u dërguar dot ngaqë nuk qemë në gjendje të vendosnim një lidhje "
+"me shërbyesin. Ka të ngjarë që të jetë një problem i shërbyesit, roprovoni "
+"pas pak minutash:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim me \"switchboard\"-in:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "%s ju ka shtuar te listë e tij/e saj shokësh."
+msgstr "%s ju ka shtuar te lista e tij (saj) e shokëve."
 
-#: ../libpurple/protocols/msn/userlist.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "%s ju ka hequr prej listës së tij/saj të kontakteve."
+msgstr "%s ju ka hequr prej listës së tij (saj) të shokëve."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "I pazoti të lexoj kartelën \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
-msgid "The screen name specified is invalid."
-msgstr "Emri i ekranit i dhënë është i pavlefshëm."
+msgid "The username specified is invalid."
+msgstr "Emri i dhënë i përdoruesit është i pavlefshëm."
+
+msgid "This Hotmail account may not be active."
+msgstr "Kjo llogari Hotmail mund të mos jetë vepruese."
+
+msgid "Has you"
+msgstr "Ju ka"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr "Shtojcë Protokolli MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
-msgstr ""
+msgstr "Mungon Shifra"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Nuk u gjet dot shifra RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"Përmirësojeni me një libpurple me mbulim për RC4 (>= 2.0.1). Shtojca "
+"MySpaceIM nuk ka për t'u ngarkuar."
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
-msgid "MySpaceIM Error"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
 msgid "Reading challenge"
-msgstr "Gabim leximi"
+msgstr "Po lexohet sfida"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "Sfidë e pavlefshme prej shërbyesit."
+msgstr "Gjatësi e papritur sfide prej shërbyesit"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
 msgid "Logging in"
-msgstr "Hyrje"
+msgstr "Po hyhet"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "Humbi lidhja me shërbyesin (nuk u morën të dhëna brenda %d sekonde)"
+msgstr[1] ""
+"Humbi lidhja me shërbyesin (nuk u morën të dhëna brenda %d sekondash)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
-#, fuzzy
 msgid "New mail messages"
-msgstr "Dërgo një mesa_zh"
+msgstr "Mesazhe poste të rinj"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
-msgstr ""
+msgstr "Komente blogu të rinj"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
-msgstr ""
+msgstr "Komente profili të rinj"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
-msgstr ""
+msgstr "Kërkesa të reja shoku!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
-msgstr ""
+msgstr "Komente fotoje të rinj"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
+msgstr "MySpace"
+
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Pa Emër Përdoruesi"
+
+msgid "You appear to have no MySpace username."
+msgstr "Duket se nuk keni emër përdoruesi te MySpace"
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
+"Dëshironi të caktoni një të tillë tani? (Shënim: KY NUK MUND TË NDRYSHOHET "
+"MË PAS!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
-#, fuzzy
 msgid "Connected"
-msgstr "Lidhu"
+msgstr "I lidhur"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
-msgid "No username set"
-msgstr "Emër përdoruesi"
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Gabim protokolli, kod %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#, c-format
 msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
 msgstr ""
+"%s Fjalëkalimi juaj është %d shenja i gjatë, më tepër se gjatësia maksimum e "
+"pritshme prej %d për MySpaceIM. Ju lutem shkurtojeni fjalëkalimin tuaj te "
+"http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
+"changePassword dhe riprovoni."
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
-msgid "Protocol error, code %d: %s"
-msgstr "Procesi u përgjigj me kod gabimi %d"
+msgid "MySpaceIM Error"
+msgstr "Gabim MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "Dështova në lidhjen me shokun te fjalosja"
+msgstr "Shtimi i shokut dështoi"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "Ngarko listë shokësh prej kartele"
+msgstr "Urdhri 'addbuddy' dështoi."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
 msgid "persist command failed"
-msgstr "\"Switchboard-i\" dështoi"
+msgstr "urdhri persist dështoi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "S'ka përdorues të tillë: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, fuzzy
 msgid "User lookup"
-msgstr "Dhoma Përdoruesi"
+msgstr "Kërkim përdoruesi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "Dështova në lidhjen me shokun te fjalosja"
+msgstr "Dështoi heqja e shokut"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "Urdhri 'delbuddy' dështoi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
 msgid "blocklist command failed"
-msgstr "\"Switchboard-i\" dështoi"
+msgstr "Urdhri blocklist dështoi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "Po finalizoj lidhje"
+msgstr "Kusht i pavlefshëm futjeje"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-#, fuzzy
-msgid "Read buffer full"
-msgstr "Radha plot"
+msgid "Read buffer full (2)"
+msgstr "Shtytëz leximi plot (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
-#, fuzzy
 msgid "Unparseable message"
-msgstr "I pazoti të përtyp mesazh"
+msgstr "Mesazh i papërtypshëm"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "S'munda të lidhem te strehë"
+msgstr "S'u lidha dot te strehë: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
 msgid "IM Friends"
-msgstr "dritare _IM"
+msgstr "Miq MA"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"Prej shërbyesit u shtua ose u përditësua %d shok (përfshi shokë tashmë të "
+"pranishëm në listën e vetë shërbyesit)"
+msgstr[1] ""
+"Prej shërbyesit u shtuan ose u përditësuan %d shokë (përfshi shokë tashmë të "
+"pranishëm në listën e vetë shërbyesit)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "Përgjigje e pavlefshme prej shërbyesit."
+msgstr "Shto kontakte prej shërbyesit"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "Shto shokë prej MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
-#, fuzzy
 msgid "Importing friends failed"
-msgstr "Kartelë miku e dëmtuar"
+msgstr "Të importuarit e shokëve dështoi"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
 msgid "Find people..."
-msgstr ""
+msgstr "Gjeni persona..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
 msgid "Change IM name..."
-msgstr "Ndrysho Fjalëkalim..."
+msgstr "Ndrysho emër MA-je..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
-msgstr ""
+msgstr "Trajtues URL-je myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
+"Nuk u gjet llogari e përshtatshme MySpaceIM për hapjen e kësaj URL-je myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Aktivizoni llogarinë e duhur MySpaceIM dhe riprovoni."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Shfaq te tekst gjendjeje emër ekrani"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Shfaq titull në tekst gjendjesh"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
 msgid "Send emoticons"
-msgstr "Mundësi Tingulli"
+msgstr "Dërgo emotikone"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "Qartësi ekrani (dot për inç)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
-#, fuzzy
 msgid "Base font size (points)"
-msgstr "Madhësi më e madhe gërmash"
+msgstr "Madhësi gërmash bazë (në pikë)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-#, fuzzy
 msgid "User"
-msgstr "Përdoruesa"
+msgstr "Përdorues"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
-#, fuzzy
 msgid "Profile"
-msgstr "Profil MSN"
+msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
 msgid "Headline"
-msgstr "Hidh poshtë"
+msgstr "Titull"
 
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
 msgid "Song"
-msgstr "Tinguj"
+msgstr "Këngë"
 
-#: ../libpurple/protocols/myspace/user.c:134
 msgid "Total Friends"
-msgstr ""
+msgstr "Miq Gjithsej"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
 msgid "Client Version"
-msgstr "Mbyll bashkëbisedim"
+msgstr "Version Klienti"
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Pa caktim emri përdoruesi"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Ju lutem Caktoni një Emër përdoruesi"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Ju lutem jepni një emër përdoruesi për të parë nëse është i passhëm:"
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - Emër përdoruesi i Passhëm"
+
+msgid "This username is available. Would you like to set it?"
+msgstr "Ky emër përdoruesi mund të kihet. Dëshironi të caktohet?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "PASI TË CAKTOHET NJË HERË, KY NUK MUND TË NDRYSHOHET! "
+
+msgid "This username is unavailable."
+msgstr "Ky emër përdoruesi nuk është i passhëm."
+
+msgid "Please try another username:"
+msgstr "Ju lutem provoni një tjetër emër përdoruesi:"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:44
 #, c-format
 msgid "%s has zapped you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:44
 #, c-format
 msgid "Zapping %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Përdoruesi ju ka bllokuar"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
 #, c-format
 msgid "Whacking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
 msgid "Torch"
-msgstr "Temë"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
-msgstr "Përdoruesi ju ka bllokuar"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
 #, c-format
 msgid "Torching %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "Përdoruesi ju ka bllokuar"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s është larguar."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "Hugging %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+#. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr "Slovake"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s ka reshtur së shkruajturi për ju (%s)"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+#. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr "Ikur"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s është larguar."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
-msgstr "Po shoh për %s"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
 msgid "High-five"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ka nënshkruar (%s)"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
 msgid "%s has punk'd you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
 msgid "Punking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has raspberried you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Nuk u dha parametër i nevojshëm"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "I pazoti të shkruaj në rrjet"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "I pazoti të lexoj prej rrjeti"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Gabim gjatë komunikimit me shërbyesin"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Nuk u gjet konferencë"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "konferenca nuk ekziston"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Ka tashmë një dosje me këtë emër"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "I/e pambuluar"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Fjalëkalimi ka skaduar"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
-#, fuzzy
 msgid "Incorrect password"
 msgstr "Fjalëkalim i pasaktë."
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Përdorues që s'gjendet"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Llogaria është çaktivizuar"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Shërbyesi nuk mundi të hyjë te drejtoria"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Përgjegjësi i sistemit tuaj e ka bërë të pamundur këtë veprim"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Shërbyesi është i pakapshëm, riprovoni më vonë"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Nuk shtoj dot një kontakt dy herë te e njëjta dosje"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "S'shtoj dot veten tuaj"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Arkiva kryesore është e keqformësuar"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-#, fuzzy
-msgid "Incorrect screen name or password"
-msgstr "Nofkë ose fjalëkalim i pasaktë."
+msgid "Incorrect username or password"
+msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
-#, fuzzy
-msgid "Could not recognize the host of the screen name you entered"
-msgstr "Nuk munda të njoh strehën e emrit të përdoruesit që dhatë"
+msgid "Could not recognize the host of the username you entered"
+msgstr "Nuk u njoh dot streha e emrit të përdoruesit që dhatë"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
-#, fuzzy
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -8231,87 +6176,68 @@ msgstr ""
 "Llogaria juaj është çaktivizuar sepse janë dhënë shumë fjalëkalime të "
 "pavlefshëm"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "S'mund të shtoni dot të njëjtin person dy herë te në bashkëbisedim"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Keni arritur kufirin tuaj për numrin e lidhjeve të lejuara  "
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
-#, fuzzy
-msgid "You have entered an incorrect screen name"
-msgstr "Keni dhënë një emër përdoruesi të pavlefshëm"
+msgid "You have entered an incorrect username"
+msgstr "Keni dhënë një emër të pavlefshëm përdoruesi"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Ndodhi një gabim gjatë përditësimit të drejtorisë"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Version i papërputhshëm protokolli"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Përdoruesi ju ka bllokuar"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
 "Ky version mostër nuk lejon më tepër se dhjetë përdorues të futen njëherësh"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "ose përdoruesi është i palidhur ose ju jeni të bllokuar"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Gabim i panjohur: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Hyrja dështoi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "I pazoti të dërgoj mesazh. Nuk arrita të kem hollësi për përdoruesin (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "I pazoti të shtoj %s te listë juaja shokësh (%s)."
 
 #  TODO: Improve this! message to who or for what conference?
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "I pazoti të dërgoj mesazh (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "I pazoti të ftoj përdorues (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "I pazoti të dërgoj mesazh te %s. Nuk munda të krijoj konferencën (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "I pazoti të dërgoj mesazh. Nuk munda të krijoj konferencën (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -8320,7 +6246,6 @@ msgstr ""
 "I pazoti të zhvendos përdorues %s te dosje %s në listën nga ana e "
 "shërbyesit. Gabim gjatë krijimit të dosjes (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -8329,62 +6254,46 @@ msgstr ""
 "I pazoti të shtoj %s te listë juaj shokësh. Gabim gjatë krijimit të dosjes "
 "në listën nga ana e shërbyesit (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "S'arrita të kem hollësi për përdoruesin %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "I pazoti të shtoj përdoruesin te listë vetësie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "I pazoti të shtoj %s te listë mohimesh (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "I pazoti të shtoj %s te listë lejesh (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "I pazoti të heq %s prej liste vetësie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "I pazoti të ndryshoj rregullime vetësie të anës së shërbyesit (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "I pazoti të krijoj konferencë (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
-msgstr "Gabim gjatë kounikimit me shërbyesin. Po mbyll lidhjen."
+msgstr "Gabim gjatë komunikimit me shërbyesin. Po mbyllet lidhja."
 
-#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Numër Telefoni"
 
-#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Titullin Vetjak"
 
-#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID Përdoruesi"
 
@@ -8400,41 +6309,29 @@ msgstr "ID Përdoruesi"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Emër i plotë"
 
-#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konferencë GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "I pazoti të bëj lidhje SSL me shërbyesin."
-
-#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
-msgstr "Po mirëfilltësoj..."
+msgstr "Po kryhet mirëfilltësimi..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "I pazoti të lidhem me shërbyesin."
 
-#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
-msgstr "Po pres përgjigje..."
+msgstr "Në pritje të përgjigjes..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s është ftuar te ky bashkëbisedim."
 
-#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Ftesë për Bashkëbisedim"
 
-#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8445,16 +6342,12 @@ msgstr ""
 "\n"
 "Dërguar: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Do të donit të merrni pjesë në diskutim?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Jeni nxjerrë jashtë ngaqë jeni futur prej një tjetër kompjuteri."
 
-#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8464,11 +6357,6 @@ msgstr ""
 #  TODO: Would be nice to prompt if not set!
 #  *  gaim_request_fields(gc, _("Server Address"),...);
 #  ...but for now just error out with a nice message.
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...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."
@@ -8476,11 +6364,9 @@ msgstr ""
 "I pazoti të lidhem me shërbyesin. Ju lutem jepni vendndodhjen e shërbyesit "
 "që doni të kontaktohet."
 
-#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Gabim. Nuk është instaluar suport për SSL."
 
-#: ../libpurple/protocols/novell/novell.c:2504
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Kjo konferencë është mbyllur. S'mund të dërgohen më mesazhe."
@@ -8506,47 +6392,34 @@ msgstr "Kjo konferencë është mbyllur. S'mund të dërgohen më mesazhe."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Shtojcë Protokolli Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Vendndodhje shërbyesi"
 
-#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Portë Shërbyesi"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
-#, fuzzy
+msgid "Could not join chat room"
+msgstr "Nuk u bë dot futja në dhomën e fjalosjes"
+
+msgid "Invalid chat room name"
+msgstr "U dha emër i pavlefshëm dhome fjalosjeje."
+
 msgid "Server closed the connection."
-msgstr "Gabim në krijimin e lidhjes"
+msgstr "Shërbyesi e mbylli lidhjen."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
-msgstr "I palidhur te shërbyesi."
+msgstr ""
+"Humbi lidhja me shërbyesin:\n"
+"%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
-#, fuzzy
 msgid "Received invalid data on connection with server."
-msgstr "I pazoti të bëj lidhje SSL me shërbyesin."
+msgstr "U morën të dhëna të pavlefshme rreth lidhjes me shërbyesin."
 
 #  *< api_version
 #  *< type
@@ -8569,11 +6442,8 @@ msgstr "I pazoti të bëj lidhje SSL me shërbyesin."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
-#, fuzzy
 msgid "AIM Protocol Plugin"
-msgstr "Shtojcë Protokolli AIM/ICQ"
+msgstr "Shtojcë Protokolli AIM"
 
 #  *< api_version
 #  *< type
@@ -8594,374 +6464,287 @@ msgstr "Shtojcë Protokolli AIM/ICQ"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
-#, fuzzy
 msgid "ICQ Protocol Plugin"
-msgstr "Shtojcë Protokolli IRC"
+msgstr "Shtojcë Protokolli ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodim"
 
-#: ../libpurple/protocols/oscar/odc.c:40
-#, fuzzy
 msgid "The remote user has closed the connection."
-msgstr "Përdoruesi i largët nuk është më i pranishëm në rrjet"
+msgstr "Përdoruesi i largët e mbylli lidhjen."
 
-#: ../libpurple/protocols/oscar/odc.c:42
-#, fuzzy
 msgid "The remote user has declined your request."
-msgstr "Përdoruesi ju ka bllokuar"
+msgstr "Përdoruesi i largët nuk e pranoi kërkesën tuaj."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+msgstr "Humbi lidhja me përdoruesin e largët:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgstr "U morën të dhëna të pavlefshme rreth lidhjes me përdoruesin e largët."
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
-msgstr ""
+msgstr "Nuk u vendos dot lidhje me përdoruesin e largët."
 
-#: ../libpurple/protocols/oscar/odc.c:560
-#, fuzzy
 msgid "Direct IM established"
-msgstr "Direct IM me %s u vendos"
+msgstr "U vendos MA e Drejtpërdrejtë"
+
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s provoi t'ju dërgojë një kartelë %s, por nga ana jonë lejohen vetëm "
+"kartela deri më %s përmes MA-je të Drejtpërdrejtë.  Provoni më mirë të "
+"përdorni shpërngulje kartelash.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
+"Kartela %s është %s, çka i bie më e madhe se sa madhësia maksimum prej %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Gabim i pavlefshëm"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "SNAC i pavlefshëm"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "Klasifiko sipas strehe"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Klasifiko sipas klienti"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Shërbim i pamundur"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Shërbim i papërcaktuar"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "SNAC i vjetëruar"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "I pambuluar nga streha"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "I pambuluar nga klienti"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "I papranuar nga klienti"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Përgjigje shumë e madhe"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "Përgjigje të humbura"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "Kërkesë e hedhur tej"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Të drejta të pamjaftueshme"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "Në lejo/moho vendore"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (sender)"
-msgstr "Goxha i keq (dërgues)"
+msgid "Warning level too high (sender)"
+msgstr "Shkallë sinjalizimi shumë e lartë (dërguesi)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
-msgstr "Goxha i keq (marrës)"
+msgid "Warning level too high (receiver)"
+msgstr "Shkallë sinjalizimi shumë e lartë (marrësi)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "Përdorues përkohësisht jo i mundshëm"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "Pa përputhje"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr "List overflow"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "Kërkesë e dykuptimtë"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Radha plot"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Jo kur jeni në AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
 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 ""
+"(Pati një gabim në marrjen e këtij mesazhi.  Shoku me të cilin po flisni "
+"ndofta po përdor tjetër kodim nga ai që prisnit.  Nëse e dini se çfarë kodim "
+"po përdor, mund ta jepni te mundësitë e mëtejshme të llogarisë për llogarinë "
+"tuaj AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
-#, fuzzy, c-format
+#, 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 ""
-"(Pati një gabim gjatë marrjes së këtij mesazhi.  Shoku të cilit po i flisni "
-"ka shumë të ngjarë të ketë një klient me të meta.)"
+"(Pati një gabim gjatë marrjes së këtij mesazhi.  Ose ju dhe %s keni të "
+"përzgjedhur kodime të ndryshëm, ose %s ka një klient me të meta.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Ikonë Shoku"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Zë"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Fjalosje"
+msgstr "MA e Drejtpërdrejtë AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Merr Kartelë"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Lojra"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Shtesa"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Dërgo Listë Shokësh"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Lidhje e Drejtpërdrejtë ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Përdorues AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Mohues"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 i vjetër"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Kodim Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Siguri e Aktivizuar"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Fjalosje Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
+msgid "Screen Sharing"
+msgstr "Ekrani i Përbashkët"
+
 #, c-format
 msgid "Free For Chat"
 msgstr "I lirë Për Fjalosje"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
 #, c-format
 msgid "Not Available"
 msgstr "Jo i mundshëm"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
 #, c-format
 msgid "Occupied"
 msgstr "I zënë"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
 #, c-format
 msgid "Web Aware"
 msgstr "Me Web-in  Parasysh"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "I padukshëm"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
-msgid "Online"
-msgstr "I lidhur"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "Vendndodhje IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "Shkallë Sinjalizimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Koment Shoku"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
-msgstr "S'u lidha dot për shpërngulje."
+msgstr ""
+"Nuk u bë dot lidhja me shërbyesin e mirëfilltësimeve:\n"
+"%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
-msgstr "Dështova të lidhem me shërbyesin."
+msgstr ""
+"Nuk u bë dot lidhja me shërbyesin BOS:\n"
+"%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
-msgid "Screen name sent"
-msgstr "Emër ekran i dërguar"
+msgid "Username sent"
+msgstr "U dërgua emri i përdoruesit"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Lidhje e vendosur, \"cookie\" u dërgua"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
-msgstr "Po finalizoj lidhje"
+msgstr "Po finalizohet lidhja"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"I pazoti të futem: Nuk munda të hyj si %s sepse emri i ekranit është i "
-"pavlefshëm.  Emrat e ekranit ose duhet të fillojnë me një gërmë dhe të "
-"përmbajnë vetëm gërma, numra dhe hapësira, ose të përmbajnë vetëm numra."
+"I pazoti të futem: Nuk munda të hyj si %s sepse emri i përdoruesit është i "
+"pavlefshëm.  Emrat e përdoruesve duhet të jenë venndodhje email të vlefshme, "
+"ose duhet të fillojnë me një gërmë dhe të përmbajnë vetëm gërma, numra dhe "
+"hapësira, ose të përmbajnë vetëm numra."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
-#, fuzzy
-msgid "Invalid screen name."
+#. Unregistered screen name
+msgid "Invalid username."
 msgstr "Emër përdoruesi i pavlefshëm."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr "Fjalëkalim i pasaktë."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Llogaria juaj për çastin është e pezulluar."
 
 #  service temporarily unavailable
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Shërbimi AOL Instant Messenger është përkohësisht i pamundur."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
 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."
@@ -8969,47 +6752,33 @@ msgstr ""
 "Jeni lidhur e shkëputur shumë shpesh. Prisni dhjetë minuta dhe riprovoni. "
 "nëse vazhdoni të provoni, do t'ju duhet të prisni edhe më."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Versioni i klientit që po përdorni është shumë i vjetër. Ju lutem "
 "përditësojeni prej %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "Nuk munda të Lidhem"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr "Mirëfilltësim i marrë"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr "Kyçi SecurID i dhënë është i pavlefshëm."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr "Jepni SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Jepni numri gjashtëshifror prej paraqitjes shifrore."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
-#, fuzzy
 msgid "_OK"
-msgstr "OK"
+msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9018,59 +6787,39 @@ msgstr ""
 "Edhe pak edhe mundet t'ju shkëpusin.  Mund të doni të përdorni TOC derisa të "
 "ndreqet kjo.  Shihni %s për përditësime."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#, fuzzy
 msgid "Unable to get a valid AIM login hash."
-msgstr "Gaim-i s'qe në gjendje të ketë një hash hyrjeje në AIM të vlefshëm."
+msgstr "Nuk u mor dot hash i vlefshëm hyrjeje në AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Edhe pak edhe mundet t'ju shkëpusin.  Mund të doni të përdorni TOC derisa të "
-"ndreqet kjo.  Shihni %s për përditësime."
+msgstr "Edhe pak edhe mundet t'ju shkëpusin.  Shihni %s për përditësime."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
-#, fuzzy
 msgid "Unable to get a valid login hash."
-msgstr "Gaim-i s'qe në gjendje të ketë një hash hyrjeje të vlefshëm."
+msgstr "Nuk u mor dot hash i vlefshëm hyrjeje"
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Fjalëkalim u dërguar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "I pazoti të krijoj lidhje të re."
+msgstr "I pazoti të gatis lidhjen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Ju lutem autorizomëni që kështu të mundem t'ju shtoj te listë imja shokësh."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Mesazh Kërkese Autorizimi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Ju lutem autorizomëni!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "Nuk u dha arsye."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Mesazh Mohimi Autorizimi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9081,18 +6830,15 @@ msgstr ""
 "shokësh për arsyen vijuese:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "Autorizim ICQ i mohuar."
 
 #  Someone has granted you authorization
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Përdoruesi %u ju ka lejuar ta shtoni te listë juaja shokësh."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9105,7 +6851,6 @@ msgstr ""
 "Prej: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9118,7 +6863,6 @@ msgstr ""
 "Prej: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9126,46 +6870,37 @@ msgid ""
 "Message is:\n"
 "%s"
 msgstr ""
-"Keni marrë një email ICQ prej %s [%s]\n"
+"Morët një email ICQ prej %s [%s]\n"
 "\n"
-"Mesazhi thotë:\n"
+"Mesazhi është:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Përdoruesi ICQ %u ju ka dërguar një shok: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Doni të shtohet ky shok te lista juaj e shokëve?"
 
 #  Add button
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
-#, fuzzy
 msgid "_Add"
-msgstr "Shto"
+msgstr "_Shto"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
-#, fuzzy
 msgid "_Decline"
-msgstr "Hidh poshtë"
+msgstr "_Hidh poshtë"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
 #, 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] "Humbët %hu mesazh prej %s sepse qe i pavlefshëm."
 msgstr[1] "Humbët %hu mesazhe prej %s sepse qenë të pavlefshëm."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
 #, 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] "Humbët %hu mesazh prej %s sepse qe shumë i madh."
 msgstr[1] "Humbët %hu mesazhe prej %s sepse qenë shumë të mëdhenj."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9174,21 +6909,29 @@ msgid_plural ""
 msgstr[0] "Humbët %hu mesazh prej %s sepse është tejkaluar niveli kufi."
 msgstr[1] "Humbët %hu mesazhe prej %s sepse është tejkaluar niveli kufi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
 #, 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] "Humbët %hu mesazh prej %s ngaqë ai/ajo qe goxha i/e keq(e)."
-msgstr[1] "Humbët %hu mesazhe prej %s ngaqë ai/ajo qe goxha i/e keq(e)"
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Humbët %hu mesazh prej %s ngaqë shkalla e sinjalizimit për të qe shumë e "
+"lartë."
+msgstr[1] ""
+"Humbët %hu mesazhe prej %s ngaqë shkalla e sinjalizimit për të qe shumë e "
+"lartë"
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
 #, 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] "Humbët %hu mesazh prej %s ngaqë jeni goxha i/e keq(e)."
-msgstr[1] "Humbët %hu mesazhe prej %s ngaqë jeni goxha i/e keq(e)."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Humbët %hu mesazh prej %s ngaqë shkalla juaj e sinjalizimit është shumë e "
+"lartë."
+msgstr[1] ""
+"Humbët %hu mesazhe prej %s ngaqë shkalla juaj e sinjalizimit është shumë e "
+"lartë."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
 #, 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."
@@ -9197,50 +6940,33 @@ msgstr[1] "Humbët %hu mesazhe prej %s për një arsye të panjohur."
 
 #  TODO: Improve this! message to who or for what conference?
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "I pazoti të dërgoj mesazh: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr "Arsye e panjohur."
 
 #  TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "I pazoti të dërgoj mesazh te %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "Të dhëna përdoruesi jo të mundshme: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "I lidhur që Prej"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Anëtar që Prej"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
-#, fuzzy
-msgid "Available Message"
-msgstr "I mundshëm"
-
-#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
-msgstr "Mund të jetë hYour AIM connection may be lost."
+msgstr "Mund të ketë humbur lidhja juaj AIM."
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9248,7 +6974,6 @@ msgstr ""
 "[I pazoti të shfaq mesazh prej këtij përdoruesi sepse përmbante shenja të "
 "pavlefshme.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9256,126 +6981,93 @@ msgstr ""
 "Veprimi i fundit që provuat s'mund të kryhej sepse keni tejkaluar kufirin "
 "kohor. Ju lutem prisni 10 sekonda dhe riprovoni."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Jeni shkëputur prej dhome fjalosjesh %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefon Celular"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "Faqe Web Personale"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Të dhëna Shtesë"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "Kod Zip"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+msgid "Work Information"
+msgstr "Të dhëna Pune"
+
 msgid "Division"
 msgstr "Ndarje"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "Vendndodhje"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "Faqe Ëeb"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
-msgid "Work Information"
-msgstr "Të dhëna Pune"
-
-#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Mesazh Flluckë"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
-#, fuzzy, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
-msgstr[0] "Emrat vijues ekrani i janë shoqëruar %s"
-msgstr[1] "Emrat vijues ekrani i janë shoqëruar %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:3922
-#, fuzzy
-msgid "Screen name"
-msgstr "Emër në ekran:"
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "Emri vijues i përdoruesit i është shoqëruar %s"
+msgstr[1] "Emrat vijues të përdoruesve u janë shoqëruar %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Nuk u gjetën përfundime për vendndodhje email %s"
+msgstr "Nuk u gjetën përfundime për vendndodhjen email %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Duht t'ju vijë një email me kërkesën për ripohim të %s."
+msgstr "Duhet t'ju vijë një email me kërkesën për ripohim të %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Lipset Ripohim Llogarie "
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
-msgid "Error Changing Account Info"
-msgstr "Gabim në Ndryshim Të dhënash Llogarie"
-
-#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
 msgstr ""
-"Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i "
-"kërkuar ndryshon nga origjinali."
+"Gabim 0x%04x: I pazoti të formatoj emër përdoruesi, ngaqë emri i kërkuar "
+"ndryshon nga origjinali."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
-"Gabim 0x%04x: I pazoti të formatoj emër ekrani ngaqë është i pavlefshëm."
+"Gabim 0x%04x: I pazoti të formatoj emër përdoruesi, ngaqë është i pavlefshëm."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
 msgstr ""
-"Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i "
-"kërkuar është tepër i gjatë."
+"Gabim 0x%04x: I pazoti të formatoj emër përdoruesi, ngaqë emri i kërkuar "
+"është tepër i gjatë."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse për këtë emër "
-"ekrani ka tashmë një kërkesë në pritje."
+"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email, ngaqë për këtë emër "
+"përdoruesi ka tashmë një kërkesë në pritje."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 msgstr ""
 "Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse vendndodhja e "
-"dhënë ka shumë emra ekrani shoqëruar asaj."
+"dhënë ka shumë emra përdoruesi shoqëruar asaj."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -9384,32 +7076,29 @@ msgstr ""
 "Gabim 0x%04x: I pazoti të ndryshoj vendndodhje email sepse vendndodhja e "
 "dhënë është e pavlefshme."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Gabim 0x%04x: Gabim i panjohur."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+msgid "Error Changing Account Info"
+msgstr "Gabim në Ndryshim Të dhënash Llogarie"
+
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Vendndodhja email për %s është %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Të dhëna Llogarie "
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Pamja juaj IM nuk u dërgua. Duhet të jeni I lidhur Drejtpërdrejt për të "
-"dërguar Pamje IM."
+"Pamja juaj MA nuk u dërgua. Duhet të jeni I lidhur Drejtpërdrejt për të "
+"dërguar Pamje MA."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "I pazoti të rregulloj profil AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
 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 "
@@ -9419,8 +7108,7 @@ msgstr ""
 "hyrjes.  Profili juaj mbetet i parregulluar; provoni ta rregulloni kur të "
 "jeni plotësisht i lidhur."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -9428,18 +7116,16 @@ msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajti për profile.  Gaim-i e "
-"cungoi për ju."
+"Është tejkaluar gjatësia më e madhe prej %d bajti për profile.  U cungua për "
+"ju."
 msgstr[1] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajtesh për profile.  Gaim-i e "
-"cungoi për ju."
+"Është tejkaluar gjatësia më e madhe prej %d bajtesh për profile.  U cungua "
+"për ju."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "Profil shumë i gjatë."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -9447,56 +7133,43 @@ msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajti për mesazhe largimi. Gaim-"
-"i e cungoi për ju"
+"Është tejkaluar gjatësia më e madhe prej %d bajti për mesazhe largimi. U "
+"cungua për ju"
 msgstr[1] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajtesh për mesazhe largimi. "
-"Gaim-i e cungoi për ju"
+"Është tejkaluar gjatësia më e madhe prej %d bajtesh për mesazhe largimi. U "
+"cungua për ju"
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "Mesazh largimi shumë i gjatë."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
-"Nuk munda të shtoj shokun %s sepse emri i ekranit është i pavlefshëm.  Emra "
-"ekrani duhet ose të fillojnë me një gërmë ose të përmbajnë vetëm gërma, "
-"numra dhe hapësira, ose të përmbajnë vetëm numra."
+"Nuk munda të shtoj shokun %s sepse emri i përdoruesit është i pavlefshëm.  "
+"Emrat e përdoruesve duhet të jenë një vendndodhje email e vlefshme, ose të "
+"fillojnë me një gërmë dhe të përmbajnë vetëm gërma, numra dhe hapësira, ose "
+"të përmbajnë vetëm numra."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr "I pazoti të Shtoj"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "I pazoti Të Marr Listë  Shokësh"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
-#, fuzzy
 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."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"Gaim-i s'qe i në gjendje të marrë listë shokësh tuajën prej shërbyesve AIM.  "
-"Lista juaj e shokëve nuk ka humbur, dhe mbase do të jetë e passhme brenda "
-"pak orësh."
+"Shërbyesat AIM s'qenë përkohësisht në gjendje të dërgojnë listën tuaj të "
+"shokëve.  Lista juaj e shokëve nuk ka humbur, dhe me gjasa do të bëhet e "
+"passhme brenda pak minutash."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
 msgid "Orphans"
 msgstr "Jetimë"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9505,43 +7178,35 @@ msgstr ""
 "S'munda të shtoj shokun %s sepse keni shumë shokë në listë shokësh tuajën.  "
 "Ju lutem hiqni një dhe riprovoni."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(pa emër)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#, fuzzy, c-format
+#, c-format
 msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Urdhri juaj dështoi për një arsye të panjohur."
+msgstr "Për një arsye të panjohur, nuk u shtua dot shoku %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
 #, c-format
 msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
 msgstr ""
-"Përdoruesi %s ju ka dhënë leje të shtoheni te listë e tij shokësh.  Doni "
-"t'ju shtoj?"
+"Përdoruesi %s ju ka dhënë leje ta shtoni te lista juaj e shokëve.  Doni ta "
+"shtoni këtë përdorues?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "Autorizim i Dhënë"
 
 #  Granted
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Përdoruesi %s ju ka dhënë leje ta shtoni te listë juaja shokësh."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "Autorizim i Dhuruar"
 
 #  Denied
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9552,123 +7217,81 @@ msgstr ""
 "shokësh për arsyen vijuese:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Autorizim i Mohuar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Shkëmbe:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
-msgid "Invalid chat name specified."
-msgstr "U dha emër fjalosjeje i pavlefshëm."
-
-#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Pamja juaj IM nuk u dërgua. S'mund të dërgoni pamje IM në fjalosje AIM."
+"Nuk u dërgua dot pamja juaj MA. S'mund të dërgoni pamje MA në fjalosje AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
-msgid "Away Message"
-msgstr "Mesazh për i Larguar "
-
-#: ../libpurple/protocols/oscar/oscar.c:5574
-#, fuzzy
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(identifikuar)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "Lidhje për te iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Koment Shoku për %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Koment Shoku:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Keni përzgjedhur të hapet një lidhje Direct IM me %s."
+msgstr "Keni përzgjedhur të hapet një lidhje MA-sh të Drejtpërdrejta me %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
-#, fuzzy
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"Ngaqë kjo zbulon vendndodhjen tuaj IP, mund të merret si rrezik ndaj "
-"vetësisë.  Doni të vazhdohet?"
+"Ngaqë kjo nxjerr sheshit vendndodhjen tuaj IP, mund të merret si rrezik ndaj "
+"sigurisë.  Doni të vazhdohet?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
-#, fuzzy
 msgid "C_onnect"
-msgstr "Lidhu"
+msgstr "_Lidhu"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
-#, fuzzy
 msgid "Get AIM Info"
-msgstr "Ki të Dhëna"
+msgstr "Merr Të dhëna AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "Përpuno Koment Shoku"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Ki Mszh Gjendjeje"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
-msgstr "Direct IM"
+msgstr "MA e Drejtpërdrejtë"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Rikërko Autorizim"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "Kërko autorizim"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "Web aware (aktivizimi i kësaj do të bëjë që t'ju vijë SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "Mundësi Vetësie ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "Formatimi i ri është i pavlefshëm."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
-msgid "Screen name formatting can change only capitalization and whitespace."
+msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"Formatimi i emrave të ekranit mund të ndryshojë vetëm gërmat e mëdhaja dhe "
-"hapësirat boshe."
+"Formatimi i emrave të përdoruesve mund të ndryshojë vetëm gërmat e mëdhaja "
+"dhe hapësirat boshe."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "Ndrysho Vendndodhje Si:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>nuk po prisni për autorizim</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Po prisni autorizim prej shokëve vijues"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9676,710 +7299,492 @@ msgstr ""
 "Mund të rikërkoni autorizim prej këtyre shokëve duke djathtas klikuar mbi ta "
 "dhe përzgjedhur \"Rikërko Autorizim.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by Email"
-msgstr "Gjej Shok nga Email-i"
+msgstr "Gjej Shok nga E-mail-i"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by email address"
-msgstr "Kërko një shok me vendndodhje email"
+msgstr "Kërkoni një shok përmes vendndodhjes e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Shtypni vendndodhjen email të shokut që po kërkoni."
+msgstr "Shtypni vendndodhjen e-mail të shokut që po kërkoni."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
-#, fuzzy
 msgid "_Search"
-msgstr "Kërko"
+msgstr "_Kërko"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
-msgid "Set User Info (URL)..."
-msgstr "Caktoni Të dhëna Përdoruesi (URL)..."
+msgid "Set User Info (web)..."
+msgstr "Caktoni Të dhëna Përdoruesi (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
-msgid "Change Password (URL)"
-msgstr "Ndrysho Fjalëkalim (URL)"
+msgid "Change Password (web)"
+msgstr "Ndryshoni Fjalëklimin për (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
-msgid "Configure IM Forwarding (URL)"
-msgstr "Formëso Përcjellje IM (URL)"
+msgid "Configure IM Forwarding (web)"
+msgstr "Formësoni Përcjellje MA-je (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
-#, fuzzy
 msgid "Set Privacy Options..."
-msgstr "Shfaq mundësi vetësie..."
+msgstr "Caktoni Mundësi Vetësie..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Ripohoni Llogari"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
-#, fuzzy
 msgid "Display Currently Registered Email Address"
-msgstr "Shfaq Vendndodhje të Regjistruar për Çastin"
+msgstr "Shfaq Vendndodhje Email të Regjistruar të Tanishme"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
-#, fuzzy
 msgid "Change Currently Registered Email Address..."
-msgstr "Ndrysho Vendndodhje të Regjistruar për Çastin..."
+msgstr "Ndrysho Vendndodhje Email të Regjistruar të Tanishme..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Shfaq Shokë që Presin Autorizim"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
-#, fuzzy
 msgid "Search for Buddy by Email Address..."
-msgstr "Kërko për Shokë sipas Email-i..."
+msgstr "Kërkoni një Shok përmes Vendndodhjes Email..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "Kërko për Shokë sipas Të dhënash"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
-msgid "Use recent buddies group"
-msgstr "Përdor grup të fundit shokësh"
-
-#: ../libpurple/protocols/oscar/oscar.c:6523
-msgid "Show how long you have been idle"
-msgstr "Tregon për sa kohë keni qenë i plogësht"
-
-#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
+"Përdor përherë shërbyes ndërmjetës AIM/ICQ për\n"
+"shpërngulje kartelash dhe MA të drejtpërdrejtë\n"
+"(më e ngadaltë, por nuk nxjerr sheshit vendndodhjen tuaj IP)"
+
+msgid "Allow multiple simultaneous logins"
+msgstr "Lejo hyrje të shumëfishta të njëkohshme"
 
-#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Po i kërkoj %s të na lidhë me %s:%hu për Direct IM."
+msgstr "Po i kërkohet %s të lidhet me ne te %s:%hu për MA të Drejtpërdrejtë."
 
-#: ../libpurple/protocols/oscar/peer.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Po përpiqem të lidhem me %s te %s:%hu për Direct IM."
+msgstr "Përpjekje për t'u lidhur te %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect via proxy server."
-msgstr "Po përpiqem të ridrejtoj lidhjen..."
+msgstr "Po bëhet përpjekje për lidhje përmes një shërbyesi ndërmjetës."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s sapo kërkoi të lidhet drejtpërsëdrejti me %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
 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 ""
 "Kjo lyp një lidhje të drejtpërdrejtë mes dy kompjuterave dhe është e "
-"nevojshme për pamje IM.  Ngaqë do të zbulohet vendndodhja juaj IP, kjo mund "
-"të merret si rrezik vetësie."
+"nevojshme për pamje MA.  Ngaqë do të nxirret sheshit vendndodhja juaj IP, "
+"kjo mund të merret si rrezik vetësie."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
-#, fuzzy
 msgid "Primary Information"
-msgstr "Të dhëna Vetjake"
+msgstr "Të dhëna Parësore"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "Të dhëna Vetjake"
+msgstr "Prezantim Personal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
-msgstr ""
+msgstr "Numër QQ"
 
 #  Country
-#: ../libpurple/protocols/qq/buddy_info.c:47
-#, fuzzy
 msgid "Country/Region"
-msgstr "Vend"
+msgstr "Vend/Shtet"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
-msgstr ""
+msgstr "Provincë/Shtet"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
-msgstr ""
+msgstr "Simbol Horoskopi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
-msgstr ""
+msgstr "Shenjë Zodiaku"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
-msgstr ""
+msgstr "Lloj Gjaku"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
-#, fuzzy
 msgid "College"
-msgstr "_Tkurr"
+msgstr "Universitet"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
-#, fuzzy
 msgid "Zipcode"
 msgstr "Kod Zip"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
-#, fuzzy
 msgid "Cellphone Number"
-msgstr "Numër Telefoni"
+msgstr "Numër Celulari"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
-#, fuzzy
 msgid "Phone Number"
 msgstr "Numër Telefoni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
-msgstr ""
+msgstr "Ujori"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
-#, fuzzy
 msgid "Pisces"
-msgstr "Zëra"
+msgstr "Peshqit"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
-#, fuzzy
 msgid "Aries"
-msgstr "Vendndodhje"
+msgstr "Dashi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
-msgstr ""
+msgstr "Demi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
-#, fuzzy
 msgid "Gemini"
-msgstr "Gjermane"
+msgstr "Gemini"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
-#, fuzzy
 msgid "Cancer"
-msgstr "Anulo"
+msgstr "Gaforrja"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
-msgstr ""
+msgstr "Luani"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
-msgstr ""
+msgstr "Virgjëresha"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
-msgstr ""
+msgstr "Peshorja"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
-#, fuzzy
 msgid "Scorpio"
-msgstr "Regjistrim"
+msgstr "Akrepi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
-msgstr ""
+msgstr "Shigjetari"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
-msgstr ""
+msgstr "Bricjapi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
-#, fuzzy
 msgid "Rat"
-msgstr "Bruto"
+msgstr "Miu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
-msgstr ""
+msgstr "Ox"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
-#, fuzzy
 msgid "Tiger"
-msgstr "Titull"
+msgstr "Tigri"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
-msgstr ""
+msgstr "Lepuri"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
-msgstr ""
+msgstr "Dragoi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
-#, fuzzy
 msgid "Snake"
-msgstr "Ruaj"
+msgstr "Gjarpri"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
-#, fuzzy
 msgid "Horse"
-msgstr "Porta"
+msgstr "Kali"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
-msgstr ""
+msgstr "Dhija"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
-#, fuzzy
 msgid "Monkey"
-msgstr "Asnjë"
+msgstr "Majmuni"
 
 #  Register button
-#: ../libpurple/protocols/qq/buddy_info.c:73
-#, fuzzy
 msgid "Rooster"
-msgstr "Regjistrohuni"
+msgstr "Këndezi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
-msgstr ""
+msgstr "Qeni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
-#, fuzzy
 msgid "Pig"
-msgstr "Ping"
+msgstr "Derri"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
-#, fuzzy
 msgid "Other"
-msgstr "Opera"
+msgstr "Tjetër"
 
 #  res[0] == username
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
-#, fuzzy
 msgid "Modify my information"
-msgstr "Të dhëna Shoku"
+msgstr "Ndrysho të dhënat e mia"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
-#, fuzzy
 msgid "Update my information"
-msgstr "Të dhëna Përdoruesi"
+msgstr "Përditëso të dhënat e mia"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
-#, fuzzy
 msgid "Your information has been updated"
-msgstr "Fjalëkalimi juaj është ndryshuar."
+msgstr "Të dhënat tuaja u përditësuan."
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
+"Caktimi i fytyrave vetjake nuk mbulohet ende. Ju lutem zgjidhni një pamje "
+"prej %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
-#, fuzzy
 msgid "Invalid QQ Face"
-msgstr "Emër i Pavlefshëm Dhome"
+msgstr "Fytyrë QQ e pavlefshme"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
-#, fuzzy, c-format
+#, c-format
 msgid "You rejected %d's request"
-msgstr "Kërkesë e Papritur"
+msgstr "Hodhët tej kërkesën e %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
-msgstr ""
+msgstr "Jepni arsyen tuaj:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#, fuzzy
 msgid "Reject request"
-msgstr "Kërkesë e Papritur"
+msgstr "Hidhe tej kërkesën"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
-msgstr ""
+msgstr "Më ndjeni, nuk jeni tipi im..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
 msgid "Add buddy with auth request failed"
-msgstr "Shto shok të hedhur tej"
+msgstr "Shto shok me kërkesë mirëfilltësimi të dështuar"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
-msgstr ""
+msgstr "Hoqët me sukses një shok"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr ""
+msgstr "E hoqët me sukses veten nga lista e shokëve të shokut tuaj"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
-#, fuzzy, c-format
+#, c-format
 msgid "User %d needs authentication"
-msgstr "Po filloj mirëfilltësim"
+msgstr "Përdoruesi %d lyp mirëfilltësim"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
-msgstr ""
+msgstr "Futni kërkesën këtu"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
-#, fuzzy
 msgid "Would you be my friend?"
-msgstr "Do të donit ta mbishkruani?"
+msgstr "Do të bëhesh shok i imi?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
-#, fuzzy
 msgid "Send"
-msgstr "_Dërgo Te"
+msgstr "Dërgo"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
-msgstr "I pazoti të shtoj %s te listë juaja shokësh (%s)."
+msgstr "E shtuat %d te lista e shokëve"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
-#, fuzzy
 msgid "QQid Error"
-msgstr "Gabim Leximi"
+msgstr "Gabim QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
-#, fuzzy
 msgid "Invalid QQid"
-msgstr "ID autorizimi i pavlefshëm"
+msgstr "QQid i pavlefshëm"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
-msgstr ""
+msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
-#, fuzzy
 msgid "Group ID"
-msgstr "Grup:"
+msgstr "ID Grupi"
 
-#: ../libpurple/protocols/qq/group.c:100
-#, fuzzy
 msgid "Creator"
-msgstr "Pastro"
+msgstr "Krijues"
 
-#: ../libpurple/protocols/qq/group.c:103
-#, fuzzy
 msgid "Group Description"
-msgstr "Përshkrim"
+msgstr "Përshkrim Grupi"
 
-#: ../libpurple/protocols/qq/group.c:109
-#, fuzzy
 msgid "Auth"
-msgstr "Autorizo"
+msgstr "Autor"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
 msgid "Please enter external group ID"
-msgstr "Ju lutem jepni emrin e grupit që duhet shtuar."
+msgstr "Ju lutem jepni ID të jashtme grupi"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
-msgstr ""
+msgstr "Mund të kërkoni vetëm për grupe të përhershëm QQ\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
-msgstr ""
+msgstr "Përdoruesi %d kërkoi t'i bashkohet grupit %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "Reason: %s"
-msgstr "Përdoruesa në %s: %s"
+msgstr "Arsye: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "Mundësi Tingulli"
+msgstr "Veprim QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
-msgstr ""
+msgstr "Mirato"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
+"Kërkesa juaj për t'iu bashkuar grupit %d është hedhur tej nga administratori "
+"%d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
+"Kërkesa juaj për t'iu bashkuar grupit %d është miratuar nga administratori %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
-msgstr ""
+msgstr "Ju [%d] e latë grupin \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr ""
+msgstr "Ju [%d] jeni shtuar te grupi \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
-#, fuzzy
 msgid "This group has been added to your buddy list"
-msgstr "Doni të shtohet ky shok te lista juaj e shokëve?"
+msgstr "Ky grup është shtuar te lista juaj e shokëve"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
-msgstr ""
+msgstr "Nuk jam anëtar"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
-msgstr ""
+msgstr "Jam anëtar"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
-msgstr ""
+msgstr "Po bëj kërkesë për të marrë pjesë"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
-msgstr ""
+msgstr "Jam admin"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
-#, fuzzy
 msgid "Unknown status"
-msgstr "Mesazh i panjohur "
+msgstr "Gjendje e panjohur"
 
-#: ../libpurple/protocols/qq/group_join.c:82
-#, fuzzy
 msgid "This group does not allow others to join"
-msgstr ""
-"Ky version mostër nuk lejon më tepër se dhjetë përdorues të futen njëherësh"
+msgstr "Ky grup nuk i lejon të tjerët t'i bashkohen"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
-msgstr ""
+msgstr "Dolët me sukses prej grupit"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
-msgstr ""
+msgstr "Kërkesa juaj për autorizim është pranuar nga shërbyesi QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
-msgstr ""
+msgstr "Dhatë një ID grupi jashtë intervalit të pranueshëm"
 
-#: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "jeni të sigurtë se doni të fshini %s?"
+msgstr "Jeni i sigurt se doni të dilni nga ky Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_network.c:93
-#, fuzzy
-msgid "Group Operation Error"
-msgstr "Gabim Veprimi mbi Kartelë"
+"Shënim, nëse jeni krijuesi, \n"
+"ky veprim ka shumë të ngjarë ta heqë këtë Qun."
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
-msgstr ""
+msgstr "Doni ta miratoni këtë kërkesë?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
-msgstr ""
+msgstr "Jepni arsyen tuaj:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
-msgstr ""
+msgstr "Ndryshuat me sukses anëtar Qun-i"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modified Qun information"
-msgstr ""
+msgstr "Ndryshuat me sukses të dhëna Qun-i"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "Krijuat me sukses një Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
-#, fuzzy
 msgid "Would you like to set up the Qun details now?"
-msgstr "Do të donit ta caktoni si ikonë shoku për këtë përdorues?"
+msgstr "Dëshironi të rregulloni hollësitë për Qun tani?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
-#, fuzzy
 msgid "Setup"
-msgstr "_Caktoni"
+msgstr "Rregullim"
 
-#: ../libpurple/protocols/qq/im.c:432
-#, fuzzy
 msgid "System Message"
-msgstr "Mesazh për i Larguar "
+msgstr "Mesazh Sistemi"
 
-#: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
 msgid "Failed to send IM."
-msgstr "Dështova në futjen te fjalosje"
+msgstr "Dështova në dërgim MA-je."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
-msgid "Keep alive error"
-msgstr "Gabim leximi"
+#, c-format
+msgid "Unknown-%d"
+msgstr "%d e panjohur"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
-msgid "Error requesting login token"
-msgstr "Gabim në krijimin e lidhjes"
+msgid "Level"
+msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
-#, fuzzy
-msgid "Unable to login, check debug log"
-msgstr "I pazoti të hyj në AIM"
+msgid "Member"
+msgstr "Anëtar"
 
-#  we didn't successfully connect. tdt->toc_fd is valid here
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
-msgid "Unable to connect."
-msgstr "I pazoti të lidhem."
+msgid " VIP"
+msgstr " VIP"
 
-#: ../libpurple/protocols/qq/qq.c:186
-#, fuzzy, c-format
-msgid "Unknown-%d"
-msgstr "E panjohur"
+msgid " TCP"
+msgstr "TCP"
 
-#: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
-msgid "TCP Address"
-msgstr "Vendndodhje IP"
+msgid " FromMobile"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
-msgid "UDP Address"
-msgstr "Vendndodhje IP"
+msgid " BindMobile"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:242
-#, fuzzy
-msgid "Level"
-msgstr "Kurrë"
+msgid " Video"
+msgstr "Video"
+
+msgid " Space"
+msgstr "Hapësirë"
+
+msgid "Flag"
+msgstr "Flamurkë"
+
+msgid "Ver"
+msgstr "Ver"
 
-#: ../libpurple/protocols/qq/qq.c:373
-#, fuzzy
 msgid "Invalid name"
-msgstr "Emër përdoruesi i Pavlefshëm"
+msgstr "Emër i pavlefshëm"
 
-#: ../libpurple/protocols/qq/qq.c:439
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
-msgstr "<b>Alias:</b> %s<br>"
+msgstr "<b>Të lidhur Tani</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
-msgstr "<b>Përdorues:</b> %s<br>"
+msgstr "<b>Freskimi i Fundit</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
-#, fuzzy, c-format
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Shërbyes</b>: %s: %d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>I plogësht prej:</b> %s<br>"
+msgstr "<b>Mënyrë Lidhjeje</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
-#, fuzzy, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>Përdorues:</b> %s<br>"
+#, c-format
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Emërstrehë e vërtetë</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr "<b>Alias:</b> %s<br>"
+msgstr "<b>IP-ja Ime Publike</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
-msgstr "<b>Përdorues:</b> %s<br>"
+msgstr "<b>Kohë në Linjë</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
-msgstr "<b>Alias:</b> %s<br>"
+msgstr "<b>IP-ja e Hyrjes së Fundit</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Login Time</b>: %s\n"
-msgstr ""
-"\n"
-"<b>Parë Së fundi:</b> %s më parë"
+msgstr "<b>Koha e Hyrjes së Fundit</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
-#, fuzzy
 msgid "Login Information"
-msgstr "Të dhëna Diagnostikimi"
+msgstr "Të dhëna Hyrjeje"
 
-#: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
 msgid "Set My Information"
-msgstr "Të dhëna Shërbyesi"
+msgstr "Rregullo Të dhënat mbi Mua"
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Ndrysho Fjalëkalim"
 
-#: ../libpurple/protocols/qq/qq.c:539
-#, fuzzy
 msgid "Show Login Information"
-msgstr "Të dhëna Diagnostikimi"
+msgstr "Shfaq të Dhëna Futjeje"
 
-#: ../libpurple/protocols/qq/qq.c:560
 msgid "Leave this QQ Qun"
-msgstr ""
+msgstr "Dil prej këtij QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
-msgstr ""
+msgstr "Bllokoje këtë shok"
 
 #  *< api_version
 #  *< type
@@ -10400,655 +7805,540 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
-#, fuzzy
 msgid "QQ Protocol\tPlugin"
-msgstr "Shtojcë Protokolli IRC"
+msgstr "Protokol\tPlugin QQ"
 
 #  connect to the server
-#: ../libpurple/protocols/qq/qq.c:752
-#, fuzzy
 msgid "Connect using TCP"
-msgstr "Po lidhem"
+msgstr "Lidhu përmes TCP-je"
+
+msgid "resend interval(s)"
+msgstr "Interval ridërgimesh (sek)"
+
+msgid "Keep alive interval(s)"
+msgstr "Interval(e) mbajtjeje gjallë"
+
+msgid "Update interval(s)"
+msgstr "Interval(e) përditësimi"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Gjatësi e pavlefshme \"token\"-i, %d"
+
+msgid "Keep alive error"
+msgstr "Gabim mbajtjeje gjallë"
+
+msgid "Failed to connect server"
+msgstr "Dështoi lidhja me shërbyesin"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
-#, fuzzy
 msgid "Socket error"
-msgstr "Gabim fjalosjeje"
+msgstr "Gabim \"socket\"-i"
+
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Humba lidhjen me shërbyesin:\n"
+"%d, %s"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
-#, fuzzy
 msgid "Unable to read from socket"
-msgstr "I pazoti të lexoj \"socket\"-in"
+msgstr "I pazoti të lexoj prej \"socket\"-i"
 
-#: ../libpurple/protocols/qq/send_file.c:707
-#, fuzzy, c-format
-msgid "%d has declined the file %s"
-msgstr "%s ka ndryshuar temën në: %s"
+msgid "Write Error"
+msgstr "Gabim Shkrimi"
+
+msgid "Connection lost"
+msgstr "Lidhje e humbur"
+
+msgid "Couldn't resolve host"
+msgstr "S'u shquajt dot streha"
+
+msgid "hostname is NULL or port is 0"
+msgstr "emërstreha është NULL ose porta është 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Po bëhet lidhja me shërbyesin %s, %d prova"
+
+#  we didn't successfully connect. tdt->toc_fd is valid here
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "I pazoti të lidhem."
+
+msgid "Could not resolve hostname"
+msgstr "S'u shqua dot emërstreha"
+
+msgid "Unable to login. Check debug log."
+msgstr "I pazoti të hyj. Shihni regjistrin e diagnostikimeve."
+
+msgid "Unable to login"
+msgstr "I pazoti të hyj"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 #, fuzzy
-msgid "File Send"
-msgstr "Dështoi Dërgimi i Kartelës  "
+msgid "Failed room reply"
+msgstr "Dështoi heqja e shokut"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, fuzzy, c-format
-msgid "%d canceled the transfer of %s"
-msgstr "%s anuloi shpërnguljen e %s"
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Ju [%d] jeni shtuar te grupi \"%d\""
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
-#, fuzzy
-msgid "Connection lost"
-msgstr "Lidhja u Mbyll"
+msgid "Can not decrypt login reply"
+msgstr ""
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
-#, fuzzy
-msgid "Login failed, no reply"
-msgstr "Hyrja dështoi (%s)."
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Kod i pavlefshëm token-i përgjigjeje, 0x%02X"
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d hodhi tej kartelën %s"
+
+msgid "File Send"
+msgstr "Dërgim Kartele"
+
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%d anuloi shpërnguljen e %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
-#, fuzzy
 msgid "Do you want to add this buddy?"
-msgstr "Doni të shtohet ky shok te lista juaj e shokëve?"
+msgstr "Doni të shtohet ky shok?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "Jeni asgjësuar prej %s (%s)"
+msgstr "Jeni shtuar nga %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
-#, fuzzy
 msgid "Would you like to add him?"
-msgstr "Do të donit ta mbishkruani?"
+msgstr "Do të donit ta shtoni?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s ju ka shtuar te listë e tij/e saj shokësh."
+msgstr "%s ju ka shtuar juve [%s] te lista e tij, ose e saj, e shokëve"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
-msgstr ""
+msgstr "Përdoruesi %s hodhi tej kërkesën tuaj"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
-msgstr ""
+msgstr "Përdoruesi %s miratoi kërkesën tuaj"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to add you [%s] as a friend"
-msgstr "%s don t'ju dërgojë një kartelë"
+msgstr "%s don t'ju shtojë juve [%s] si shok"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
-#, fuzzy, c-format
+#, c-format
 msgid "Message: %s"
-msgstr "_Mesazh:"
+msgstr "Mesazh: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
-msgstr ""
+msgstr "%s nuk gjendet te lista juaj e shokëve"
+
+#, c-format
+msgid "Notice from: %s"
+msgstr "Njoftim prej: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
-#, fuzzy
 msgid "Connection closed (writing)"
-msgstr "Lidhja u Mbyll"
+msgstr "Lidhja u ndërpre (shkrim)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Përdorues:</b> %s<br>"
+msgstr "<b>Titull Grup:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Përdorues:</b> %s<br>"
+msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
-#, fuzzy, c-format
+#, c-format
 msgid "Info for Group %s"
-msgstr "Të dhëna për %s"
+msgstr "Të dhëna për Grupin %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
-#, fuzzy
 msgid "Notes Address Book Information"
-msgstr "Të dhëna Pune"
+msgstr "Të dhëna Shënimesh Libri Vendndodhjesh"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
-#, fuzzy
 msgid "Invite Group to Conference..."
-msgstr "Nis Konferencë"
+msgstr "Fto Grup në Konferencë..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
-#, fuzzy
 msgid "Get Notes Address Book Info"
-msgstr "Shto te Libër Vendndodhjesh"
+msgstr "Merr Të dhëna Shënimesh Libri Vendndodhjesh"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
-msgstr "Po dërgoj \"Handshake\""
+msgstr "Po dërgohet Duarshtrëngim"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Po pres të Pranohet \"Handshake\""
+msgstr "Po pritet Pranimi i Duartshtrëngimit"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
-#, fuzzy
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Duarshtrëngimi u Pranua, Po dërgoj Të dhëna Futjeje"
+msgstr "U pranua Duarshtrëngimi, Po dërgohet Hyrje"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
-msgstr "Po pres për Pranim të Hyrjes"
+msgstr "Po pritet për Pranim të Hyrjes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Hyrja u Ridrejtua"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
-msgstr "Po detyroj Hyrje"
+msgstr "Po detyrohet Hyrja"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Hyrje e Pranuar"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
-#, fuzzy
 msgid "Starting Services"
-msgstr "Shërbime Online"
+msgstr "Po nisen Shërbime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
+"Një administrator Sametime-i ka shpërndarë lajmërimin vijues në shërbyesin %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "Njoftime Administratori Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
-#, fuzzy
 msgid "Connection reset"
-msgstr "Lidhja u Mbyll"
+msgstr "Rivendosje lidhjeje"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from socket: %s"
-msgstr ""
-"Gabim në leximin e %s: \n"
-"%s.\n"
+msgstr "Gabim gjatë leximit prej \"socket\"-i: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
-#, fuzzy
 msgid "Unable to connect to host"
-msgstr "I pazoti të lidhem me shërbyesin."
+msgstr "S'bëhet dot lidhja me strehën"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "Njoftim prej %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
-#, fuzzy
 msgid "Conference Closed"
-msgstr "Lidhja u Mbyll"
+msgstr "Koferenca u Mbyll"
 
 #  TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/sametime/sametime.c:2403
-#, fuzzy
 msgid "Unable to send message: "
-msgstr "I pazoti të dërgoj mesazh: %s"
+msgstr "I pazoti të dërgoj mesazh:"
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
-#, fuzzy
 msgid "Place Closed"
-msgstr "Anuluar"
+msgstr "Vendi u Mbyll"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
-msgstr ""
+msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
-msgstr ""
+msgstr "Altoparlantë"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
-#, fuzzy
 msgid "Video Camera"
-msgstr "Fjalosje Video"
+msgstr "Video Kamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
-#, fuzzy
 msgid "Supports"
-msgstr "suport"
+msgstr "Mbulon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
-msgstr ""
+msgstr "Përdorues i Jashtëm"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
-#, fuzzy
 msgid "Create conference with user"
-msgstr "Përzgjidhni një shërbyes konferencash për kërkesë"
+msgstr "Hap konferencë me përdoruesin"
 
-#: ../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 ""
+"Ju lutem jepni një temë për konferencën e re, dhe një mesazh ftesë për t'u "
+"dërguar te %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
-#, fuzzy
 msgid "New Conference"
-msgstr "Nis Konferencë"
+msgstr "Konferencë e Re"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
-#, fuzzy
 msgid "Create"
-msgstr "Datë"
+msgstr "Krijo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
-#, fuzzy
 msgid "Available Conferences"
-msgstr "Nis Konferencë"
+msgstr "Konferenca të Mundshme"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
-#, fuzzy
 msgid "Create New Conference..."
-msgstr "Nis Konferencë"
+msgstr "Krijo Konferencë të Re..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
-#, fuzzy
 msgid "Invite user to a conference"
-msgstr "Nis Konferencë"
+msgstr "Fto përdorues te një konferencë"
 
-#: ../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 ""
+"Përzgjidhni konferencë prej listës vijuese për t'i dërguar ftesë përdoruesit "
+"%s. Përzgjidhni \"Krijoni Konferencë të Re\" nëse do të donit të krijonit "
+"konferencë të re ku të ftohet ky përdorues."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
-#, fuzzy
 msgid "Invite to Conference"
-msgstr "Nis Konferencë"
+msgstr "Fto në Konferencë"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
-#, fuzzy
 msgid "Invite to Conference..."
-msgstr "Nis Konferencë"
+msgstr "Fto te Konferencë..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
-msgstr ""
+msgstr "Dërgo Njoftim TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Temë:"
 
 #  Progress
-#: ../libpurple/protocols/sametime/sametime.c:3614
-#, fuzzy
 msgid "No Sametime Community Server specified"
-msgstr "U lidha me Shërbyesin e Bashkësisë Sametime"
+msgstr "Nuk është treguar Shërbyes Bashkësie \"Sametime\""
 
-#: ../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 ""
+"Nuk është formësuar vendndodhje strehe apo IP për llogarinë Meanwhile %s. "
+"Për të vazhduar hyrjen, ju lutem jepni një më poshtë."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
-#, fuzzy
 msgid "Meanwhile Connection Setup"
-msgstr "Dështoi Lidhja e Largët"
+msgstr "Rregullim Lidhjeje Meanwhile"
 
 #  Progress
-#: ../libpurple/protocols/sametime/sametime.c:3642
-#, fuzzy
 msgid "No Sametime Community Server Specified"
-msgstr "U lidha me Shërbyesin e Bashkësisë Sametime"
+msgstr "Nuk është treguar Shërbyes Bashkësie \"Sametime\""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Lidhu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
-msgstr ""
+msgstr "I panjohur (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
-#, fuzzy
 msgid "Last Known Client"
-msgstr "Klasifiko sipas klienti"
+msgstr "Klienti i Fundit i Njohur"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
-#, fuzzy
 msgid "User Name"
-msgstr "Emër përdoruesi"
+msgstr "Emër Përdoruesi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
-msgstr ""
+msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr ""
+msgstr "U dha një ID përdoruesi e dykuptimtë "
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
-#, fuzzy, c-format
+#, 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 ""
-"U gjet më shumë se një përdorues me të njëjtin emër. Përzgjidhni prej listës "
-"përdoruesin e duhur i cili të shtohet te lista e shokëve."
+"Identifikuesi '%s' mundet ndoshta t'i referohet cilitdo prej përdoruesve "
+"vijues. Përzgjidhni prej listës më poshtë përdoruesin e duhur, i cili të "
+"shtohet te lista e shokëve."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
-#, fuzzy
 msgid "Select User"
-msgstr "Përzgjidhni Ngjyrë"
+msgstr "Përzgjidhni Përdorues"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
-#, fuzzy
 msgid "Unable to add user: user not found"
-msgstr "I pazoti të shtoj përdorues te %s (%s)"
+msgstr "I pazoti të shtoj përdoruesin: nuk u gjet përdorues"
 
-#: ../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 ""
+"Identifikuesi '%s' nuk u përputh me ndonjë përdorues te bashkësia juaj "
+"Sametime. Ky zë është hequr prej listës suaj të shokëve."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-#, fuzzy
-msgid "Unable to add user"
-msgstr "I pazoti të ndaloj përdoruesin %s"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"Gabim në leximin e %s: \n"
-"%s.\n"
+"Gabim në leximin e kartelës %s: \n"
+"%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
-#, fuzzy
 msgid "Remotely Stored Buddy List"
-msgstr "Dërgo Listë Shokësh"
+msgstr "Listë Shokësh e Ruajtur Së largëti"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
-#, fuzzy
 msgid "Buddy List Storage Mode"
-msgstr "Listë Shokësh"
+msgstr "Mënyrë Ruajtjej Liste Shokësh"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
-#, fuzzy
 msgid "Local Buddy List Only"
-msgstr "Listë e _Luajtshme Shokësh"
+msgstr "Vetëm Listë Vendore Shokësh"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
-#, fuzzy
 msgid "Merge List from Server"
-msgstr "Fshij listë shokësh prej Shërbyesi"
+msgstr "Përziej Listë prej Shërbyesi"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
-#, fuzzy
 msgid "Merge and Save List to Server"
-msgstr "Dërguar te shërbyesi vlerë CHL e gabuar"
+msgstr "Përziej dhe Ruaj Listë te Shërbyesi"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
-msgstr ""
+msgstr "Njëkohëso Listën me Shërbyesin"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
+msgstr "Importo Listë Sametime për Llogarinë %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
+msgstr "Eksporto Listë Sametime për Llogarinë %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
-#, fuzzy
 msgid "Unable to add group: group exists"
-msgstr "I pazoti të shtoj %s te listë mohimesh (%s)."
+msgstr "I pazoti të shtoj grup: grupi ekziston"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
+msgstr "Te lista juaj e shokëve ka tashmë një grup të quajtur '%s'."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#, fuzzy
 msgid "Unable to add group"
-msgstr "I pazoti të riemërtoj grup"
+msgstr "I pazoti të shtoj grup"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
-msgstr ""
+msgstr "Përputhje të Mundshme"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#, fuzzy
 msgid "Notes Address Book group results"
-msgstr ""
+msgstr "Përfundime grupi Libri Vendndodhjesh \"Notes\""
 
-#: ../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 ""
+"Identifikuesi '%s' ka të ngjarë t'i referohet ndonjërit prej grupeve vijues "
+"nga Shënime Libri Vendndodhjesh. Ju lutem përzgjidhni grupin e duhur prej "
+"listës më poshtë, që të shtohet te lista juaj e shokëve."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
 #, fuzzy
 msgid "Select Notes Address Book"
-msgstr "Shto te Libër Vendndodhjesh"
+msgstr "Përzgjidhni Libër Vendndodhjesh \"Notes\""
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
-#, fuzzy
 msgid "Unable to add group: group not found"
-msgstr "I pazoti të lexoj prej rrjeti"
+msgstr "I pazoti të shtoj grup: nuk u gjet grup"
 
-#: ../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 ""
+"Identifikuesi '%s' nuk u përputh me ndonjë prej grupeve nga Shënime Libri "
+"Vendndodhjesh te bashkësia juaj Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
 #, fuzzy
 msgid "Notes Address Book Group"
-msgstr "Shto te Libër Vendndodhjesh"
+msgstr "Grup Libri Vendndodhjesh \"Notes\""
 
-#: ../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 ""
+"Jepni emrin e një grupi nga Shënime Libri Vendndodhjesh te fusha më poshtë, "
+"që grupi dhe anëtarit e tij të shtohen te lista juaj e shokëve."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
-#, fuzzy, c-format
+#, c-format
 msgid "Search results for '%s'"
-msgstr "Përfundime kërkimi"
+msgstr "Përfundime kërkimi për '%s'"
 
-#: ../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 ""
+"Identifikuesi '%s' ka të ngjarë t'i referohet ndonjërit prej përdoruesve "
+"vijues. Me butonat e veprimeve më poshtë mundeni t'i shtoni këta përdorues "
+"te lista juaj e shokëve ose t'u dërgoni mesazhe."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "Përfundime Kërkimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
-#, fuzzy
 msgid "No matches"
 msgstr "Pa përputhje"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
+"Identifikuesi '%s' nuk u përputh me ndonjë përdorues nga bashkësia juaj "
+"Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
-#, fuzzy
 msgid "No Matches"
 msgstr "Pa përputhje"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
-#, fuzzy
 msgid "Search for a user"
 msgstr "Kërko për përdorues"
 
-#: ../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 ""
+"Jepni te fusha më poshtë një emër ose ID të pjesshme për kërkim përdoruesish "
+"me përputhje te bashkësia juaj Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
-#, fuzzy
 msgid "User Search"
-msgstr "Kërko"
+msgstr "Kërkim Përdoruesi"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
-msgstr ""
+msgstr "Importo Listë Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
-msgstr ""
+msgstr "Eksporto Listë Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
 #, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "Shto te Libër Vendndodhjesh"
+msgstr "Shto Grup Libri Vendndodhjesh \"Notes\"..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
-#, fuzzy
 msgid "User Search..."
-msgstr "Kërko"
+msgstr "Kërkim Përdoruesi..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "Detyro hyrjen (shpërfill ridrejtime shërbyesi)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
-msgstr ""
+msgstr "Fshih identitet klienti"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Përdoruesi %s nuk është i pranishëm në rrjetin."
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Marrëveshje Kyçash"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "S'përmbush dot ujdi kyçash"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Ndodhi gabim në marrëveshje kyçash "
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Marrëveshja e Kyçave dështoi"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Mbarim kohe gjatë ujdie kyçash"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Marrëveshja e kyçave u ndërpre"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Marrëveshja e kyçave ka zënë fill tashmë"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Nuk mund të nisni marrëveshje kyçash me vetveten"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Përdoruesi i largët nuk është më i pranishëm në rrjet"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -11057,8 +8347,6 @@ msgstr ""
 "Kërkesë pranimi kyçi marrë prej %s. Do të donit të përmbushet  pranimi i "
 "kyçit?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -11069,99 +8357,40 @@ msgstr ""
 "Strehë e largët: %s\n"
 "Portë e largët: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Kërkesë Marrëveshjeje Kyçash"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
-msgstr "IM Me Fjalëkalim"
+msgstr "MA Me Fjalëkalim"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
-msgstr "S'caktoj dot kyç IM"
+msgstr "S'caktoj dot kyç MA-je"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
-msgstr "Caktoni Fjalëkalim IM"
-
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
+msgstr "Caktoni Fjalëkalim MA-sh"
+
 msgid "Get Public Key"
 msgstr "Merr Kyç Publik"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "S'bie dot kyç publik"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Shfaq Kyç Publik"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "S'ngarkova dot kyç publik"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Të dhëna Përdoruesi"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "S'arrij të kem të dhëna përdoruesi"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Shoku %s nuk është i besueshëm"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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."
@@ -11171,19 +8400,13 @@ msgstr ""
 
 #  Open file selector to select the public key.
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Hap..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Shoku %s nuk është i pranishëm në rrjet"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -11191,19 +8414,12 @@ msgstr ""
 "Për të shtuar shokun duhet të ipmortoni kyçin e tij/saj publik. Shtypni "
 "Importo për të importuar një kyç publik."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
-#, fuzzy
 msgid "_Import..."
-msgstr "Importo..."
+msgstr "_Importo..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Përzgjidhni përdoruesin e duhur"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/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."
@@ -11211,8 +8427,6 @@ msgstr ""
 "U gjet më shumë se një përdorues me të njëjtin kyç publik. Përzgjidhni prej "
 "listës përdoruesin e duhur i cili të shtohet te lista e shokëve."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/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."
@@ -11220,314 +8434,154 @@ msgstr ""
 "U gjet më shumë se një përdorues me të njëjtin emër. Përzgjidhni prej listës "
 "përdoruesin e duhur i cili të shtohet te lista e shokëve."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Shkëputur"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Pa qejf"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Zgjomë"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Tej mase Veprues"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "I lumtur"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "I trishtuar"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "I nxehur"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Xheloz"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "I turpëruar"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "I pamposhtur"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "I dashuruar"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Përgjumësh"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "I mërzitur"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "I eksituar"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "I merakosur"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Mënyra Përdoruesi"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Kontakt i Parapëlqyer"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Gjuhë e Parapëlqyer"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Pajisje"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Zonë kohe"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Gjeovendndodhje"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
-msgstr "Ricaktoni Kyç IM"
+msgstr "Ricaktoni Kyç MA-sh"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
-msgstr "IM me Shkëmbim Kyçesh"
+msgstr "MA me Shkëmbim Kyçesh"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
-msgstr "IM me Fjalëkalim"
+msgstr "MA me Fjalëkalim"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Merr Kyç Publik..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Asgjëso Përdorues"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "Vizato Në Tabela"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Parullë:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanali %s nuk ekziston në rrjet"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Të dhëna Kanali"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "S'arrij të kem të dhëna kanali"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Emër Kanal:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Numërim Përdoruesish:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Themelues Kanali:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Shifër Kanali:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanal HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Temë Kanali:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Mënyra Kanali</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Gjurmë gishtash Kyçi Themeluesi:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Kyç Babbleprint Themeluesi:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Shto Kyç Publik Kanali"
 
 #  Add new public key
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Hap Kyç Publik..."
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Parullë Kanali"
 
-#: ../libpurple/protocols/silc/chat.c:430
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Listë Kyçesh Publikë Kanali"
 
-#: ../libpurple/protocols/silc/chat.c:435
-#: ../libpurple/protocols/silc10/chat.c:413
 #, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
@@ -11542,125 +8596,69 @@ msgstr ""
 "Nëse janë caktuar kyçe publikë kanali, atëherë vetëm përdoruesit që kanë "
 "kyçe publikë të listuar janë në gjendje të futen."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Mirëfilltësim Kanali"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Shto / Hiq"
 
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Emër Grupi"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Parullë"
 
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Ju lutem jepni emër grupi vetjak dhe dhe parullë kanali %s."
 
-#: ../libpurple/protocols/silc/chat.c:614
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Shto Grup Vetiak Kanali  "
 
-#: ../libpurple/protocols/silc/chat.c:742
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Kufi Përdoruesi"
 
-#: ../libpurple/protocols/silc/chat.c:743
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Caktoni kufi përdoruesish në kanal. Vëreni zero për të ricaktuar kufi "
 "përdoruesish."
 
-#: ../libpurple/protocols/silc/chat.c:907
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Listë Ftesash"
 
-#: ../libpurple/protocols/silc/chat.c:912
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Listë Ndalimesh"
 
-#: ../libpurple/protocols/silc/chat.c:920
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Shto Grup Vetiak"
 
-#: ../libpurple/protocols/silc/chat.c:933
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Ricaktojeni të Përhershëm"
 
-#: ../libpurple/protocols/silc/chat.c:938
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Caktojeni të Përhershëm"
 
-#: ../libpurple/protocols/silc/chat.c:946
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Caktoni Kufi Përdoruesi"
 
-#: ../libpurple/protocols/silc/chat.c:952
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Rivendosni Kufizime Teme"
 
-#: ../libpurple/protocols/silc/chat.c:957
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Vendosni Kufizime Teme"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Ricaktoni Kanal Vetjak"
 
-#: ../libpurple/protocols/silc/chat.c:969
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Caktoni Kanal Vetjak"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Ricaktoni Kanal Sekret"
 
-#: ../libpurple/protocols/silc/chat.c:981
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Caktoni Kanal Sekret"
 
-#: ../libpurple/protocols/silc/chat.c:1045
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
@@ -11668,329 +8666,178 @@ msgstr ""
 "Duhet të futeni në kanalin %s para se të mundni t'i bashkoheni një grupi "
 "privat"
 
-#: ../libpurple/protocols/silc/chat.c:1047
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Bashkoju Grupi Vetiak"
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "S'i bashkohem dot grupit privat"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
-#, fuzzy
 msgid "Call Command"
-msgstr "Urdhër"
+msgstr "Urdhër Thirrje"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "S'thërras dot urdhër"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Urdhër i panjohur"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Shpërngulje e Sigurtë Kartelash"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Gabim gjatë shpërnguljeje kartele"
 
-#: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s u shkëput"
+msgstr "I largëti u shkëput"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Leje e mohuar"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Marrëveshja e kyçave dështoi"
 
-#: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
 msgid "Connection timed out"
-msgstr "Skadim Lidhjeje"
+msgstr "Mbaroi koha e ndërlidhjes"
 
-#: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "Lidhja dështoi"
+msgstr "Dështoi krijimi i ndërlidhjes"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Nuk ka sesione shpërngulje kartelash"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "S'ka sesion shpërguljeje kartelash veprues"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Shpërngulje kartelash tashmë e filluar"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "S'përmbusha dot ujdi kyçash për shpërngulje kartelash"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "S'munda të nis shpërnguljen e kartelës"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "S'dërgoj dot kartelë"
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
-msgstr ""
+msgstr "Ndodhi një gabim"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ka ndryshuar temën e <I>%s</I> në: %s"
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> rregullon mënyra kanali <I>%s</I> në: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> hoqi tërë mënyrat e kanalit <I>%s</I> "
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> caktoi mënyra <I>%s's</I> në: %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> hoqi tërë mënyrat për <I>%s's</I> "
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Jeni përzënë <I>%s</I> prej <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Jeni asgjësuar prej %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Asgjësuar prej %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Çnënshkrim shërbyesi"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Të dhëna Vetjake"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Ditë Lindjeje"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Post Pune"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organizëm"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Njësi"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Shënim"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Futu në Fjalosje"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Jeni krijues kanali në <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Themelues Kanali në <I>%s</I> është <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
-#, fuzzy
 msgid "Real Name"
-msgstr "Emër i vërtetë"
+msgstr "Emër i Vërtetë"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Tekst Gjendjesh"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Gjurmë gishtash Kyçi Publik"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "\"Babbleprint\" Kyçi Publik"
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc10/ops.c:1298
-#, fuzzy
 msgid "_More..."
-msgstr "Më..."
+msgstr "_Më tepër..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Shkëput Prej Serveri"
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "S'shkëpus dot"
 
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "S'caktoj dot temë"
 
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Dështova në ndryshim nofke"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Listë Dhomash"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "S'marr dot listë dhome"
 
-#: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
 msgid "Network is empty"
-msgstr "Statistika Rrjeti"
+msgstr "Rrjeti është i zbrazët"
 
-#: ../libpurple/protocols/silc/ops.c:1512
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "S'u mor kuç publik"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Të dhëna Shërbyesi"
 
-#: ../libpurple/protocols/silc/ops.c:1525
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "S'arrij të kem të dhëna shërbyesi"
 
-#: ../libpurple/protocols/silc/ops.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Statistika Shërbyesi"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "S'arrij të kem statistika shërbyesi"
 
-#: ../libpurple/protocols/silc/ops.c:1556
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12025,60 +8872,36 @@ msgstr ""
 "Operatorë shërbyesi gjithsej: %d\n"
 "Operatorë router-i gjithsej: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistika Rrjeti"
 
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Pingu dështoi"
 
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Përgjigjje Ping marrë prej shërbyesi"
 
-#: ../libpurple/protocols/silc/ops.c:1609
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Nuk munda të asgjësoj përdorues"
 
-#: ../libpurple/protocols/silc/ops.c:1648
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
 msgid "Cannot watch user"
-msgstr "S'shtoj dot veten tuaj"
+msgstr "S'ndjek dot përdoruesin"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
-msgstr "Po i rikthehem sesionit"
+msgstr "Po rikthehet sesioni"
 
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
-msgstr "Po mirëfilltësoj lidhjen"
+msgstr "Po mirëfilltësohet lidhja"
 
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
-msgstr "Po verifikoj kyç publik shërbyesi"
+msgstr "Po verifikohet kyçi publik i shërbyesit"
 
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Lipset parullë"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -12087,12 +8910,10 @@ msgstr ""
 "Mora kyç publik për %s. Kopja juaj vendore nuk përputhet me këtë kyç. Do të "
 "donit ende të pranohet ky kyç publik?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Mora kyç publik për %s. Do të donit të pranohet ky kyç publik?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12105,108 +8926,70 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verifiko Kyç Publik"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
-#, fuzzy
 msgid "_View..."
-msgstr "Parje..."
+msgstr "_Parje..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tip kyçi publik i pambuluar"
 
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Shkëputur prej shërbyesit"
 
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Gabim gjatë lidhjes te Shërbyes SILC"
 
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Shkëmbimi i Kyçave dështoi"
 
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Dështoi rimarrja e sesionit të shkëputur. Shtypni Rilidhu për të krijuar një "
 "lidhje të re."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Lidhja dështoi"
 
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
-msgstr "Po kryej shkëmbim kyçesh"
+msgstr "Po kryhet shkëmbim kyçesh"
 
-#  Progress
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
-msgid "Connecting to SILC Server"
-msgstr "Po lidhem me Shërbyes SILC"
+msgid "Unable to create connection"
+msgstr "I pazoti të krijoj lidhje"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
 msgid "Could not load SILC key pair"
-msgstr "S'ngarkova dot kyç publik"
+msgstr "S'u ngarkua dot çift kyçesh SILC"
 
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
-#, fuzzy
-msgid "Unable to create connection"
-msgstr "I pazoti të krijoj lidhje të re."
+#  Progress
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "Po bëhet lidhja me Shërbyesin SILC"
 
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Kujtesë e pamjaftueshme"
 
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
-#, fuzzy
 msgid "Cannot initialize SILC protocol"
-msgstr "S'gatis dot lidhje SILC Client"
+msgstr "S'gatitet dot protokolli SILC"
 
-#: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "Po krijoj çift kyçesh SILC..."
+msgstr "Gabim gjatë ngarkimit të çiftit të kyçeve SILC"
+
+#, c-format
+msgid "Download %s: %s"
+msgstr "Shkarkim i %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Humori juaj i çastit"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
 #, c-format
 msgid "Normal"
 msgstr "Normale"
 
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
-#, fuzzy
 msgid "In love"
 msgstr "I dashuruar"
 
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12214,65 +8997,36 @@ msgstr ""
 "\n"
 "Metoda Kontakti Tuajat të Parapëlqyera "
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:689
-#, fuzzy
 msgid "Video conferencing"
 msgstr "Videokonferencë"
 
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Gjendja Juaj e Çastit"
 
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Shërbime Online"
 
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Lëri të tjerët të shohin se ç'shërbime po përdorni"
 
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Lëri të tjerët të shohin se ç'kompjuter po përdorni"
 
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Kartela juaj VCard"
 
-#: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "Zonë kohe"
+msgstr "Zonë kohore (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atribute Gjendjeje Përdoruesi të Lidhur"
 
-#: ../libpurple/protocols/silc/silc.c:818
-#: ../libpurple/protocols/silc10/silc.c:731
 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 "
@@ -12282,226 +9036,128 @@ msgstr ""
 "online dhe të dhëna vetjake. Ju lutem plotësoni të dhëna rreth jush që do të "
 "donit të shiheshin nga përdoruesit e tjerë."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Mesazhi i Ditës"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Pa Mesazh të Ditës të mundshëm"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nuk ka Mesazh të Ditës shoqëruar kësaj lidhjeje"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
-#, fuzzy
 msgid "Create New SILC Key Pair"
-msgstr "Po krijoj çift kyçesh SILC..."
+msgstr "Krijo Çift të Ri Kyçesh SILC"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
-#, fuzzy
 msgid "Passphrases do not match"
-msgstr "Fjalëkalimet nuk përputhen."
+msgstr "Fjalëkalimet nuk përputhen"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
-#, fuzzy
 msgid "Key Pair Generation failed"
-msgstr "Marrëveshja e kyçave dështoi"
+msgstr "Prodhimi i Çiftit të Kyçeve dështoi"
 
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
-#, fuzzy
 msgid "Key length"
-msgstr "Gjatësi Kyçi: \t%d bite\n"
+msgstr "Gjatësi kyçi"
 
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
-#, fuzzy
 msgid "Public key file"
-msgstr "Kartelë Kyçi Publik"
+msgstr "Kartelë kyçi publik"
 
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
-#, fuzzy
 msgid "Private key file"
-msgstr "Kartelë Kyçi Vetjak"
+msgstr "Kartelë kyçi vetjak"
 
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
-#, fuzzy
 msgid "Passphrase (retype)"
-msgstr "Fjalëkalim (rishtypeni)"
+msgstr "Fjalëkalim (rijepeni)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
-#, fuzzy
 msgid "Generate Key Pair"
-msgstr "Kartelë Kyçi Vetjak"
+msgstr "Prodho Çift Kyçesh"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Gjendje për I lidhur "
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Shihni Mesazhin e Ditës"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
-#, fuzzy
 msgid "Create SILC Key Pair..."
-msgstr "Po krijoj çift kyçesh SILC..."
+msgstr "Prodho Çift Kyçesh SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Përdoruesi <I>%s</I> nuk është i pranishëm në rrjet"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Temë shumë e gjatë"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Duhet të përcaktoni nofkë"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "Nuk u gjet kanal %s"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "mënyra kanali për %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nuk ka mënyra kanali të vendosura për %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Dështova në caktimin e \"cmodes\" për %s "
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Urdhër i panjohur: %s, (mund të jetë edhe një \"bug\" i Gaim-it)"
+msgstr "Urdhër i panjohur: %s, (mund të jetë edhe një \"bug\" i klientit)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Lër fjalosjen"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Lër fjalosjen"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;temë e re&gt;]:  Shihni ose ndryshoni temën"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;kanal&gt; [&lt;fjalëkalim&gt;]:  Bashkoju një fjalosjeje në këtë "
 "rrjet"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Listo kanale në këtë rrjet"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nofkë&gt;:  Shihni të dhëna nofke"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;nokë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh vetjak"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nofkë&gt; [&lt;mesazh&gt;]:  Dërgo një mesazh vetjak te një "
 "përdorues"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Shihni Mesazhin e Ditës (Message  Of The Day) të shërbyesit"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Shkëput këtë sesion"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [mesazh]:  Shkëputu prej shërbyesit, me një mesazh po deshët"
+msgstr "quit [mesazh]:  Shkëputuni prej shërbyesit, me një mesazh, po deshët"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;urdhër&gt;:  Thërrisni çfarëdo urdhër silc klienti"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nofkë&gt; [-pubkey|&lt;arsye&gt;]:  Asgjëso nofkë"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nofkë e re&gt;:  Ndryshoni nofkën tuaj"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nofkë&gt;:  Shihni të dhëna nofke"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12509,8 +9165,6 @@ msgstr ""
 "cmode &lt;kanal&gt; [+|-&lt;mënyra&gt;] [argumente]:  Ndrysho ose shfaq "
 "mënyra kanali"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12518,18 +9172,12 @@ msgstr ""
 "cumode &lt;kanal&gt; +|-&lt;mënyra&gt; &lt;nofkë&gt;:  Ndrysho mënyra nofke "
 "në kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;mënyrë përdoruesi&gt;:  Caktoni mënyrat tuaja në rrjet"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nofkë&gt; [-pubkey]:  Merr privilegje operatori shërbyesi"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12537,43 +9185,27 @@ msgstr ""
 "invite &lt;kanal&gt; [-|+]&lt;nofkë&gt;:  fto nofkë ose shto/hiq prej liste "
 "ftesash kanali"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;nofkë&gt; [koment]:  Përzër klient prej kanali"
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [shërbyes]:  Shihni hollësi administrative shërbyesi"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;nofkë&gt;]:  Ndaloji klientit kanalin"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;nofkë|shërbyes&gt;:  Merr kyç publik shërbyesi ose klienti"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Shihni statistika shërbyesi dhe rrjeti"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Dërgo PING te shërbyesi i lidhur"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Listo përdoruesa në kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12600,85 +9232,52 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Shtojcë Protokolli SILC"
 
 #  *  description
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokoll Secure Internet Live Conferencing (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "Rrjet"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Kartelë Kyçi Publik"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Kartelë Kyçi Vetjak"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
-msgstr ""
+msgstr "Shifër"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Përdor Sekret të Përkryer Përcjelljesh "
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Mirëfilltësim kyçi publik"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
-msgstr "Blloko IM-ra pa Shkëmbim Kyçesh"
+msgstr "Blloko MA-ra pa Shkëmbim Kyçesh"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "Blloko mesazhet për tabelë"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
-msgstr ""
+msgstr "Hape tabelën vetvetiu"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
-#, fuzzy
 msgid "Digitally sign and verify all messages"
-msgstr "Nënshkruaj numerikisht tërë mesazhet IM"
+msgstr "Nënshkruaj dhe verifiko në mënyrë shifrore tërë mesazhet"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "Po krijoj çift kyçesh SILC..."
+msgstr "Po krijohet çift kyçesh SILC..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
 msgid "Cannot create SILC key pair\n"
-msgstr "Po krijoj çift kyçesh SILC..."
+msgstr "S'krijohet dot çift  kyçesh SILC\n"
 
 #  Hint for translators: Please check the tabulator width here and in
 #  the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -12686,61 +9285,42 @@ msgstr "Po krijoj çift kyçesh SILC..."
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Emër i vërtetë: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Emër Përdoruesi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:359
-#, fuzzy, c-format
+#, c-format
 msgid "Email: \t\t%s\n"
-msgstr "EMail: \t\t%s\n"
+msgstr "Email: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Emër Strehe: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizëm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Vend: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritëm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
-#, fuzzy, c-format
+#, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Gjatësi Kyçi: \t%d bite\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "Organizëm: \t%s\n"
+msgstr "Version: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12751,8 +9331,6 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12761,166 +9339,104 @@ msgstr ""
 "\"Babbleprint\" Kyçi Publik:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Të dhëna Kyçi Publik"
 
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Nr. faquesi"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferencë"
 
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Kompjuter"
 
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "%s dërgoi mesazh te tabela. Dëshironi të hapet tabela?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
+msgstr "%s dërgoi mesazh te tabela në kanalin %s. Dëshironi të hapet tabela?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
-msgstr ""
+msgstr "Tabela"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Pa statistika shërbyesi të gatshme"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Dështim: Mospërputhje versioni, përditësoni klientin tuaj"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Dështim: I largëti nuk beson/mbulon kyçin tuaj publik"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Dështim: I largëti nuk mbulon grupin KE të propozuar"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Dështim: I largëti nuk mbulon shifrën e propozuar"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Dështim: I largëti nuk mbulon PKCS-në e propozuar"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Dështim: I largëti nuk mbulon funksionin hash të propozuar"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Dështim: I largëti nuk mbulon HMAC-un e propozuar"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
 #, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Dështim: Nënshkrim i pasaktë"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
 #, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Dështim: \"Cookie\" e pavlefshme"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Dështim: Mirëfilltësimi dështoi"
 
-#: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr "S'gatis dot lidhje SILC Client"
 
-#: ../libpurple/protocols/silc10/silc.c:290
-#, fuzzy
 msgid "John Noname"
-msgstr "Emër strehe"
+msgstr "Gjoni i Paemërt"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-#, fuzzy
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Nuk mund të dërgoj një drejtori."
-
-#: ../libpurple/protocols/silc10/silc.c:334
-#, fuzzy, c-format
+#, c-format
 msgid "Could not load SILC key pair: %s"
-msgstr "S'ngarkova dot kyç publik"
+msgstr "S'u ngarkua dot çift kyçesh SILC: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
-#, fuzzy
 msgid "Could not write"
-msgstr "S'munda të dërgoj"
+msgstr "S'shkruhej dot"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
-#, fuzzy
 msgid "Could not connect"
-msgstr "Nuk munda të Lidhem"
+msgstr "S'u bë dot lidhja"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
 msgid "Unknown server response."
-msgstr "Gabim i panjohur shërbyesi."
+msgstr "Përgjigje e panjohur shërbyesi"
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "S'munda të krijoj \"listen socket\""
 
-#: ../libpurple/protocols/simple/simple.c:1586
-#, fuzzy
-msgid "Couldn't resolve host"
-msgstr "S'munda të lidhem te strehë"
-
-#: ../libpurple/protocols/simple/simple.c:1677
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "S'munda të dërgoj"
-
-#: ../libpurple/protocols/simple/simple.c:1694
-#, fuzzy
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr ""
-"Emrat e përdoruesve në SIP mund të mos përmbajnë hapësira apo simbole @"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "Emra përdoruesish SIP mund të mos përmbajnë hapësira ose simbole @"
 
 #  *< api_version
 #  *< type
@@ -12940,7 +9456,6 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Shtojcë Protokolli SIP/SIMPLE"
 
@@ -12955,169 +9470,131 @@ msgstr "Shtojcë Protokolli SIP/SIMPLE"
 #  *< version
 #  *  summary
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Shtojca e Protokollit SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
-#, fuzzy
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Gjendje Botimi (shënim: mund t'ju shohë kushdo)"
+msgstr "Gjendje botimi (shënim: kushdo mund t'ju ndjekë)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "Përdor UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
-#, fuzzy
 msgid "Use proxy"
-msgstr "Përdor Ndërmjetës"
+msgstr "Përdor ndërmjetës"
 
-#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Proxy"
 msgstr "Ndërmjetës"
 
-#: ../libpurple/protocols/simple/simple.c:1911
-#, fuzzy
 msgid "Auth User"
-msgstr "Përdorues AP"
+msgstr "Mirëfilltësim Përdoruesi"
 
-#: ../libpurple/protocols/simple/simple.c:1913
-#, fuzzy
 msgid "Auth Domain"
-msgstr "Automatike"
+msgstr "Mirëfilltësim Përkatësie"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
-msgstr "Po shoh për %s"
+msgstr "Po shihet për %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Lidhu me %s dështoi"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Nënshkrim: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "I pazoti të shkruaj kartelën %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "I pazoti të lexoj kartelën %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Mesazh shumë i gjatë, shkurtuar me %s bajtet e fundit."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s jo i futur për çastin."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Sinjalizim i %s i palejueshëm."
 
-#: ../libpurple/protocols/toc/toc.c:503
 #, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ju është lënë një mesazh, po tejkaloni kufi shpejtësie shërbyesi."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Fjalosja në %s nuk është e mundshme."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Po i dërgoni mesazhet te %s shumë shpejt."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "humbët një IM prej %s sepse qe shumë i madh."
+msgstr "Humbët një MA prej %s, ngaqë qe shumë i madh."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Humbët një IM prej %s sepse u dërgua shumë shpejt."
+msgstr "Humbët një MA prej %s, ngaqë u dërgua shumë shpejt."
 
-#: ../libpurple/protocols/toc/toc.c:518
 #, c-format
 msgid "Failure."
 msgstr "Dështim."
 
-#: ../libpurple/protocols/toc/toc.c:521
 #, c-format
 msgid "Too many matches."
 msgstr "Shumë përputhje."
 
-#: ../libpurple/protocols/toc/toc.c:524
 #, c-format
 msgid "Need more qualifiers."
 msgstr "Lipsen më tepër cilësues."
 
-#: ../libpurple/protocols/toc/toc.c:527
 #, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Shërbim drejtorish përkohësisht i pamundur."
 
-#: ../libpurple/protocols/toc/toc.c:530
 #, c-format
 msgid "Email lookup restricted."
-msgstr "Kërkim email-i i ndaluar."
+msgstr "Kufizim kërkimi email-i."
 
-#: ../libpurple/protocols/toc/toc.c:533
 #, c-format
 msgid "Keyword ignored."
 msgstr "Fjalëkyç i shpërfillur."
 
-#: ../libpurple/protocols/toc/toc.c:536
 #, c-format
 msgid "No keywords."
 msgstr "Pa fjalëkyça."
 
-#: ../libpurple/protocols/toc/toc.c:539
 #, c-format
 msgid "User has no directory information."
 msgstr "Përdoruesi nuk ka të dhëna drejtorie."
 
-#: ../libpurple/protocols/toc/toc.c:543
 #, c-format
 msgid "Country not supported."
 msgstr "Vend i pambuluar."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Dështim i panjohur: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
-#, fuzzy, c-format
-msgid "Incorrect screen name or password."
-msgstr "Nofkë ose fjalëkalim i pasaktë."
+#, c-format
+msgid "Incorrect username or password."
+msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm."
 
-#: ../libpurple/protocols/toc/toc.c:552
 #, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Shërbimi është përkohësisht i pamundshëm."
 
-#: ../libpurple/protocols/toc/toc.c:555
 #, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Niveli juaj i sinjalizimeve për çastin është tepër i lartë për hyrje."
 
-#: ../libpurple/protocols/toc/toc.c:558
 #, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
@@ -13126,81 +9603,61 @@ msgstr ""
 "Jeni lidhur e shkëputur si shumë shpesh.  Prisni dhjetë minuta dhe "
 "riprovoni.  Nëse vazhdoni të provoni, do t'ju duhet të prisni akoma më gjatë."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ndodhi një gabim i panjohur nënshkrimi: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Ndodhi një gabim i panjohur, %d.  Të dhëna: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Emër i pavlefshëm grupi"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Lidhja u Mbyll"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
-msgstr "Po pres për përgjigje..."
+msgstr "Po pritet për përgjigje..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC e mori veten pas pushimit. Tani mundeni të dërgoni mesazhet tuaj sërish."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Ndryshim i Sukseshëm Fjalëkalimi"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "_Grup:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Merr Të dhëna Drejt."
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Caktoni Të dhëna Drejt."
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "S'hapa dot %s për shkrim!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "Shpërngulja e kartelës dështoi; mbase ana tjetër e anuloi."
 
-#: ../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 "S'u lidha dot për shpërngulje."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "S'munda të shkruaj titull kartele.  Kartela nuk do të shpërngulet."
 
-#: ../libpurple/protocols/toc/toc.c:2175
-#, fuzzy
 msgid "Save As..."
-msgstr "Ruaj Ikonë Si..."
+msgstr "Ruaje Si..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s ju kërkon %s të pranoni %d kartelë: %s (%.2f %s)%s%s"
 msgstr[1] "%s ju kërkon %s të pranoni %d kartela: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ju kërkon t'i dërgoni kartelë"
@@ -13226,30 +9683,23 @@ msgstr "%s ju kërkon t'i dërgoni kartelë"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Shtojcë Protokolli TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s ju dërgoi një ftesë për kamera web, çka nuk mbulohet ende."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Mesazhi juaj Yahoo! nuk u dërgua."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mesazh sistemi Yahoo! për %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
-#, fuzzy
 msgid "Authorization denied message:"
-msgstr "Mesazh Mohimi Autorizimi:"
+msgstr "Mesazh mohimi autorizimi:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -13258,33 +9708,28 @@ msgstr ""
 "%s ka hedhur tej (në mënyrë prapavepruese) kërkesën tuaj për ta shtuar te "
 "lista juaj për arsyen vijuese: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s ka hedhur tej (në mënyrë prapavepruese) kërkesën tuaj për ta shtuar te "
 "lista juaj."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Shto shok të hedhur tej"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
-#, fuzzy, c-format
+#, 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 ""
 "Shërbyesi Yahoo ka kërkuar përdorimin e një metode mirëfilltësimi të "
-"papranuar.  Ky version i Gaim-it ka gjasa të mos mundë të hyjë me sukses te "
-"Yahoo.  Shihni %s për përditësime."
+"papranuar.  Ka gjasa të mos arrini dot të hyni me sukses te Yahoo.  Shihni %"
+"s për përditësime."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Mirëfilltësim Yahoo! i Dështuar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13293,182 +9738,119 @@ msgstr ""
 "Provuat të shpërfillni %s, por përdoruesi gjendet në listën tuaj të "
 "shokëve.  Klikimi i \"Po\"-së do ta heqë dhe shpërfillë shokun."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "Të shpërfill shok?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Llogaria juaj është kyçur, ju lutem futuni te \"site\"-i Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Numrë gabimi të panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreqë "
 "këtë."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "S'shtoj dot shokun %s te grupi %s te listë shërbyesi në llogarinë %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "S'munda të shtoj shok te listë shërbyesi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
+msgstr "[%s/%s/%s.swf  e dëgjueshme] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
-#, fuzzy
 msgid "Received unexpected HTTP response from server."
-msgstr "Përgjigje e pavlefshme prej shërbyesit."
+msgstr "U mor prej shërbyesit përgjigje HTTP e papritur."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problem lidhjeje"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
-msgstr "Bashkëbisedim me %s te %s"
+msgstr ""
+"U humb lidhja me %s:\n"
+"%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
+"Nuk u arrit të vendosej lidhja me %s:\n"
+"%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
-#, fuzzy
 msgid "Not at Home"
 msgstr "Jo Në Shtëpi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
-#, fuzzy
 msgid "Not at Desk"
 msgstr "Jo Në Tryezë"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
-#, fuzzy
 msgid "Not in Office"
 msgstr "Jo Në Zyrë"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "Me Pushime"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "Jo në listë shërbyesi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "Shfaqu I lidhur"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "Shfaqu Përherë Jo i lidhur"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
-#, fuzzy
 msgid "Presence"
-msgstr "Parapëlqime"
+msgstr "Prani"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "Shfaqet Jo i lidhur"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "Mos u Duk Përherë Jo i lidhur"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Bashkoju Fjalosjes"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Nis Konferencë"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
-#, fuzzy
 msgid "Presence Settings"
-msgstr "Rregullime për Stealth"
+msgstr "Rregullime Pranie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
 msgid "Activate which ID?"
-msgstr "Veprues cili ID?"
+msgstr "Veprues cila ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "T'i bashkohem kujt në fjalosje?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Aktivizo ID"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
-#, fuzzy
 msgid "Join User in Chat..."
-msgstr "Bashkoju përdoruesi në fjalosje..."
+msgstr "Bashkoju Përdoruesi në Fjalosje..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
 msgid "Open Inbox"
-msgstr "Hap Hotmail Inbox"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy
-msgid "Buzz"
-msgstr "Buzz!!"
+msgstr "Hap Të Marrë"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;dhomë&gt; Bashkoju një dhome fjalosjeje në rrjetin Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
-#, fuzzy
 msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Listo kanale në këtë rrjet"
+msgstr "list:  Radhit dhoma te rrjeti Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: Kërkoji përdoruesit të nisë një sesion Doodle"
 
 #  *< api_version
 #  *< type
@@ -13491,94 +9873,64 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Shtojcë Protokolli Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "Yahoo Japoni"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
-#, fuzzy
 msgid "Pager server"
-msgstr "Shërbyes \"Proxy\""
+msgstr "Shërbyes Faquesi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
-#, fuzzy
 msgid "Japan Pager server"
-msgstr "Strehë Japoneze Faquesi"
+msgstr "Shërbyes Japonez Faquesi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "Portë faquesi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
-#, fuzzy
 msgid "File transfer server"
-msgstr "Strehë shpërnguljesh kartelash"
+msgstr "Shërbyes shpërnguljesh kartelash"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
-#, fuzzy
 msgid "Japan file transfer server"
-msgstr "Strehë Japoneze shpërngulje kartelash"
+msgstr "Shërbyes Japonez shpërnguljesh kartelash"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "Portë shpërnguljesh kartelash"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-#, fuzzy
 msgid "Chat room locale"
-msgstr "Vendore Dhome Fjalosjeje"
+msgstr "Vendore dhome fjalosjeje"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
+msgstr "Shpërfill ftesa konferencash dhe dhomash fjalosjeje"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
-#, fuzzy
 msgid "Chat room list URL"
-msgstr "Url Liste Dhome Fjalosjeje"
+msgstr "Url liste dhome fjalosjeje"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
-msgstr ""
+msgstr "Shërbyes fjalosjeje Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-#, fuzzy
 msgid "Yahoo Chat port"
-msgstr "Yahoo Japoni"
+msgstr "Portë fjalosjeje Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "Dërgova kërkesë Doodle."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "I pazoti të vendos përshkrues kartele."
 
-#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-#, fuzzy
-msgid "Write Error"
-msgstr "Gabim shkrimi"
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s po përpiqet t'ju dërgojë një grup prej %d kartelash.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! për Japoninë"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -13586,64 +9938,48 @@ msgstr ""
 "Më vjen keq, profile me shenjë përmbajtjeje materialesh për të rritur nuk "
 "mbulohen tani për tani. "
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Nëse doni të vizitoni këtë profil, ju duhet të vizitoni këtë lidhje me "
-"shfletuesin tuaj web"
+"Nëse doni ta shihni këtë profil, lypset të vizitoni këtë lidhje përmes "
+"shfletuesit tuaj web:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobi"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Të reja më të Fundit"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Faqe Hyrëse"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Lidhje \"Cool\" 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Lidhje \"Cool\" 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Lidhje \"Cool\" 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Përditësimi i Fundit"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Të dhëna përdoruesi për %s të pamundshme"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-#, fuzzy
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
-"Më ndjeni, ky profil duket të jetë në një gjuhë që nuk mbulohet në këtë kohë."
+"Më ndjeni, ky profil duket të jetë në një gjuhë apo format që nuk mbulohet "
+"hëpërhë."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13651,7 +9987,6 @@ msgstr ""
 "S'munda të marr profil e përdoruesit. Ka shumë të ngjarë të jetë një problem "
 "i shërbyesit. Ju lutem riprovoni më vonë."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 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 "
@@ -13662,94 +9997,74 @@ msgstr ""
 "gjejë një profil përdoruesi. Nëse e dini që përdoruesi ekziston, ju lutem "
 "riprovoni më vonë."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Profili i përdoruesit është bosh."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s hodhi tej ftesën tuaj për konferencë te dhoma \"%s\" sepse \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "ftesë e hedhur poshtë"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Dështova në futjen te fjalosje"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
-#, fuzzy
 msgid "Unknown room"
-msgstr "Gabim i Panjohur "
+msgstr "Dhomë e panjohur"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
-#, fuzzy
 msgid "Maybe the room is full"
-msgstr "Mbase dhoma është plot?"
+msgstr "Ndoshta dhoma është plot"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
-#, fuzzy
 msgid "Not available"
-msgstr "Jo i mundshëm"
+msgstr "Jo i passhëm"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
+"Gabim i panjohur. Mund t'ju duhet të dilni e të prisni pesë minuta përpara "
+"se të jeni në gjendje të rifuteni në një dhomë fjalosjeje"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Tani jeni duke u fjalosur te %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Dështova në lidhjen me shokun te fjalosja"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Mbase nuk janë në ndonjë fjalosje?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Dështoi prurja e listës së dhomave."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Zëra"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Kamera web"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "I pazoti të bie listë dhomash."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Dhoma Përdoruesi"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problem lidhjeje me shërbyesin YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Lost connection with server\n"
 "%s"
-msgstr "I palidhur te shërbyesi."
+msgstr ""
+"Humbi lidhja me shërbyesin\n"
+"%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13757,81 +10072,61 @@ msgstr ""
 "(Pati një gabim në shndërrimin e këtij mesazhi.\tkontrolloni mundësinë "
 "'Kodime' te Përpunues Llogarish)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "I pazoti të dërgoj fjalosje te %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "<br>I fshehur ose jo i futur"
+msgstr "I fshehur ose jo i futur"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Në %s që prej %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Cilido"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Klasë:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instancë:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Marrës:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Përpjekja për t'u regjistruar te %s,%s,%s dështoi"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nofkë&gt;: Pikas përdorues"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nofkë&gt;: Pikas përdorues"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;klasë&gt; &lt;instancë&gt; &lt;marrës&gt;: Bashkoju një fjalosjeje "
 "të re"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: Dërgo një mesazh te &lt;message,<i>instance</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;"
@@ -13839,7 +10134,6 @@ msgstr ""
 "zci &lt;class&gt; &lt;instance&gt;: Dërgo një mesazh te &lt;<i>class</i>,"
 "<i>instance</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;"
@@ -13847,7 +10141,6 @@ msgstr ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Dërgo një mesazh te "
 "&lt;<i>class</i>,<i>instance</i>,<i>recipient</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;"
@@ -13855,15 +10148,12 @@ msgstr ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Dërgo mesazh te &lt;MESAZH,"
 "<i>instance</i>,<i>recipient</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;class&gt;: Dërgo një mesazh te &lt;<i>class</i>,VETJAKE,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Riabonohu"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Merr regjistrime prej shërbyesi"
 
@@ -13888,135 +10178,104 @@ msgstr "Merr regjistrime prej shërbyesi"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Shtojcë Protokolli Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
-#, fuzzy
 msgid "Use tzc"
-msgstr "Hiq"
+msgstr "Përdor tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
-#, fuzzy
 msgid "tzc command"
-msgstr "S'ka të tillë urdhër."
+msgstr "Urdhër tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Eksporto te .cilido"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Eksporto te .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Importo prej .cilitdo"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Importo prej .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Emër i vërtetë"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Ekspozim"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
-msgstr "I pazoti të krijoj \"socket\""
+msgstr ""
+"I pazoti të krijoj \"socket\":\n"
+"%s"
 
-#: ../libpurple/proxy.c:659
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgstr "Nuk u përtyp dot përgjigjja prej ndërmjetësit HTTP: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
-#, fuzzy, c-format
+#, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Gabim lidhjeje \"proxy\" %d"
+msgstr "Gabim lidhjeje i shërbyesit HTTP %d"
 
 #  XXX: why in the hell are we calling gaim_connection_error() here?
 #  Forbidden
-#: ../libpurple/proxy.c:788
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Hyrje e mohuar: shërbyesi \"proxy\" ndalon tunelizim të portës %d."
+msgstr ""
+"Hyrje e mohuar: shërbyesi ndërmjetës HTTP ndalon tunelizim të portës %d."
 
-#: ../libpurple/proxy.c:1012
-#, fuzzy, c-format
+#, c-format
 msgid "Error resolving %s"
-msgstr "Gabim në xhirimin e %s"
+msgstr "Gabim në shquajtjen e %s"
 
-#: ../libpurple/proxy.c:1714
-#, fuzzy
 msgid "Could not resolve host name"
-msgstr "S'munda të dërgoj"
+msgstr "Nuk shquajtja dos emër strehe"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Po tërhiqet vëmendja e %s..."
+
+#  MSG_CLIENT_WHOIS
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s ka kërkuar vëmendjen tuaj!"
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
-#, fuzzy
 msgid "_Yes"
-msgstr "Po"
+msgstr "_Po"
 
-#: ../libpurple/request.h:1378
-#, fuzzy
 msgid "_No"
-msgstr "Jo"
+msgstr "_Jo"
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
-#, fuzzy
 msgid "_Accept"
-msgstr "Prano"
+msgstr "_Prano"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
-msgstr ""
+msgstr "Nuk jam këtu tani për tani"
 
-#: ../libpurple/savedstatuses.c:535
-#, fuzzy
 msgid "saved statuses"
-msgstr "Gjendje të Ruajtura"
+msgstr "gjendje të ruajtura"
 
-#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s tani njihet si %s.\n"
 
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
-
-#  MSG_CLIENT_WHOIS
-#: ../libpurple/server.c:347
-#, fuzzy, c-format
-msgid "%s has requested your attention!"
-msgstr "%s kërkoi të dhënat rreth jush"
-
-#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14025,99 +10284,96 @@ msgstr ""
 "%s ka ftuar %s te doma e fjalosjes %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ka ftuar %s te doma e fjalosjes %s\n"
 
-#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "Të pranoj ftesë fjalosjeje?"
 
-#: ../libpurple/sslconn.c:164
-#, fuzzy
+#. Shortcut
+msgid "Shortcut"
+msgstr "Shkurtore"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Shkurtore tekst për emotikonin"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Pamje e Ruajtur"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
 msgid "SSL Connection Failed"
-msgstr "Lidhja Dështoi"
+msgstr "Lidhja SSL dështoi"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Dështoi Duarshtrëngim SSL"
 
-#: ../libpurple/sslconn.c:168
-#, fuzzy
 msgid "SSL peer presented an invalid certificate"
-msgstr "Keni dhënë një emër përdoruesi të pavlefshëm"
+msgstr "Ortaku SSL paraqiti një dëshmi të pavlefshme"
 
-#: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Gabim i panjohur"
+msgstr "Gabim i panjohur SSL"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Hiq"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-#, fuzzy
 msgid "Do not disturb"
-msgstr "Mos Bezdis"
+msgstr "Mos më bezdis"
 
-#: ../libpurple/status.c:159
-#, fuzzy
 msgid "Extended away"
-msgstr "Larguar e Zgjeruar"
+msgstr "Largim i zgjeruar"
 
-#: ../libpurple/status.c:160
-#, fuzzy
 msgid "Mobile"
 msgstr "Telefon Celular"
 
-#: ../libpurple/status.c:609
-#, fuzzy, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s ka ndryshuar temën në: %s"
+msgid "Listening to music"
+msgstr "Po dëgjoj muzikë"
 
-#: ../libpurple/status.c:619
-#, fuzzy, c-format
-msgid "%s is now %s"
-msgstr "%s tani njihet si %s"
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) ndryshoi gjendjen prej %s te %s"
 
-#: ../libpurple/status.c:624
-#, fuzzy, c-format
-msgid "%s is no longer %s"
-msgstr "%s nuk është më i larguar."
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) tani njihet si %s"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) nuk është më %s"
 
-#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s u plogështua"
 
-#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s u gjallërua"
 
-#: ../libpurple/status.c:1314
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s became idle"
-msgstr "%s u plogështua"
+msgstr "+++ %s u plogështua"
 
-#: ../libpurple/status.c:1316
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s became unidle"
-msgstr "%s u gjallërua"
+msgstr "+++ %s u gjallërua"
 
-#: ../libpurple/util.c:718
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
-msgstr ""
+msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "Gabim në Leximin e %s"
 
-#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -14126,190 +10382,178 @@ msgstr ""
 "U has një gabim gjatë leximit të %s suaj.  Nuk u ngarkuan, dhe kartela e "
 "vjetër është riemërtuar %s~."
 
-#: ../libpurple/util.c:3223
 msgid "Calculating..."
-msgstr "Po llogaris..."
+msgstr "Po llogaritet..."
 
-#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "I panjohur."
 
-#: ../libpurple/util.c:3252
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "sekondë"
-msgstr[1] "sekonda"
+msgstr[0] "%d sekondë"
+msgstr[1] "%d sekonda"
 
-#: ../libpurple/util.c:3264
-#, fuzzy, c-format
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "ditë"
-msgstr[1] "ditë"
+msgstr[0] "%d ditë"
+msgstr[1] "%d ditë"
 
-#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d orë"
+msgstr[1] "%s, %d orë"
 
-#: ../libpurple/util.c:3278
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "orë"
-msgstr[1] "orë"
+msgstr[0] "%d orë"
+msgstr[1] "%d orë"
 
-#: ../libpurple/util.c:3286
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "minutë"
-msgstr[1] "minuta."
+msgstr[0] "%s, %d minutë"
+msgstr[1] "%s, %d minuta."
 
-#: ../libpurple/util.c:3292
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "minutë"
-msgstr[1] "minuta."
+msgstr[0] "%d minutë"
+msgstr[1] "%d minuta."
 
-#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "Nuk u hap dot %s: U bë ridrejtim shumë herë"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "I pazoti të lidhem me shërbyesin."
+msgstr "I pazoti të lidhem te %s."
 
-#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
+"I pazoti të siguroj kujtesë të mjaftueshme për mbajtje lënde prej %s. "
+"Shërbyesi web mund të jetë duke provuar diçka dashakeqe."
 
-#: ../libpurple/util.c:3747
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr ""
-"Gabim në leximin e %s: \n"
-"%s.\n"
+msgstr "Gabim gjatë leximit prej %s: %s"
 
-#: ../libpurple/util.c:3778
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"Gabim në shkrimin e %s: \n"
-"%s.\n"
+msgstr "Gabim gjatë shkrimit prej %s: %s"
 
-#: ../libpurple/util.c:3803
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "I pazoti të lidhem me shërbyesin."
+msgstr "I pazoti të lidhem %s: %s"
+
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "Lidhja u ndërpre nga tjetër program në kompjuterin tuaj."
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr "Streha e largët e mbylli ndërlidhjen"
+
+#. 10060
+#, c-format
+msgid "Connection timed out."
+msgstr "Mbaroi koha e ndërlidhjes."
+
+#. 10061
+#, c-format
+msgid "Connection refused."
+msgstr "Ndërlidhje e papranuar."
+
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Vendndodhje tashmë në përdorim."
 
-#: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Lajmësjellës Internet"
 
-#: ../pidgin.desktop.in.h:2
-#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "Lajmësjellës Internet"
+msgstr "Pidgin Internet Messenger"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Dërgoni mesazhe të atypëratyshëm protokollesh të ndryshëm"
 
-#: ../pidgin/eggtrayicon.c:129
-#, fuzzy
 msgid "Orientation"
-msgstr "Organizëm"
+msgstr "Orientim"
 
-#: ../pidgin/eggtrayicon.c:130
 msgid "The orientation of the tray."
-msgstr ""
+msgstr "Drejtimi i shtyllës së mjeteve."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Mundësi Futjeje"
 
-#: ../pidgin/gtkaccount.c:428
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "Protokoll:"
-
-#: ../pidgin/gtkaccount.c:439
-#, fuzzy
-msgid "Screen _name:"
-msgstr "Emër në ekran:"
+msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:529
-#, fuzzy
-msgid "_Local alias:"
-msgstr "Kartelë Vendore:"
+msgid "_Username:"
+msgstr "_Emër përdoruesi:"
 
-#: ../pidgin/gtkaccount.c:533
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "Mbaj mend fjalëkalim"
+msgstr "Mbaje mend _fjalëkalimin"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Mundësi Përdoruesi"
 
-#: ../pidgin/gtkaccount.c:604
-#, fuzzy
+msgid "_Local alias:"
+msgstr "Alias _vendor:"
+
 msgid "New _mail notifications"
-msgstr "Njoftime poste të re"
+msgstr "Njoftime _poste të re"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
-msgstr ""
+msgstr "Përdor këtë _ikonë shoku për këtë llogari:"
 
 #  Build the protocol options frame.
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "Mundësi %s"
 
 #  Use Global Proxy Settings
-#: ../pidgin/gtkaccount.c:936
-#, fuzzy
 msgid "Use GNOME Proxy Settings"
-msgstr "Përdor Rregullime të Përgjithshme \"Proxy\""
+msgstr "Përdor Rregullime GNOME për Ndërmjetësin"
 
 #  Use Global Proxy Settings
-#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Përdor Rregullime të Përgjithshme \"Proxy\""
 
-#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Pa \"Proxy\""
 
 #  HTTP
-#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "Përdor Rregullime Mjedisi"
 
@@ -14318,74 +10562,52 @@ msgstr "Përdor Rregullime Mjedisi"
 #. 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:1006
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Mundësi \"Proxy\""
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "_Tip \"proxy\":"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "_Strehë:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Portë:"
 
-#: ../pidgin/gtkaccount.c:1065
-msgid "_Username:"
-msgstr "_Emër përdoruesi:"
-
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "Fjalë_kalim:"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "I pazoti të krijoj lidhje të re."
+msgstr "I pazoti të ruaj llogari të re"
 
-#: ../pidgin/gtkaccount.c:1196
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Ka tashmë një llogari me veçoritë që kërkuat."
 
-#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Shto Llogari"
 
-#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
-msgstr ""
+msgstr "_Bazë"
 
-#: ../pidgin/gtkaccount.c:1499
-msgid "Create this new account on the server"
-msgstr ""
+msgid "Create _this new account on the server"
+msgstr "Krijo te shërbyesi _këtë llogari të re"
 
-#: ../pidgin/gtkaccount.c:1515
-#, fuzzy
 msgid "_Advanced"
-msgstr "_Anulo"
+msgstr "_Të mëtejshme"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Aktivizuar"
 
-#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14398,474 +10620,433 @@ msgid ""
 "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'>Mirësevini te %s!</span>\n"
+"\n"
+"Nuk keni llogarira MA të formësuar. Për të filluar lidhjen me %s shtypni më "
+"poshtë butonin <b>Shto</b> dhe formësoni llogarinë tuaj të parë. Nëse doni "
+"që %s të lidhet me shumë llogarira MA, shtypni <b>Shto</b> sërish për "
+"formësimin e gjithë atyre.\n"
+"\n"
+"Mund t'i riktheheni kësaj dritareje për shtim, përpunim apo heqje llogarish "
+"nga <b>Llogari->Shtoni/Përpunoni</b> te dritarja e Listave të Shokëve"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Bashkoju një Fjalosjeje"
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Keni %d kontakt të quajtur %s. Doni ta përzieni atë?"
+msgstr[1] "Hëpërhë keni %d kontakte të quajtur %s. Doni t'i përzieni ata?"
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Përzierja e këtyre kontakteve do të bëjë që të ndajnë mes tyre një pjesë të "
+"vetme të përbashkët te lista e shokëve dhe të përdorin një dritare të vetme "
+"bashkëbisedimesh. Mund t'i ndani sërish ata duke zgjedhur 'Zgjeroji' te "
+"menuja e kontekstit për kontaktet"
+
+msgid "Please update the necessary fields."
+msgstr "Ju lutem, përditësoni fushat e nevojshme."
+
+msgid "Room _List"
+msgstr "_Listë Dhomash"
 
-#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Ju lutem jepni të dhënat e duhura rreth fjalosjes ku doni të merrni pjesë.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Llogari:"
 
 #  Block button
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
-#, fuzzy
 msgid "_Block"
-msgstr "Blloko"
+msgstr "_Blloko"
 
 #  Block button
-#: ../pidgin/gtkblist.c:1088
-#, fuzzy
 msgid "Un_block"
-msgstr "Zhblloko"
+msgstr "_Zhblloko"
+
+msgid "Move to"
+msgstr "Kaloje te"
 
-#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr "Merr  _Të dhëna"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Dërgo Kartelë"
+msgid "_Send File..."
+msgstr "_Dërgo Kartelë..."
 
-#: ../pidgin/gtkblist.c:1155
-#, fuzzy
-msgid "Add Buddy _Pounce"
-msgstr "Shto _Cytje Shoku"
+msgid "Add Buddy _Pounce..."
+msgstr "Shto _Cytje Shoku..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "Shih _Regjistrim"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+msgid "Hide when offline"
+msgstr "Fshihe kur është i palidhur"
+
+msgid "Show when offline"
+msgstr "Shfaqe kur është i palidhur"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "_Hiq"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Shto një _Shok"
+msgid "Set Custom Icon"
+msgstr "Caktoni Ikonë Vetjake"
+
+msgid "Remove Custom Icon"
+msgstr "Hiq Ikonë Vetjake"
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Shto një F_jalosje"
+msgid "Add _Buddy..."
+msgstr "Shto _Shok..."
+
+msgid "Add C_hat..."
+msgstr "Shto _Fjalosje..."
 
-#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "_Fshij Grup"
 
-#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "_Riemërto"
 
 #  join button
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Bashkojuni"
 
-#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "Vetë-bashkoju"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+msgid "Persistent"
+msgstr "Këmbëngulës"
+
+msgid "_Edit Settings..."
+msgstr "_Përpunoni Rregullimet..."
+
 msgid "_Collapse"
 msgstr "_Tkurr"
 
-#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_Zgjero"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/Mjete/Pa Tinguj"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Për çastin nuk keni hyrë me një llogari nga e cila të mund të shtoni atë "
 "shok."
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr "Lloj i panjohur nyjeje"
+
 #  Buddies menu
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Shokë"
 
-#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Shokë/_Mesazh i Atypëratyshëm i Ri..."
 
-#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Shokë/Bashkoju një _Fjalosjeje..."
 
-#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/Shokë/Merr Të _dhëna Përdoruesi..."
 
-#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/Shokë/Shih _Regjistrim Përdoruesi..."
 
 #  Buddies menu
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/_Shokë"
+msgid "/Buddies/Sh_ow"
+msgstr "/Shokë/_Shfaq"
 
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Shokë/Shfaq Shokë _Jo të lidhur"
+msgstr "/Shokë/Shfaq/Shokë _Jo të lidhur"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Shokë/Shfaq Grupe _Bosh"
+msgstr "/Shokë/Shfaq/_Grupe Bosh"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Shokë/Shfaq _Hollësi Shokësh"
+msgstr "/Shokë/Shfaq/_Hollësi Shoku"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
+msgstr "/Shokë/Shfaq/_Kohë Plogështie"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Shokë/Shfaq Grupe _Bosh"
+msgstr "/Shokë/Shfaq/ _Ikona Protokollesh"
 
-#: ../pidgin/gtkblist.c:2881
-#, fuzzy
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Shokë/Radhit Shokë"
+msgstr "/Shokë/_Rendit Shokët"
 
-#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Shokë/_Shto Shokë..."
 
-#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Shokë/Shto F_jalosje..."
 
-#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Shokë/Shto _Grup..."
 
-#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Shokë/_Lër"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
-#, fuzzy
 msgid "/_Accounts"
-msgstr "Llogari"
+msgstr "/_Llogari"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-#, fuzzy
-msgid "/Accounts/Add\\/Edit"
-msgstr "Llogari"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Llogari/Administroni Llogari"
 
 #  Tools
 #. Tools
-#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/_Mjete"
 
-#: ../pidgin/gtkblist.c:2895
-#, fuzzy
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Mjete/_Cytje Shoku"
+msgstr "/Mjete/_Cytje Shokësh"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/Mjete/Par_apëlqime"
+msgstr "/Mjete/_Dëshmi"
 
-#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/Mjete/Shtojca"
 
-#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Mjete/Par_apëlqime"
 
-#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Mjete/Vetës_i"
 
-#: ../pidgin/gtkblist.c:2901
+msgid "/Tools/Smile_y"
+msgstr "/Mjete/_Emotikone"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Mjete/Shpërngulje _Kartelash"
 
-#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/Mjete/Listë Dh_omash"
 
-#: ../pidgin/gtkblist.c:2903
-#, fuzzy
 msgid "/Tools/System _Log"
-msgstr "/Mjete/Shih _Regjistrime Sistemi"
+msgstr "/Mjete/_Regjistrime Sistemi"
 
-#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/Mjete/Pa _Tinguj"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/_Ndihmë"
 
-#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/Ndihmë/Ndihmë Online"
 
-#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/Ndihmë/Dritare _Debug"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/Ndihmë/_Rreth"
 
-#: ../pidgin/gtkblist.c:2942
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Llogari:</b> %s"
+
 #, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Llogari:</b> %s"
+"<b>Pjesëmarrës:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>Temë:</b> %s"
+
+msgid "(no topic set)"
+msgstr "(nuk është caktuar temë)"
 
-#: ../pidgin/gtkblist.c:3020
-#, fuzzy
 msgid "Buddy Alias"
-msgstr "Listë Shokësh"
+msgstr "Alias Shoku"
 
-#: ../pidgin/gtkblist.c:3049
-#, fuzzy
 msgid "Logged In"
-msgstr "Tashmë i Futur"
+msgstr "I futur"
 
-#: ../pidgin/gtkblist.c:3095
-#, fuzzy
 msgid "Last Seen"
-msgstr "Mbiemër"
+msgstr "Parë së Fundmi"
 
-#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
-msgstr ""
+msgstr "Fjalaman"
 
-#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
-msgstr ""
+msgstr "I hatashëm"
 
-#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
-msgstr ""
+msgstr "Rockin'"
 
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
+msgid "Total Buddies"
+msgstr "Shokë Gjithsej"
+
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "I plogësht (%dh%02dm) "
+msgstr "I plogësht %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dh %02dm"
-msgstr "I plogësht (%dh%02dm) "
+msgstr "I plogësht %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
-#, fuzzy, c-format
+#, c-format
 msgid "Idle %dm"
-msgstr "I plogësht (%dm) "
+msgstr "I plogësht %dm"
 
-#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/Shokë/Mesazh i Atypëratyshëm i Ri..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/Shokë/Bashkoju njëFjalosjeje..."
 
-#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/Shokë/Merr Të dhëna Përdoruesi..."
 
-#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/Shokë/Shto Shokë..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/Shokë/Shto Fjalosje..."
 
-#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/Shokë/Shto Grup..."
 
-#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/Mjete/Vetësi"
 
-#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/Mjete/Listë Dhomash"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "Mesazh prej %s"
-msgstr[1] "Mesazh prej %s"
+msgstr[0] "%d mesazh i palexuar prej %s\n"
+msgstr[1] "%d mesazhe të palexuar prej %s\n"
 
-#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "Dorazi"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Sipas abc-së"
-
-#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "Sipas gjendjeje"
 
-#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "Sipas madhësie regjistrimi"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s u shkëput"
 
-#: ../pidgin/gtkblist.c:4067
 #, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr ""
+msgid "%s disabled"
+msgstr "%s joveprues"
+
+msgid "Reconnect"
+msgstr "Rilidhu"
+
+msgid "Re-enable"
+msgstr "Riaktivizoje"
+
+msgid "Welcome back!"
+msgstr "Mirësevini sërish!"
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+"Llogaria %d qe çaktivizuar ngaqë nënshkruat për të prej një tjetër vendi:"
+msgstr[1] ""
+"Llogaritë %d qenë çaktivizuar ngaqë nënshkruat për to prej një tjetër vendi:"
 
-#: ../pidgin/gtkblist.c:4219
-#, fuzzy
 msgid "<b>Username:</b>"
-msgstr "_Emër përdoruesi:"
+msgstr "<b>Emër përdoruesi:</b>"
 
-#: ../pidgin/gtkblist.c:4226
-#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "Fjalëkalim:"
+msgstr "<b>Fjalëkalim:</b>"
 
-#: ../pidgin/gtkblist.c:4237
-#, fuzzy
 msgid "_Login"
-msgstr "Hyrje"
+msgstr "_Hyrje"
 
-#: ../pidgin/gtkblist.c:4320
-#, fuzzy
 msgid "/Accounts"
-msgstr "Llogari"
+msgstr "/Llogari"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
 #, 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."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
+"<span weight='bold' size='larger'>Mirësevini te %s!</span>\n"
+"\n"
+"Nuk keni llogari vepruese. Aktivizoni llogarirat tuaj MA prej dritares "
+"<b>Llogari</b> te <b>Llogari->Administroni Llogarira</b>. Pasi të aktivizoni "
+"llogaritë, do të jeni në gjendje të nënshkruani, caktoni gjendjen tuaj, dhe "
+"të flisni me shokët tuaj."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
+msgstr "/Shokë/Shfaq/Shokë _Jo të lidhur"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Shokë/Shfaq Grupe Bosh"
+msgstr "/Shokë/Shfaq/Grupe _Bosh"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Shokë/Shfaq Hollësi Shokësh"
+msgstr "/Shokë/Shfaq/Hollësi Shoku"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
+msgstr "/Shokë/Shfaq/Kohë PLogështie"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Shokë/Shfaq Grupe Bosh"
+msgstr "/Shokë/Shfaq/Ikona Protokollesh"
 
-#: ../pidgin/gtkblist.c:5507
-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 ""
-"Ju lutem jepni emrin e ekranit për personin që do të donit ta shtoni te "
-"listë juaja shokësh. Mundet po aq të jepni për shokun një alias, ose një "
-"nofkë. Aliasi do të shfaqet në vend të emrit të ekranit kurdo që të jetë e "
-"mundur.\n"
+msgid "Add a buddy.\n"
+msgstr "Shto një shok.\n"
 
-#. End of account box
-#: ../pidgin/gtkblist.c:5542
-#, fuzzy
-msgid "_Screen name:"
-msgstr "Emër në ekran:"
+msgid "Buddy's _username:"
+msgstr "Emër përdoruesi për shokun:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-#, fuzzy
-msgid "A_lias:"
-msgstr "Alias:"
+#  Optional Information section
+msgid "(Optional) A_lias:"
+msgstr "(Opsionale) A_lias:"
+
+msgid "Add buddy to _group:"
+msgstr "Shto shok te _grupi:"
 
-#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "Ky protokoll nuk mbulon dhoma fjalosjeje."
 
-#: ../pidgin/gtkblist.c:5842
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Për çastin nuk keni hyrë me një protokoll që mundëson fjalosje."
 
-#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14873,85 +11054,63 @@ msgstr ""
 "Ju lutem jepni alias, dhe  të dhënat e duhura rreth fjalosjes që do të donit "
 "të shtohet te listë juaja shokësh.\n"
 
-#: ../pidgin/gtkblist.c:5964
+msgid "A_lias:"
+msgstr "_Alias:"
+
+msgid "Auto_join when account becomes online."
+msgstr "Vetë_futu kur llogaria kalon në linjë."
+
+msgid "_Hide chat when the window is closed."
+msgstr "_Fshihe fjalosjen kur mbyllet dritarja."
+
 msgid "Please enter the name of the group to be added."
 msgstr "Ju lutem jepni emrin e grupit që duhet shtuar."
 
-#: ../pidgin/gtkblist.c:6609
+msgid "Enable Account"
+msgstr "Aktivizo Llogari"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Llogari/Aktivizoni Llogari"
+
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
+msgstr "<PurpleMain>/Llogarira/"
 
-#: ../pidgin/gtkblist.c:6633
-#, fuzzy
 msgid "_Edit Account"
-msgstr "_Llogari"
+msgstr "_Përpunoni Llogari"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "Pa veprime të mundshëm"
 
-#: ../pidgin/gtkblist.c:6654
-#, fuzzy
 msgid "_Disable"
-msgstr "Ndalo"
-
-#: ../pidgin/gtkblist.c:6666
-#, fuzzy
-msgid "Enable Account"
-msgstr "Llogari"
-
-#: ../pidgin/gtkblist.c:6672
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "_Çaktivizo"
 
 #  Tools
-#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Mjete"
 
-#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Shokë/Radhit Shokë"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Shërbyes"
+msgstr "Shërbyesa SSL"
 
-#: ../pidgin/gtkconn.c:180
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s u shkëput për shkak të një gabimi. %s Llogaria është çaktivizuar. ndreqni "
-"gabimin dhe riaktivizoni llogarinë për t´u lidhur."
-
-#: ../pidgin/gtkconv.c:482
-#, fuzzy
 msgid "Unknown command."
-msgstr "Urdhër i panjohur"
+msgstr "Urdhër i panjohur."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ai shok nuk është në të njëjtin protokoll si kjo fjalosje"
 
-#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Për çastin nuk keni nënshkruar prej një llogarië nga e cila të mund të ftoni "
 "atë shok."
 
-#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "Fto Shok Në një Dhomë Fjalosjeje"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14959,201 +11118,143 @@ msgstr ""
 "Ju lutem jepni emrin e përdoruesit që doni të ftoni, bashkë me një mesazh "
 "ftese në daçi."
 
-#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "_Shok:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Mesazh:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "I pazoti të hap kartelë."
-
-#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Bashkëbisedim me %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "Ruaj Bashkëbisedim"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Gjej"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Kërko për:"
 
-#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "Çshpërfill"
 
-#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Shpërfill"
 
-#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "Mesazh Largimi"
 
-#: ../pidgin/gtkconv.c:1668
-#, fuzzy
 msgid "Last said"
-msgstr "Mbiemër"
+msgstr "Thënë së fundmi"
 
-#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "I pazoti të ruaj në disk kartelë ikone."
 
-#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Ruaj Ikonë"
 
-#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "Animizo"
 
-#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "Fshih Ikonë"
 
-#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "Ruaj Ikonë Si..."
 
-#: ../pidgin/gtkconv.c:2721
-#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "Vetjake..."
+msgstr "Vëre si Ikonë Vetjake..."
 
-#: ../pidgin/gtkconv.c:2734
-#, fuzzy
-msgid "Remove Custom Icon"
-msgstr "Hiq Kontakt"
+msgid "Change Size"
+msgstr "Ndrysho Masë"
 
-#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
-msgstr ""
+msgstr "Shfaqi të Tërë"
 
 #  Conversation menu
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/_Bashkëbisedim"
 
-#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Bashkëbisedim/Mesazh i Atypëratyshëm i Ri..."
 
-#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/Bashkëbisedim/_Gjej..."
 
-#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/Bashkëbisedim/Parje _Regjistrimi"
 
-#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Bashkëbisedim/_Ruaj Si..."
 
-#: ../pidgin/gtkconv.c:2892
-#, fuzzy
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Bashkëbisedim/Fshij"
+msgstr ""
 
-#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/Bashkëbisedim/Dë_rgo Kartelë..."
 
-#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Bashkëbisedim/Shto _Cytje Shoku..."
 
-#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Bashkëbisedim/_Merr Të dhëna"
 
-#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Bashkëbisedim/F_to..."
 
-#: ../pidgin/gtkconv.c:2903
-#, fuzzy
 msgid "/Conversation/M_ore"
-msgstr "/Bashkëbisedim/_Mbyll"
+msgstr "/Bashkëbisedim/_Më"
 
-#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/Bashkëbisedim/A_lias..."
 
-#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Bashkëbisedim/_Blloko..."
 
-#: ../pidgin/gtkconv.c:2911
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/Bashkëbisedim/_Blloko..."
+msgstr "/Bashkëbisedim/_Zhblloko..."
 
-#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/Bashkëbisedim/_Shto..."
 
-#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/Bashkëbisedim/_Hiq..."
 
-#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Bashkëbisedim/Fut Lidh_je..."
 
-#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Bashkëbisedim/Fut Pamj_e..."
 
-#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/Bashkëbisedim/_Mbyll"
 
 #  Options
 #. Options
-#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_Mundësi"
 
-#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Mundësi/Aktivizo Regjistrim"
 
-#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Mundësi/Aktivizo _Tinguj"
 
-#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Mundësi/Shfaq _Panele Formatimi"
 
-#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Mundësi/Shfaq Vula _kohore"
 
-#: ../pidgin/gtkconv.c:3061
-#, fuzzy
 msgid "/Conversation/More"
-msgstr "/Bashkëbisedim/_Mbyll"
+msgstr "/Bashkëbisedim/Më"
 
 #  Options
-#: ../pidgin/gtkconv.c:3117
-#, fuzzy
 msgid "/Options"
-msgstr "/_Mundësi"
+msgstr "/Mundësi"
 
 #  Conversation menu
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
@@ -15161,619 +11262,442 @@ msgstr "/_Mundësi"
 #. 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:3152 ../pidgin/gtkconv.c:3184
-#, fuzzy
 msgid "/Conversation"
-msgstr "/_Bashkëbisedim"
+msgstr "/Bashkëbisedim"
 
-#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/Bashkëbisedim/Shihni Regjistrim"
 
-#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/Bashkëbisedim/Dërgo Kartelë..."
 
-#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Bashkëbisedim/Shto Cytje Shoku..."
 
-#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/Bashkëbisedim/Ki Të dhëna"
 
-#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/Bashkëbisedim/Fto..."
 
-#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/Bashkëbisedim/Alias..."
 
-#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Bashkëbisedim/Blloko..."
 
-#: ../pidgin/gtkconv.c:3226
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/Bashkëbisedim/Blloko..."
+msgstr "/Bashkëbisedim/Zhbllokoje..."
 
-#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/Bashkëbisedim/Shto..."
 
-#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/Bashkëbisedim/Hiq..."
 
-#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/Bashkëbisedim/Fut Lidhje..."
 
-#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Bashkëbisedim/Fut Pamje..."
 
-#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Mundësi/Aktivizo Hyrje"
 
-#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Mundësi/Aktivizo Tinguj"
 
-#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Mundësi/Shfaq Panele Formatimi"
 
-#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/Mundësi/Shfaq Vula kohore"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "Përdoruesi po shkruan..."
 
-#: ../pidgin/gtkconv.c:3391
-#, fuzzy
-msgid "User has typed something and stopped"
-msgstr "Përdoruesi diç shkroi dhe pushoi"
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s ka reshtur së shkruajturi"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-#, fuzzy
-msgid "_Send To"
-msgstr "_Dërgo Te"
+msgid "S_end To"
+msgstr "Dërgoje _Te"
 
-#: ../pidgin/gtkconv.c:4286
-#, fuzzy
 msgid "_Send"
-msgstr "_Dërgo Te"
+msgstr "_Dërgo"
 
 #  Setup the label telling how many people are in the room.
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "0 vetë në dhomë"
 
 #  Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person në dhomë"
 msgstr[1] "%d vetë në dhomë"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Shkrim"
 
-#: ../pidgin/gtkconv.c:6490
-#, fuzzy
 msgid "Stopped Typing"
-msgstr "Shkrim"
+msgstr "Reshti Së Shtypuri"
 
-#: ../pidgin/gtkconv.c:6493
-#, fuzzy
 msgid "Nick Said"
-msgstr "Nofkë"
+msgstr "Nofka Tha"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
-#, fuzzy
 msgid "Unread Messages"
-msgstr "Mesazhe të Atypëratyshëm"
+msgstr "Mesazhe të Palexuar"
 
-#: ../pidgin/gtkconv.c:6499
-#, fuzzy
 msgid "New Event"
-msgstr "Ngjarje"
+msgstr "Ngjarje e Re"
 
-#: ../pidgin/gtkconv.c:7572
-#, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: Pastron rreshtat e bashkëbisedimit."
+msgstr ""
 
-#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "Ripohoni mbylljen"
 
-#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Keni mesazhe të palexuar. Jeni të sigurtë se doni të mbyllni dritaren?"
 
-#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
-msgstr ""
+msgstr "Mbyll skedat e tjera"
 
-#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
-msgstr ""
+msgstr "Mbyll tërë skedat"
 
-#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
-msgstr ""
+msgstr "Shqite këtë skedë"
 
-#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
-msgstr ""
+msgstr "Mbylle këtë skedë"
 
-#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Mbyll bashkëbisedim"
 
-#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "Dritarja e krijuar së fundmi"
 
-#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
-msgstr "Veço dritare IM dhe Chat"
+msgstr "Veço dritare MA-sh dhe Fjalosjesh"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "Dritare e re"
 
-#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "Sipas grupesh"
 
-#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "Sipas llogarish"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Ruaj Regjistrim Diagnostikimi"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Përmbys"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Thekso përputhje"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
-msgstr ""
+msgstr "_Vetëm Ikona"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
-msgstr ""
+msgstr "Vetëm _Tekst"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
-msgstr ""
+msgstr "Tekst _dhe Ikona"
 
-#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Filtër"
 
-#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Djathtasklikoni për më tepër mundësi"
 
-#: ../pidgin/gtkdebug.c:824
 msgid "Level "
-msgstr ""
+msgstr "Nivel"
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
-msgstr ""
+msgstr "Përzgjidhni shkallë filtri diagnostikimi"
 
-#: ../pidgin/gtkdebug.c:833
-#, fuzzy
 msgid "All"
-msgstr "Lejo"
+msgstr "Tërë"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
-msgstr ""
+msgstr "Të ndryshme"
 
-#: ../pidgin/gtkdebug.c:836
-#, fuzzy
 msgid "Warning"
-msgstr "Shkallë Sinjalizimi"
+msgstr "Sinjalizim"
 
-#: ../pidgin/gtkdebug.c:837
-#, fuzzy
 msgid "Error "
 msgstr "Gabim"
 
-#: ../pidgin/gtkdebug.c:838
-#, fuzzy
 msgid "Fatal Error"
-msgstr "Gabim i Brendshëm"
+msgstr "Gabim Fatal"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
-msgid "lead developer"
-msgstr "udhëheqës zhvillimi"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../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:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "zhvillues"
 
-#: ../pidgin/gtkdialogs.c:87
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "suport"
 
-#: ../pidgin/gtkdialogs.c:88
-#, fuzzy
 msgid "support/QA"
-msgstr "suport"
+msgstr "asistencë/SC"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "zhvillues & webmaster"
 
-#: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Pjesëmarrës i Vjetër/QA"
 
-#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "portë win32"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "mirëmbajtës"
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "mirëmbajtësi i libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
 #, fuzzy
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:115
-#, fuzzy
 msgid "XMPP developer"
-msgstr "zhvillues"
+msgstr "Zhvillues XMPP"
 
-#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "autori fillestra"
 
-#: ../pidgin/gtkdialogs.c:133
+msgid "lead developer"
+msgstr "udhëheqës zhvillimi"
+
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
-#, fuzzy
 msgid "Arabic"
-msgstr "Amharike"
+msgstr "Arabe"
 
-#: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Bjelloruse Latine"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
-msgstr ""
+msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "Boshnjake"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Katalane"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
-msgstr ""
+msgstr "Valenciane-Katalane"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Çeke"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Daneze"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "Gjermane"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
-msgstr ""
+msgstr "Xonga"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
-msgstr ""
+msgstr "Greke"
 
-#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Angleze Australiane"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Anglishte Kanadeze"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "Anglishte Britanike"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Spanjolle"
 
-#: ../pidgin/gtkdialogs.c:161
-#, fuzzy
 msgid "Estonian"
-msgstr "Boshnjake"
+msgstr "Estoneze"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
-msgstr ""
+msgstr "Euskera(Baske)"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
-#, fuzzy
 msgid "Persian"
-msgstr "Serbe"
+msgstr "Persiane"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "Finlandeze"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "Frënge"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
-#, fuzzy
 msgid "Galician"
-msgstr "Italisht"
+msgstr "Galike"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "Ekipi për Gjuhën Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebraishte"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Indiane"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Hungareze"
 
-#: ../pidgin/gtkdialogs.c:176
-#, fuzzy
 msgid "Indonesian"
-msgstr "Maqedone"
+msgstr "Indoneziane"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italisht"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Japoneze"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "Gjeorgjiane"
 
-#: ../pidgin/gtkdialogs.c:179
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "Përkthyesa të Çastit"
+msgstr "Përkthyesa Gjeorgjianë të Ubuntu-së"
 
-#: ../pidgin/gtkdialogs.c:180
-#, fuzzy
 msgid "Kannada"
-msgstr "I ndaluar"
+msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "Ekipi i Përkthimit Kannada"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Koreane"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
-msgstr ""
+msgstr "Kurde"
 
-#: ../pidgin/gtkdialogs.c:185
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "Lituaneze"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Maqedone"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
-#, fuzzy
 msgid "Bokmål Norwegian"
-msgstr "Norvegjiane"
+msgstr "Norvegjeze Bokmal"
 
-#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
-msgstr ""
+msgstr "Nepaleze"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "Hollandishte, Flamande"
 
-#: ../pidgin/gtkdialogs.c:193
-#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "Norvegjiane"
+msgstr "Norvegjeze Nynorsk"
+
+msgid "Occitan"
+msgstr "Oçitane"
+
+msgid "Punjabi"
+msgstr "Panxhabe"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "Polake"
 
-#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "Portugeze"
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "Portugeze Brazil"
 
-#: ../pidgin/gtkdialogs.c:199
-#, fuzzy
 msgid "Pashto"
-msgstr "Foto"
+msgstr "Pashtune"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "Rumune"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Ruse"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Slovake"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Slovene"
 
-#: ../pidgin/gtkdialogs.c:205
-#, fuzzy
 msgid "Albanian"
-msgstr "Rumune"
+msgstr "Shqip"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+msgid "Sinhala"
+msgstr "Sinhala"
+
 msgid "Swedish"
 msgstr "Suedeze"
 
-#: ../pidgin/gtkdialogs.c:209
-#, fuzzy
 msgid "Tamil"
-msgstr "Terminal"
+msgstr "Tamileze"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
-msgstr ""
+msgstr "Tailandeze"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
-msgstr ""
+msgstr "Turke"
+
+msgid "Urdu"
+msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Vietnamese"
 msgstr "Vietnameze"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh dhe Ekipi Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Kineze e Thjeshtuar"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "Kineze Hong Kongu"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Kineze Tradicionale"
 
-#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "Amharike"
 
-#: ../pidgin/gtkdialogs.c:357
-#, fuzzy, c-format
+#, c-format
 msgid "About %s"
-msgstr "Rreth Gaim"
+msgstr "Rreth %s"
 
-#: ../pidgin/gtkdialogs.c:400
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15786,97 +11710,84 @@ msgid ""
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
+"%s është një klient grafik shkëmbimi mesazhesh, modular, i bazuar në "
+"libpurple e që është i aftë të lidhet njëherazi me AIM-in, MSN-në, Yahoo!-"
+"un, XMPP-në, ICQ-në, IRC-në, SILC-un, SIP/SIMPLE-in, Novell GroupWise-in, "
+"Lotus Sametime-in, Bonjour-in, Zephyr-in, MySpaceIM-in, Gadu-Gadu-n, dhe "
+"QQ.  Është shkruajtur duke përdorur GTK+.<BR><BR>Mund ta ndryshoni dhe "
+"rishpërndani program-in sipas termave të GPL-së (versioni 2 ose i "
+"mëvonshëm).  Një kopje e GPL-së përfshihet te kartela 'COPYING' e prurë "
+"bashkë me %s.  %s është e drejtë kopjimi e pjesëmarrësve në të.  Shihni "
+"kartelën 'COPYRIGHT' për listën e plotë të pjesëmarrësve.  Nuk ofrojnë "
+"garanci për këtë program.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim në irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin te irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
-#, fuzzy
 msgid "Current Developers"
-msgstr "Zhvilluesa Jo më Veprues"
+msgstr "Zhvilluesa Veprues"
 
-#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
 msgstr "Krijues të Lojtur Arnimesh"
 
-#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "Zhvilluesa Jo më Veprues"
 
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "Krijues të Lojtur Arnimesh"
+msgstr "Krijues të Lojtur Arnash në Pension"
 
-#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
-msgstr ""
+msgstr "Artistë"
 
-#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "Përkthyesa të Çastit"
 
-#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "Përkthyesa të Dikurshëm"
 
-#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr "Të dhëna Diagnostikimi"
 
-#: ../pidgin/gtkdialogs.c:906
+msgid "_Name"
+msgstr "_Emër"
+
+msgid "_Account"
+msgstr "_Llogari"
+
 msgid "Get User Info"
 msgstr "Merr Të dhëna Përdoruesi"
 
-#: ../pidgin/gtkdialogs.c:908
 msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+"Please enter the username or alias of the person whose info you would like "
+"to view."
 msgstr ""
-"Ju lutem jepni emër ekrani ose alias të personit të dhënat e të cilit do të "
-"donit të shihnit."
+"Ju lutem jepni emër përdoruesi ose alias të personit të dhënat e të cilit do "
+"të donit të shihnit."
 
-#: ../pidgin/gtkdialogs.c:998
 msgid "View User Log"
 msgstr "Shih Regjistrim Përdoruesi"
 
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Ju lutem jepni emër ekrani ose alias të personit regjistrimet e të cilit do "
-"të donit të shihnit."
-
-#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr "Kontak Aliasi"
 
-#: ../pidgin/gtkdialogs.c:1021
 msgid "Enter an alias for this contact."
 msgstr "Jepni një alias për këtë kontakt"
 
-#: ../pidgin/gtkdialogs.c:1043
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Jepni një alias për %s."
 
-#: ../pidgin/gtkdialogs.c:1045
 msgid "Alias Buddy"
 msgstr "Alias Shoku"
 
-#: ../pidgin/gtkdialogs.c:1066
 msgid "Alias Chat"
 msgstr "Alias Fjalosjeje"
 
-#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr "Jepni një alias për këtë fjalosje."
 
-#: ../pidgin/gtkdialogs.c:1106
-#, fuzzy, c-format
+#, 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?"
@@ -15890,242 +11801,244 @@ msgstr[1] ""
 "Jeni duke hequr kontaktin që përmban %s dhe %d shokë të tjerë prej listës "
 "suaj të shokëve.  Doni të vazhdohet?"
 
-#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
 msgstr "Hiq Kontakt"
 
-#: ../pidgin/gtkdialogs.c:1117
-#, fuzzy
 msgid "_Remove Contact"
-msgstr "Hiq Kontakt"
+msgstr "_Hiq Kontakt"
 
-#: ../pidgin/gtkdialogs.c:1148
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
-"Jeni duke hequr grupin %s dhe tërë anëtarët e tij prej listës suaj të "
-"shokëve. Doni të vazhdohet?"
+"Jeni një hap larg nga shkrirja e grupit %s në grupin e quajtur %s. Doni të "
+"vazhdohet?"
 
-#: ../pidgin/gtkdialogs.c:1155
-#, fuzzy
 msgid "Merge Groups"
-msgstr "Hiq Grup"
+msgstr "Përziej Grupe"
 
-#: ../pidgin/gtkdialogs.c:1158
-#, fuzzy
 msgid "_Merge Groups"
-msgstr "_Fshij Grup"
+msgstr "_Përziej Grupe"
 
-#: ../pidgin/gtkdialogs.c:1208
 #, 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 ""
-"Jeni duke hequr grupin %s dhe tërë anëtarët e tij prej listës suaj të "
-"shokëve. Doni të vazhdohet?"
+"Jeni një hap larg nga heqja e grupit %s dhe tërë anëtarët e tij prej listës "
+"suaj të shokëve. Doni të vazhdohet?"
 
-#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr "Hiq Grup"
 
-#: ../pidgin/gtkdialogs.c:1214
-#, fuzzy
 msgid "_Remove Group"
-msgstr "Hiq Grup"
+msgstr "_Hiq Grup"
 
-#: ../pidgin/gtkdialogs.c:1247
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Jeni duke hequr %s prej listës suaj të shokëve.  Doni të vazhdohet?"
+msgstr ""
+"Jeni një hap larg nga heqja e %s prej listës suaj të shokëve.  Doni të "
+"vazhdohet?"
 
-#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Buddy"
 msgstr "Hiq Shok"
 
-#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Buddy"
 msgstr "_Hiq Shok"
 
-#: ../pidgin/gtkdialogs.c:1274
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
-"Jeni duke hequr fjalosjen %s prej listës suaj të shokëve.  Doni të vazhdohet?"
+"Jeni një hap larg nga heqja e fjalosjes %s prej listës suaj të shokëve.  "
+"Doni të vazhdohet?"
 
-#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr "Hiq Fjalosje"
 
-#: ../pidgin/gtkdialogs.c:1280
-#, fuzzy
 msgid "_Remove Chat"
-msgstr "Hiq Fjalosje"
+msgstr "_Hiq Fjalosje"
 
-#: ../pidgin/gtkdocklet.c:150
-#, fuzzy
 msgid "Right-click for more unread messages...\n"
-msgstr "Djathtasklikoni për më tepër mundësi"
+msgstr "Për më tepër mesazhe të palexuar, djathtasklikoni...\n"
 
-#: ../pidgin/gtkdocklet.c:435
-#, fuzzy
-msgid "Change Status"
-msgstr "Ndrysho _gjendje si:"
+msgid "_Change Status"
+msgstr "_Ndryshoji Gjendjen"
 
-#: ../pidgin/gtkdocklet.c:487
-msgid "Show Buddy List"
-msgstr "Shfaq Listë Shokësh"
+msgid "Show Buddy _List"
+msgstr "Shfaq _Listë Shokësh"
 
-#: ../pidgin/gtkdocklet.c:513
-msgid "New Message..."
-msgstr "Mesazh i Ri..."
+msgid "_Unread Messages"
+msgstr "Mesazhe të _Palexuar"
 
-#: ../pidgin/gtkdocklet.c:528
-msgid "Mute Sounds"
-msgstr "Pa Tinguj"
+msgid "New _Message..."
+msgstr "_Mesazh i Ri..."
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
-msgstr "Mesazh i Ri..."
+msgid "_Accounts"
+msgstr "_Llogarira"
 
-#: ../pidgin/gtkdocklet.c:542
-msgid "Quit"
-msgstr "Lër"
+msgid "Plu_gins"
+msgstr "Shtoj_ca"
+
+msgid "Pr_eferences"
+msgstr "P_arapëlqime"
+
+msgid "Mute _Sounds"
+msgstr "Pa _Tinguj"
+
+msgid "_Blink on New Message"
+msgstr "_Xixëllim për  Mesazhe të Rinj"
+
+msgid "_Quit"
+msgstr "_Dil"
 
-#: ../pidgin/gtkft.c:154
-#, fuzzy
 msgid "Not started"
-msgstr "I/e pambuluar"
+msgstr "I pa nisur"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
-msgstr "<b>Po marr Si:</b>"
+msgstr "<b>Po merret Si:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
-msgstr "<b>Po marr Prej:</b>"
+msgstr "<b>Po merret Prej:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
-msgstr "<b>Po dërgoj Për:</b>"
+msgstr "<b>Po dërgohet Për:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
-msgstr "<b>Po dërgoj Si:</b>"
+msgstr "<b>Po dërgohet Si:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "Nuk ka zbatim të formësuar për të hapur këtë tip kartelash."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Ndodhi një gabim gjatë hapjes së kartelës."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Gabim në nisjen e %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Gabim në xhirimin e %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Procesi u përgjigj me kod gabimi %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Emër kartele:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Kartelë Vendore:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Shpejtësi:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Kohë e Rrjedhur:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Kohë e Mbetur:"
 
-#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
-msgstr ""
+msgstr "Mbylle këtë dritare kur të _përfundojnë tërë shpërnguljet"
 
-#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "_Pastro shpërngulje të përfunduara"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "_Hollësi shpërnguljeje kartelash"
 
 #  Pause button
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pushim"
 
 #  Resume button
 #. Resume button
-#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Rimerr"
 
-#: ../pidgin/gtkimhtml.c:816
-#, fuzzy
 msgid "Paste as Plain _Text"
-msgstr "N_gjite Si Tekst"
+msgstr "Ngjite si _Tekst Të thjeshtë"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
-#, fuzzy
 msgid "_Reset formatting"
-msgstr "Pastro formatim"
+msgstr "_Rikthe formatim parazgjedhje"
+
+msgid "Disable _smileys in selected text"
+msgstr "Çaktivizo _emotikonet në tekst të përzgjedhur"
 
-#: ../pidgin/gtkimhtml.c:1373
 msgid "Hyperlink color"
 msgstr "Ngjyrë Tejlidhjeje"
 
-#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr "Ngjyrë për vizatim tejlidhjesh.."
 
-#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
 msgstr "Ngjyrë paratheksimi tejlidhjesh"
 
-#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Ngjyrë për vizatim tejlidhjesh kur mbi to kalon miu."
 
-#: ../pidgin/gtkimhtml.c:1598
+msgid "Sent Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you sent."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit që dërguat."
+
+msgid "Received Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit që morët."
+
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit që morët e që përmban emrin tuaj."
+
+msgid "Action Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of an action message."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit të një veprimi."
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Whisper Message Name Color"
+msgstr ""
+
+#  ---------- "Notification Removals" ----------
+msgid "Typing notification color"
+msgstr "Ngjyrë njoftimesh shtypjeje"
+
+msgid "The color to use for the typing notification font"
+msgstr "Ngjyra e përdorur për gërma njoftimesh shtypjesh"
+
+msgid "Typing notification font"
+msgstr "Gërma njoftimesh shtypjeje"
+
+msgid "The font to use for the typing notification"
+msgstr "Gërmat e përdorura për njoftime shtypjesh"
+
+msgid "Enable typing notification"
+msgstr "Aktivizo njoftime shtypjesh"
+
 msgid "_Copy Email Address"
 msgstr "_Kopjo Vendndodhje Email"
 
-#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr "_Hap Lidhje në Shfletues"
 
-#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr "_Kopjo Vendndodhje Lidhjeje"
 
-#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16135,7 +12048,6 @@ msgstr ""
 "\n"
 "Po kaloj te parazgjedhja PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16145,7 +12057,6 @@ msgstr ""
 "\n"
 "Po kaloj te parazgjedhja PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16156,7 +12067,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16167,36 +12077,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "Ruaj Pamje"
 
-#: ../pidgin/gtkimhtml.c:3522
 #, c-format
 msgid "_Save Image..."
 msgstr "_Ruaj Pamje..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "_Shto Emotikon Vetjak..."
+
 msgid "Select Font"
 msgstr "Përzgjidhni Gërma"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Përzgjidhni Ngjyrë Teksti"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Përzgjidhni Ngjyrë Sfondi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Përshkrim"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -16204,281 +12110,220 @@ msgstr ""
 "Ju lutem jepni URL dhe përshkrim për lidhjen që doni të futet. Përshkrimi "
 "është në dëshirën tuaj."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Ju lutem jepni URL-në e lidhjes që doni të futet."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Fut Lidhje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "_Fut"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Dështova në ruajtje pamjeje: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Fut Pamje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
-msgid "This theme has no available smileys."
-msgstr "Kjo temë nuk ka zgërdhimje të mundshme."
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Ky emotikon është çaktivizuar ngaqë ka një emotikon vetjak për këtë "
+"shkurtore:\n"
+" %s"
 
 #  show everything
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "Buzëqesh!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-#, fuzzy
+msgid "_Manage custom smileys"
+msgstr "_Admionistroni emotikone vetjakë"
+
+msgid "This theme has no available smileys."
+msgstr "Kjo temë nuk ka zgërdhimje të mundshme."
+
 msgid "_Font"
-msgstr "_Llogari"
+msgstr "_Gërma"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
 msgid "Group Items"
-msgstr "Emër Grupi"
+msgstr "Grupo elementët"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Shpërndaji elementët"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "të Trasha"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "të Pjerrta"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "të Nënvizuara"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
-msgstr ""
+msgstr "Hequrvije"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
-msgstr ""
+msgstr "Rrite Madhësinë e Gërmave"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "Zvogëloje Madhësinë e Gërmave"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Font Face"
 msgstr "Emër Gërmash"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
 msgid "Background Color"
-msgstr "Ngjyrë sfondi"
+msgstr "Ngjyrë Sfondi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
 msgid "Foreground Color"
-msgstr "Ngjyrë e përparme gërmash"
+msgstr "Ngjyrë e Përparme"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "Pastro formatim"
+msgstr "Formatim Parazgjedhje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "Fut Pamje"
+msgstr "Fut Pamje MA"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "Fut zgërdhimje"
+msgstr "Fut Zgërdhimje"
 
 #  put a link to the actual profile URL
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
 msgid "<b>_Bold</b>"
-msgstr "<b>%s:</b> "
+msgstr "<b>të _Trasha</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
+msgstr "<i>të _Pjerrta</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "të Nënvizuara"
+msgstr "<u>të _Nënvizuara</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>Hequrvije</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Gabim në ruajtje pamjeje</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger'>_Më të mëdha</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-#, fuzzy
 msgid "_Normal"
-msgstr "Normale"
+msgstr "_Normale"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>_Më të vogla</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
-#, fuzzy
 msgid "_Font face"
-msgstr "Emër Gërmash"
+msgstr "Emër _gërmash"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
 msgid "Foreground _color"
-msgstr "Ngjyrë e përparme gërmash"
+msgstr "Ngjyrë e përpar_me"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
 msgid "Bac_kground color"
-msgstr "Ngjyrë sfondi"
-
-#  show everything
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "Buzëqesh!"
+msgstr "Ngjyrë e pa_sme"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-#, fuzzy
 msgid "_Image"
-msgstr "Ruaj Pamje"
+msgstr "_Pamje"
 
 #  join button
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-#, fuzzy
 msgid "_Link"
-msgstr "_Bashkojuni"
+msgstr "_Lidhje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "Vizore _horizontale"
+
+#  show everything
+msgid "_Smile!"
+msgstr "Buzëqesh!"
+
+msgid "Log Deletion Failed"
+msgstr "Dështoi Fshirja e Regjistrit"
+
+msgid "Check permissions and try again."
+msgstr "Kontrolloni lejet dhe riprovoni."
 
-#: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
+"Jeni i sigurt se doni të fshihet përgjithmonë regjistrimi i bashkëbisedimit "
+"me %s i cili filloi më %s?"
 
-#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr ""
+"Jeni i sigurt se doni të fshihet përgjithmonë regjistrimi i bashkëbisedimit "
+"te %s i cili filloi më %s?"
 
-#: ../pidgin/gtklog.c:309
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr "jeni të sigurtë se doni të fshini %s?"
-
-#: ../pidgin/gtklog.c:453
-#, fuzzy, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr ""
-"<span size='larger' weight='bold'>Gabim në ruajtje pamjeje</span>\n"
-"\n"
-"%s"
+"Jeni të sigurt se doni të fshihet përgjithmonë regjistri i sistemit i znë "
+"fill më %s?"
 
-#: ../pidgin/gtklog.c:456
-#, fuzzy, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Gabim në ruajtje pamjeje</span>\n"
-"\n"
-"%s"
+msgid "Delete Log?"
+msgstr "Të fshij Regjistrin?"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr ""
+msgid "Delete Log..."
+msgstr "Fshije Regjistrin..."
 
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Ngjarje sistemi do të regjistrohen vetëm nëse është i aktivizuar parapëlqimi "
-"\"Regjistro tërë ndryshimet e gjendjes te regjistri i sistemit\"."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"mesazhe të atypëratyshëm do të regjistrohen vetëm nëse është i aktivizuar "
-"parapëlqimi \"Regjistro tërë mesazhet e atypëratyshëm\"."
-
-#: ../pidgin/gtklog.c:557
-#, fuzzy
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Fjalosjet do të regjistrohen vetëm nëse është i aktivizuar parapëlqimi "
-"\"Regjistro tërë fjalosjet\"."
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Bashkëbisedim në %s te %s</span>"
 
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "Nuk u gjetën regjistrime"
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Bashkëbisedim me %s te %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "_Shfletoni dosje regjistrash"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Madhësi tërësore regjistrimi:"
-
-#: ../pidgin/gtklog.c:709
+#  short message
 #, c-format
-msgid "Conversations in %s"
-msgstr "Bashkëbisedime në %s"
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Për më tepër të dhëna provoni `%s -h'.\n"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
-msgid "Conversations with %s"
-msgstr "Bashkëbisedime me %s"
-
-#  Window **********
-#: ../pidgin/gtklog.c:804
-msgid "System Log"
-msgstr "Regjistrim Sistemi"
-
-#  short message
-#: ../pidgin/gtkmain.c:386
-#, fuzzy, c-format
-msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Për më tepër të dhëna provoni `%s -h'.\n"
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Përdorimi: %s [MUNDËSI]...\n"
+"\n"
+"  -c, --config=DIR    përdor DIR për kartela formësimi\n"
+"  -d, --debug         shtyp mesazhe diagnostikimi te stdout\n"
+"  -h, --help          shfaq këtë ndihmë dhe dil\n"
+"  -m --multiple    jo detyrimisht një instancë e vetme\n"
+"  -n, --nologin       mos u fut vetvetiu\n"
+"  -l, --login[=EMËR]  aktivizo llogarinë(të) e treguar (argumenti opsional\n"
+"                      EMËR përcakton llogarinë(të) që duhet përdorur, ndarë "
+"me\n"
+"                      presje. Pa të, do të aktivizohet vetëm llogaria e "
+"parë).\n"
+"  --display=DISPLAY Ekran X për përdorim\n"
+"  -v, --version       shfaq versionin e çastit dhe dil\n"
 
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -16488,25 +12333,29 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Gaim %s\n"
+"%s %s\n"
 "Përdorimi: %s [MUNDËSI]...\n"
 "\n"
 "  -c, --config=DIR    përdor DIR për kartela formësimi\n"
 "  -d, --debug         shtyp mesazhe diagnostikimi te stdout\n"
 "  -h, --help          shfaq këtë ndihmë dhe dil\n"
+"  -m, --multiple      jo detyrimisht një instancë e vetme\n"
 "  -n, --nologin       mos u fut vetvetiu\n"
-"  -l, --login[=EMËR]  futu vetvetiu (argumenti opsional EMËR përcakton\n"
-"                      llogarinë(të) që duhet përdorur, ndarë me presje)\n"
+"  -l, --login[=EMËR]  aktivizo llogarinë(të) e treguar (argumenti opsional "
+"EMËR\n"
+"                      përcakton llogarinë(të) që duhet përdorur, ndarë me "
+"presje).\n"
+"                      Pa të, do të aktivizohet vetëm llogaria e parë).\n"
 "  -v, --version       shfaq versionin e çastit dhe dil\n"
 
-#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %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"
@@ -16524,226 +12373,186 @@ msgid ""
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
+"Ky është difekt te programi dhe ndodhi jo për fajin tuaj.\n"
+"\n"
+"Po qe se mund ta riprodhoni vithisjen, ju lutemi njoftoni\n"
+"zhvilluesit duke ua raportuar difektin te:\n"
+"%ssimpleticket/\n"
+"\n"
+"Ju lutem mos harroni të tregoni se ç'ishit duke bërë në atë kohë\n"
+"dhe postoni \"the backtrace\"-in përkatës.  Po qe se nuk dini si ta\n"
+"gjeni \"backtrace\"-in, ju lutem lexoni udhëzimet te\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"Nëse ju lypset asistencë e mëtejshme, ju lutem i dërgoni një MA\n"
+"ose SeanEgn, ose LSchiere (përmes AIM-it). Të dhëna kontakti\n"
+"për Sean-in dhe Luke-n rreth protokollesh të tjerë cols i gjeni\n"
+"te %swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
-#, fuzzy
 msgid "Pidgin"
-msgstr "Nr. faquesi"
+msgstr "cNr. faquesi"
 
-#: ../pidgin/gtknotify.c:349
-#, fuzzy
 msgid "Open All Messages"
-msgstr "Mesazh Largimi"
+msgstr "Hap Tërë Mesazhet"
 
-#: ../pidgin/gtknotify.c:402
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>\n"
-"\n"
-"%s"
+msgstr "<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>"
 
-#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ka %d mesazh të ri."
 msgstr[1] "%s ka %d mesazhe të rinj."
 
-#: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>You have %d new email.</b>"
-msgid_plural "<b>You have %d new emails.</b>"
-msgstr[0] ""
-msgstr[1] ""
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] "<b>%d email i ri.</b>"
+msgstr[1] "<b>%d email-a të rinj.</b>"
 
-#: ../pidgin/gtknotify.c:989
-#, fuzzy, c-format
+#, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Urdhri i shfletuesit <b>%s</b> është i pavlefshëm."
+msgstr "Urdhri i shfletuesit \"%s\" është i pavlefshëm."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "I pazoti të hap URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Gabim në nisjen e %s: %s"
+msgstr "Gabim në nisjen e \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Është zgjedhur urdhër shfletuesi 'Dorazi', por nuk është caktuar cili."
 
-#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
-msgstr ""
+msgstr "Shtojcat vijuese do të çngarkohen."
 
-#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
-msgstr ""
+msgstr "Shtojcat shumëfishe do të çngarkohen."
 
-#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
-msgstr ""
+msgstr "Çngarko Shtojca"
+
+msgid "Could not unload plugin"
+msgstr "S'u çngarkua dot shtojca"
 
-#: ../pidgin/gtkplugin.c:400
-#, c-format
 msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
 msgstr ""
+"Shtojca nuk u çngarkua dot tani, por do të çaktivizohet gjatë nisjes tjetër."
 
-#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
+"<span foreground=\"red\" weight=\"bold\">Gabim: %s\n"
+"Shihni te website-i i shtojcës për ndonjë përditësim.</span>"
+
+msgid "Author"
+msgstr "Autor"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>Shkruar nga:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>''Site''-i Web:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Emër kartele:</b>"
 
-#: ../pidgin/gtkplugin.c:536
-#, fuzzy
 msgid "Configure Pl_ugin"
-msgstr "Formëso Dhomë"
+msgstr "Formëso Sh_tojcë"
 
-#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
-msgstr ""
+msgstr "<b>Hollësi Shtojce</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Përzgjidhni një kartelë"
 
 #  Create the "Pounce Who" frame.
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
-#, fuzzy
 msgid "Pounce on Whom"
-msgstr "Kë Të Cys"
+msgstr ""
 
-#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "Emër _shoku:"
 
-#: ../pidgin/gtkpounce.c:593
-#, fuzzy
 msgid "Si_gns on"
-msgstr "Nënshkruani"
+msgstr "Nënshkru_an"
 
-#: ../pidgin/gtkpounce.c:595
-#, fuzzy
 msgid "Signs o_ff"
-msgstr "_Çnënshkruani"
+msgstr "Çnën_shkruan"
 
-#: ../pidgin/gtkpounce.c:597
-#, fuzzy
 msgid "Goes a_way"
-msgstr "Shoku Po _Largohet"
+msgstr "_Largohet"
 
-#: ../pidgin/gtkpounce.c:599
-#, fuzzy
 msgid "Ret_urns from away"
-msgstr "_Kthehet prej largimi"
+msgstr "Kthe_het prej largimi"
 
-#: ../pidgin/gtkpounce.c:601
-#, fuzzy
 msgid "Becomes _idle"
-msgstr "%s u plogështua"
+msgstr "_Plogështohet"
 
-#: ../pidgin/gtkpounce.c:603
-#, fuzzy
 msgid "Is no longer i_dle"
-msgstr "%s nuk është më i plogësht."
+msgstr "Nuk është më i plo_gësht"
 
-#: ../pidgin/gtkpounce.c:605
-#, fuzzy
 msgid "Starts _typing"
-msgstr "Shoku fillon të sh_typë"
+msgstr "Zë të sh_typë"
 
-#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
-msgstr ""
+msgstr "P_ushon në shkrim e sipër"
 
-#: ../pidgin/gtkpounce.c:609
-#, fuzzy
 msgid "Stops t_yping"
-msgstr "Shoku mbaron së sht_ypuri"
+msgstr "Ndalon së sht_ypuri"
 
-#: ../pidgin/gtkpounce.c:611
-#, fuzzy
 msgid "Sends a _message"
-msgstr "Dërgo një mesa_zh"
+msgstr "Dërgon _mesazh"
 
-#: ../pidgin/gtkpounce.c:654
-#, fuzzy
 msgid "Ope_n an IM window"
-msgstr "H_ap dritare IM"
+msgstr "Ha_p një dritare MA"
 
-#: ../pidgin/gtkpounce.c:656
-#, fuzzy
 msgid "_Pop up a notification"
-msgstr "_Hap njoftim"
+msgstr "Sh_faq një njoftim"
 
-#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "Dërgo një mesa_zh"
 
-#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "Përmb_ush një urdhër"
 
-#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "_Luaj një tingull"
 
-#: ../pidgin/gtkpounce.c:668
-#, fuzzy
 msgid "Brows_e..."
 msgstr "Sh_fletoni..."
 
-#: ../pidgin/gtkpounce.c:670
-#, fuzzy
 msgid "Br_owse..."
-msgstr "Sh_fletoni..."
+msgstr "Shfl_etoni..."
 
-#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "Para_parje"
 
-#: ../pidgin/gtkpounce.c:798
 msgid "P_ounce only when my status is not Available"
-msgstr ""
+msgstr "_Cytmë vetëm kur gjendja ime është e Panjohur"
 
-#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
-msgstr ""
+msgstr "E _ripërsëritshme"
 
 #  Create the "Pounce When" frame.
-#: ../pidgin/gtkpounce.c:1246
-#, fuzzy
 msgid "Pounce Target"
-msgstr "Kur Ta Cys"
+msgstr "Objekt Cytjeje"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Parazgjedhje"
-
-#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
-msgstr ""
+msgstr "Dështoi çpaketimi i temës së emotikoneve,."
 
-#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
-msgstr ""
+msgstr "Instalo Temë"
 
-#: ../pidgin/gtkprefs.c:697
 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."
@@ -16752,271 +12561,240 @@ msgstr ""
 "përdornit. Tema të reja mund të instalohen duke i tërhequr e lënë te listë "
 "temash."
 
-#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "Ikonë"
 
-#: ../pidgin/gtkprefs.c:894
+msgid "Keyboard Shortcuts"
+msgstr "Shkurtore Tastiere"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "_Mbylli bashkëbisedimet me tastin Escape"
+
 msgid "System Tray Icon"
 msgstr "Ikonë Shtylle Sistemi"
 
-#: ../pidgin/gtkprefs.c:895
-#, fuzzy
 msgid "_Show system tray icon:"
-msgstr "Ikonë Shtylle Sistemi"
+msgstr "Shfaq ikonë shtylle _sistemi:"
 
-#: ../pidgin/gtkprefs.c:899
-#, fuzzy
 msgid "On unread messages"
-msgstr "Dërgo një mesa_zh"
+msgstr "Për mesazhe të palexuar"
 
 #  IM Convo trans options
-#: ../pidgin/gtkprefs.c:904
-#, fuzzy
 msgid "Conversation Window Hiding"
-msgstr "Dritare Bashkëbisedimi IM"
+msgstr "Fshehje Dritareje Bashkëbisedimi"
 
-#: ../pidgin/gtkprefs.c:905
-#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "Bashkëbisedime të _rinj:"
+msgstr "_Fshih bashkëbisedime të rinj MA:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "Gjatë largimesh"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
-msgstr ""
+msgstr "Skeda"
 
-#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Shfaq IM-ra dhe fjalosje në dritare skeda"
+msgstr "Shfaq MA-ra dhe fjalosje në dritare _skeda"
 
-#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "Shfaq buton _mbyll në skeda"
 
-#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Vendosje:"
 
-#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "Sipër"
 
-#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "Poshtë"
 
-#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "Majtas"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "Djathtas"
 
-#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Majtas Vertikale"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Djathtas Vertikale"
 
-#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "Bashkëbisedime të _rinj:"
 
-#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr "Shfaq _formatim në mesazhe ardhës"
 
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Mbylli MA-të menjëherë pasi mbyllet skeda"
+
 msgid "Show _detailed information"
-msgstr "S'arrij të kem të dhëna kanali"
+msgstr "Shfaq të dhëna të _hollësishme"
 
-#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "Aktivizo animacion i_kone shoku"
 
-#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Njofto shokë që po shtypni për ta"
 
-#: ../pidgin/gtkprefs.c:1010
-#, fuzzy
 msgid "Highlight _misspelled words"
-msgstr "_Thekso fjalë të keqshqiptuara"
+msgstr "_Thekso fjalë të keqshkruajtura"
 
-#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
-msgstr ""
+msgstr "Përdor rrëshqitje të butë"
 
-#: ../pidgin/gtkprefs.c:1017
-#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "_Xixëllo dritare kur merren mesazhe"
+msgstr "_Xixëllo dritaren kur merren mesazhe të rinj MA"
 
 #  IM Convo trans options
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "N_gri dritare bashkëbisedimi"
+msgstr "Minimi_zo dritare bashkëbisedimesh të rinj"
+
+msgid "Minimum input area height in lines:"
+msgstr "Lartësia minimum e fushës së futjeve, në rreshta:"
 
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
 msgid "Font"
-msgstr "Emër Gërmash"
+msgstr "Gërma"
 
-#: ../pidgin/gtkprefs.c:1025
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "Përdor gërma dokumenti prej _teme"
 
-#: ../pidgin/gtkprefs.c:1027
 msgid "Use font from _theme"
-msgstr ""
+msgstr "Përdor gërma prej _temës"
 
 #  Conversations
-#: ../pidgin/gtkprefs.c:1029
-#, fuzzy
 msgid "Conversation _font:"
-msgstr "Zë Bashkëbisedimi"
+msgstr "_Gërma bashkëbisedimi:"
 
-#: ../pidgin/gtkprefs.c:1043
-#, fuzzy
 msgid "Default Formatting"
-msgstr "Pastro formatim"
+msgstr "Formatim Parazgjedhje"
 
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"Ja si do të duket teksti i mesazhit që dërgoni kur përdorni protokolle që "
-"mbulojnë formatim. :)"
+"Ja si do të duket teksti i mesazhit që dërgoni, kur përdorni protokolle që "
+"mbulojnë atë formatim."
+
+msgid "Cannot start proxy configuration program."
+msgstr "Nuk niset dot programi i formësimit të ndërmjetësave."
+
+msgid "Cannot start browser configuration program."
+msgstr "S'niset dot programi i formësimit të shfletuesit."
 
-#: ../pidgin/gtkprefs.c:1128
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "Shërbyes STUN:"
+msgstr "Shërbyes ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
+msgstr "<span style=\"italic\">Shembull: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
-#, fuzzy
 msgid "_Autodetect IP address"
-msgstr "_Vetëzbulo Vendndodhje IP"
+msgstr "_Vetëzbulo vendndodhje IP"
 
-#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "_IP Publike:"
 
-#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "Porta"
 
-#: ../pidgin/gtkprefs.c:1185
+msgid "_Enable automatic router port forwarding"
+msgstr "_Aktivizo përcjellje të vetvetishme porte rrugëzuesi"
+
 msgid "_Manually specify range of ports to listen on"
 msgstr "Cakto _dorazi interval portash nga ku të dëgjohet"
 
-#: ../pidgin/gtkprefs.c:1188
-#, fuzzy
 msgid "_Start port:"
-msgstr "Portë e _Fillimit:"
+msgstr "Portë e _fillimit:"
 
-#: ../pidgin/gtkprefs.c:1195
-#, fuzzy
 msgid "_End port:"
-msgstr "Portë e _Fundit:"
+msgstr "Portë e f_undit:"
+
+msgid "Proxy Server &amp; Browser"
+msgstr "Shërbyes Ndërmjetës &amp; Shfletues"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Nuk u gjet program formësimi ndërmjetësi.</b>"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Nuk u gjet program formësimi shfletuesi.</b>"
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Parapëlqimet për Ndërmjetësin & Shfletuesin\n"
+"formësohen te parapëlqimet për GNOME-n"
+
+msgid "Configure _Proxy"
+msgstr "Formësoni _Ndërmjetësin"
+
+msgid "Configure _Browser"
+msgstr "Formësoni _Shfletuesin"
 
-#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "Shërbyes \"Proxy\""
 
-#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "Pa \"proxy\""
 
-#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_Përdorues:"
 
-#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+msgid "Desktop Default"
+msgstr "Parazgjedhje Desktopi"
+
 msgid "GNOME Default"
 msgstr "Parazgjedhje GNOME"
 
-#: ../pidgin/gtkprefs.c:1334
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Dorazi"
 
-#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Përzgjedhje Shfletuesi"
 
-#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "_Shfletues:"
 
-#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "_Hap lidhje në:"
 
-#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "Parazgjedhje shfletuesi"
 
-#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "Dritare ekzistuese"
 
-#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "Skedë e re"
 
-#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -17025,70 +12803,54 @@ msgstr ""
 "_Manual:\n"
 "(%s për URL)"
 
-#: ../pidgin/gtkprefs.c:1470
-#, fuzzy
 msgid "Log _format:"
-msgstr "_Format Regjistrimi:"
+msgstr "_Format regjistrimi:"
 
-#: ../pidgin/gtkprefs.c:1475
 msgid "Log all _instant messages"
 msgstr "Regjistro tërë mesazhet e _atypëratyshëm"
 
-#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
 msgstr "Regjistro tërë _fjalosjet"
 
-#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "Regjistro tërë ndryshime _gjendjeje te regjistri i sistemit"
 
-#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Përzgjedhje Tingulli"
 
-#: ../pidgin/gtkprefs.c:1635
-#, fuzzy, c-format
+#, c-format
 msgid "Quietest"
-msgstr "Lër"
+msgstr "Më i buti"
 
-#: ../pidgin/gtkprefs.c:1637
-#, fuzzy, c-format
+#, c-format
 msgid "Quieter"
-msgstr "Lër"
+msgstr "Më butë"
 
-#: ../pidgin/gtkprefs.c:1639
-#, fuzzy, c-format
+#, c-format
 msgid "Quiet"
-msgstr "Lër"
+msgstr "Butë"
 
-#: ../pidgin/gtkprefs.c:1643
-#, fuzzy, c-format
+#, c-format
 msgid "Loud"
-msgstr "Tinguj"
+msgstr "Fort"
 
-#: ../pidgin/gtkprefs.c:1645
-#, fuzzy, c-format
+#, c-format
 msgid "Louder"
-msgstr "orë"
+msgstr "Më fort"
 
-#: ../pidgin/gtkprefs.c:1647
-#, fuzzy, c-format
+#, c-format
 msgid "Loudest"
-msgstr "Tinguj"
+msgstr "Më i forti"
 
-#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "_Metodë:"
 
-#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "Tingull Konsole"
 
-#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "Pa tinguj"
 
-#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17097,295 +12859,277 @@ msgstr ""
 "_Urdhër tingulli:\n"
 "(%s për emër kartele)"
 
-#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "Tinguj kur bashkëbisedimi ka _fokus"
 
-#: ../pidgin/gtkprefs.c:1759
-#, fuzzy
 msgid "Enable sounds:"
-msgstr "Aktivizuar"
+msgstr "Aktivizo tingujt:"
 
-#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
-msgstr ""
+msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Luaj"
 
-#: ../pidgin/gtkprefs.c:1927
-#, fuzzy
+msgid "_Browse..."
+msgstr "_Shfleto..."
+
+msgid "_Reset"
+msgstr "_Ricaktoni"
+
 msgid "_Report idle time:"
-msgstr "_Raporto kohë plogështie"
+msgstr "_Raporto kohë plogështie:"
 
-#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
-msgstr ""
+msgstr "Bazuar në përdorim tastiere dhe miu"
 
-#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "_Vetëpërgjigju:"
 
-#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "Vetëm në rast largimi dhe plogështie"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "I vetëlarguar"
 
-#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "Ndrysho gjendjen po qe i _plogësht"
 
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
 msgid "_Minutes before becoming idle:"
-msgstr "_Minuta para ndryshimit të gjendjes:"
+msgstr "_Minuta para se të bëhet i plogësht:"
 
-#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "Ndrysho _gjendje si:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
-msgstr ""
+msgstr "Gjendje në Nisje"
 
-#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
-msgstr ""
+msgstr "Përdor në nisje gjendje prej _daljes së fundit"
 
-#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
-msgstr ""
+msgstr "Gjendje për ta _zbatuar në nisje:"
 
-#: ../pidgin/gtkprefs.c:2032
-#, fuzzy
 msgid "Interface"
-msgstr "Gërma Ndërfaqeje GTK+"
+msgstr "Ndërfaqe"
 
-#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
 msgstr "Tema Karagjozësh"
 
 #  We use the registered default browser in windows
-#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Shfletues"
 
-#: ../pidgin/gtkprefs.c:2045
-#, fuzzy
 msgid "Status / Idle"
-msgstr "Larguar / I plogësht"
+msgstr "Gjendje / I plogësht"
 
-#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Lejo tërë përdoruesit të lidhen me mua"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "Lejo vetëm përdoruesit në listën time të shokëve"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "Lejo vetëm përdoruesit më poshtë"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Blloko tërë përdoruesit"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Blloko vetëm përdoruesit e mëposhtëm"
 
-#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "vetësi"
 
-#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Ndryshimet në rregullime vetësie janë vepruese menjëherë."
 
 #  "Set privacy for:" label
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr "Caktoni vetësi për:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#. Remove All button
+msgid "Remove Al_l"
+msgstr "Hiqi të _Tëra"
+
 msgid "Permit User"
 msgstr "Lejo Përdorues"
 
-#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "Jepni përdorues të cilit t'i lejohet lidhja me ju."
 
-#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Ju lutem jepni emrin e përdoruesit që doni të mundë t'ju kontaktojë"
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-#, fuzzy
 msgid "_Permit"
-msgstr "Lejo"
+msgstr "_Lejo"
 
-#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Ta lejoj %s të lidhet me ju?"
 
-#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Jeni i sigurt se doni të lejohet %s të lidhet me ju?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Blloko Përdorues"
 
-#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Jepni përdorues i cili të bllokohet."
 
-#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Ju lutem jepni emrin e përdoruesit që doni të bllokohet"
 
-#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "Të bllokoj %s?"
 
-#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Jeni i sigurt se doni të bllokohet %s?"
 
-#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "Zbato"
 
-#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Ajo kartelë ekziston tashmë"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Do të donit ta mbishkruani?"
 
-#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
-msgstr ""
+msgstr "Mbishkruaj"
 
-#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
-msgstr ""
+msgstr "Zgjidhni Emër të Ri"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
-#, fuzzy
 msgid "Select Folder..."
-msgstr "Përzgjidhni Ngjyrë"
-
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "Listë Dhomash"
+msgstr "Përzgjidhni Dosje..."
 
 #  list button
 #. list button
-#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "_Ki Listë"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
-#, fuzzy
 msgid "_Add Chat"
-msgstr "Shto Fjalosje"
+msgstr "_Shto Fjalosje"
 
-#: ../pidgin/gtksavedstatuses.c:337
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "jeni të sigurtë se doni të fshini %s?"
+msgstr "Jeni të sigurt se doni të fshihen gjendjet e ruajtura të përzgjedhura?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Përdor"
 
-#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titull i përdorur tashmë. Duhet të zgjidhni një titull unik."
 
-#: ../pidgin/gtksavedstatuses.c:970
-#, fuzzy
 msgid "Different"
-msgstr "Degë"
+msgstr "Tjetër"
 
-#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "_Titull:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "_Gjendje:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "Përdor gjendje të _ndryshme për disa llogari"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
-msgstr ""
+msgstr "Rua_j & Përdor"
 
-#: ../pidgin/gtksavedstatuses.c:1480
-#, fuzzy, c-format
+#, c-format
 msgid "Status for %s"
-msgstr "Përzgjidhni Gërma për %s"
+msgstr "Gjendje për %s"
+
+msgid "Custom Smiley"
+msgstr "Emotikon Vetjak"
+
+msgid "Duplicate Shortcut"
+msgstr "Dyfishoni Shkurtore"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Ka tashmë një emotikon vetjak për shkurtoren e përzgjedhur. Ju lutem tregoni "
+"një shkurtore tjetër."
+
+msgid "More Data needed"
+msgstr "Lypsen më tepër Të dhëna"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Ju lutem jepni një shkurtore për t'ia shoqëruar këtij emotikoni."
+
+msgid "Please select an image for the smiley."
+msgstr "Ju lutem përzgjidhni një pamje për emotikonin."
+
+#  show everything
+msgid "Edit Smiley"
+msgstr "Përpunoni Emotikon"
+
+#  show everything
+msgid "Add Smiley"
+msgstr "Shtoni Emotikon"
+
+msgid "Smiley _Image"
+msgstr "_Pamje Emotikoni"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "_Shkurtore Emotikoni"
+
+#  show everything
+msgid "Smiley"
+msgstr "Emotikon"
+
+msgid "Custom Smiley Manager"
+msgstr "Përgjegjës Emotikonesh Vetjake"
 
-#: ../pidgin/gtkstatusbox.c:664
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "Po pres të fillojë shpërngulja"
+msgstr "Po pritet për lidhje në rrjet"
+
+msgid "New status..."
+msgstr "Gjendje e re..."
+
+msgid "Saved statuses..."
+msgstr "Gjendje të ruajtura..."
+
+msgid "Status Selector"
+msgstr "Përzgjedhës Gjendjesh"
 
-#: ../pidgin/gtkutils.c:632
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Ndodhi gabimi vijues gjatë ngarkimit të %s: %s-."
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "Dështova në ruajtje pamjeje"
 
-#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "S'dërgoj dot dosjen %s."
 
-#: ../pidgin/gtkutils.c:1499
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"Gaim-i nuk mund të shpërngulë një dosje. Do t´ju duhet të dërgoni kartelat "
-"brendaj saj tek e tek"
+"%s-i nuk e  shpërngul dot një dosje. Do t'ju duhet t'i shpërngulni kartelat "
+"brenda saj tek e tek."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "Keni tërhequr një pamje"
 
-#: ../pidgin/gtkutils.c:1532
 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."
@@ -17393,32 +13137,25 @@ msgstr ""
 "Mund ta dërgoni këtë pamje si shpërngulje kartele, ta trupëzoni në këtë "
 "mesazh, ose përdorni si ikonë shoku për këtë përdorues."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "Caktoje si ikonë shoku"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "Dërgo kartelë pamjeje"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "Fute në mesazh"
 
-#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Do të donit ta caktoni si ikonë shoku për këtë përdorues?"
 
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Mund ta dërgoni këtë pamje si shpërngulje kartele, ta trupëzoni në këtë "
-"mesazh, ose përdorni si ikonë shoku për këtë përdorues."
+"Mund ta dërgoni këtë pamje si shpërngulje kartele, ose përdorni si ikonë "
+"shoku për këtë përdorues."
 
-#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17431,11 +13168,9 @@ msgstr ""
 #. * 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:1610
 msgid "Cannot send launcher"
 msgstr "S'dërgoj dot nisës"
 
-#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -17443,7 +13178,6 @@ msgstr ""
 "Tërhoqët një nisës desktopi. Ka shumë të ngjarë që donit të dërgonit atë me "
 "çka lidhet ky nisës, çfarëdo qoftë ajo, dhe jo vetë nisësin. "
 
-#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17454,121 +13188,89 @@ msgstr ""
 "<b>Madhësi kartele:</b> %s\n"
 "<b>Madhësi pamjeje:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
+"Kartela '%s' është shumë e madhe për %s.  Ju lutem provoni një pamje më të "
+"vogël.\n"
 
-#: ../pidgin/gtkutils.c:2643
-#, fuzzy
 msgid "Icon Error"
-msgstr "Gabim i Panjohur "
+msgstr "Gabim Ikone"
 
-#: ../pidgin/gtkutils.c:2644
-#, fuzzy
 msgid "Could not set icon"
-msgstr "S'munda të dërgoj"
+msgstr "S'u caktua dot ikonë"
 
-#: ../pidgin/gtkutils.c:2744
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Dështova në ruajtje pamjeje: %s\n"
+msgstr "Dështoi hapja e kartelës '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
+"Dështoi ngarkimi i pamjes '%s': arsye e panjohur, ndoshta kartelë e dëmtuar "
+"pamjeje"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
-#, fuzzy
 msgid "Save File"
-msgstr "Ruaj Kartelë..."
+msgstr "Ruaje Kartelën"
 
-#: ../pidgin/gtkwhiteboard.c:861
-#, fuzzy
 msgid "Select color"
-msgstr "Përzgjidhni Ngjyrë"
+msgstr "Përzgjidhni ngjyrë"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
-#, fuzzy
 msgid "Close _tabs"
-msgstr "Mbyll"
+msgstr "Mbylli _skedat"
 
-#: ../pidgin/pidginstock.c:91
-#, fuzzy
 msgid "_Get Info"
-msgstr "Ki të Dhëna"
+msgstr "_Merr  Të dhëna"
 
 #  Invite
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Ftoni"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Ndrysho"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Hap Postë"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin Tooltip"
+msgstr "Ndihmëza Pidgin-i"
+
 msgid "Pidgin smileys"
-msgstr ""
+msgstr "Emotikone Pidgin-i"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
-msgstr ""
+msgstr "Penguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "Përzgjedhja e kësaj çaktivizon emotikonet grafikë."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-#, fuzzy
 msgid "none"
-msgstr "Cilido"
-
-#: ../pidgin/plugins/cap/cap.c:450
-#, fuzzy
-msgid "Display Statistics"
-msgstr "Statistika Shërbyesi"
+msgstr "asnjë"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
-#, fuzzy
 msgid "Response Probability:"
-msgstr "Përgjigje të humbura"
+msgstr "Probabilitet Përgjigjjeje:"
 
-#: ../pidgin/plugins/cap/cap.c:811
-#, fuzzy
 msgid "Statistics Configuration"
-msgstr "Formësim Gjestesh Miu"
+msgstr "Formësim Statistikash"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
-msgstr ""
+msgstr "Maksimum mbarimi kohe për përgjigjen:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
-#, fuzzy
 msgid "minutes"
-msgstr "minuta."
+msgstr "minuta"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
-msgstr ""
+msgstr "Prag :"
 
 #. *< type
 #. *< ui_requirement
@@ -17576,64 +13278,47 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "Parashikim Mundësie Lidhjeje"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "Shtojcë Parashikimi Mundësie Lidhjeje."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
+msgid "Displays statistical information about your buddies' availability"
+msgstr "Shfaq të dhëna statistikore rreth qenies në linjë për shokët tuaj"
 
-#: ../pidgin/plugins/contact_priority.c:61
-#, fuzzy
 msgid "Buddy is idle"
-msgstr "Shoku është i plogësht:"
+msgstr "Shoku është i plogësht"
 
-#: ../pidgin/plugins/contact_priority.c:62
-#, fuzzy
 msgid "Buddy is away"
-msgstr "Shoku është i larguar:"
+msgstr "Shoku është i larguar"
 
-#: ../pidgin/plugins/contact_priority.c:63
-#, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "Shoku është i larguar:"
+msgstr "Shoku është \"thellësisht\" i larguar"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
-#, fuzzy
 msgid "Buddy is mobile"
-msgstr "Shoku është i plogësht:"
+msgstr "Shoku është i lëvizshëm"
 
-#: ../pidgin/plugins/contact_priority.c:68
-#, fuzzy
 msgid "Buddy is offline"
-msgstr "Shoku është i shkëputur:"
+msgstr "Shoku është i shkëputur"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Pikë për t'u përdorur kur..."
 
-#: ../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 ""
+"Shoku me <i>më shumë pikë</i> është shoku që do të ketë përparësi në "
+"kontak.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
-msgstr ""
+msgstr "Përdor shokun e fundit kur pikët janë të barabarta"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Pikë për t'i përdorur për llogarinë..."
 
@@ -17650,7 +13335,6 @@ msgstr "Pikë për t'i përdorur për llogarinë..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Përparësi Kontaktesh"
 
@@ -17660,7 +13344,6 @@ msgstr "Përparësi Kontaktesh"
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
@@ -17668,7 +13351,6 @@ msgstr ""
 
 #  *< description
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -17676,82 +13358,60 @@ msgstr ""
 "Lejon ndryshim pikësh për gjendje plogështie/largimi/i palidhur shokësh në "
 "llogaritje përparësish kontakti."
 
-#: ../pidgin/plugins/convcolors.c:23
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/Bashkëbisedim/_Mbyll"
+msgstr "Ngjyra Bashkëbisedimesh"
 
 #  IM Convo trans options
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
-#, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "N_gri dritare bashkëbisedimi"
+msgstr "Përshtasni ngjyra te dritarja e bashkëbisedimit"
 
-#: ../pidgin/plugins/convcolors.c:82
-#, fuzzy
 msgid "Error Messages"
-msgstr "Gabim Ndalimi Mesazhi"
+msgstr "Mesazhe Gabimesh"
 
-#: ../pidgin/plugins/convcolors.c:83
-#, fuzzy
 msgid "Highlighted Messages"
-msgstr "Thekso përputhje"
+msgstr "Mesazhe të Theksuar"
 
-#: ../pidgin/plugins/convcolors.c:84
-#, fuzzy
 msgid "System Messages"
-msgstr "Mesazhe të Atypëratyshëm"
+msgstr "Mesazhe Sistemi "
 
-#: ../pidgin/plugins/convcolors.c:85
-#, fuzzy
 msgid "Sent Messages"
-msgstr "Mesazhe të Atypëratyshëm"
+msgstr "Mesazhe të Dërguar"
 
-#: ../pidgin/plugins/convcolors.c:86
-#, fuzzy
 msgid "Received Messages"
-msgstr "Mesazhe Kanali"
+msgstr "Mesazhe të Marrë"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Përzgjidhni Ngjyrë për %s"
 
-#: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
-msgstr ""
+msgstr "Shpërfill format ardhës"
 
-#: ../pidgin/plugins/convcolors.c:311
-#, fuzzy
 msgid "Apply in Chats"
-msgstr "Alias Fjalosjeje"
+msgstr "Zbatoje në Fjalosje"
 
-#: ../pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
-msgstr ""
+msgstr "Zbatoje te MA-ra"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Sipas numrit të bashkëbisedimit"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Vendosje Bashkëbisedimi"
 
 #. 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 ""
+"Shënim: Parapëlqimi për \"Bashkëbisedime të reja\" duhet të caktohet te "
+"\"Sipas numërimi bashkëbisedimesh\"."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Numër bashkëbisedimesh për dritare"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Ndaj dritaret IM dhe Fjalosjeje kur vendosen sipas numrash"
+msgstr "Ndaji dritaret MA dhe Fjalosjeje kur vendosen sipas numrash"
 
 #. *< type
 #. *< ui_requirement
@@ -17759,7 +13419,6 @@ msgstr "Ndaj dritaret IM dhe Fjalosjeje kur vendosen sipas numrash"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
@@ -17767,7 +13426,6 @@ msgstr "ExtPlacement"
 #  *< version
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Mundësi ekstra vendosjeje bashkëbisedimi."
 
@@ -17775,30 +13433,25 @@ msgstr "Mundësi ekstra vendosjeje bashkëbisedimi."
 #  *  description
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
 "Ngushton numrin e bashkëbisedimeve për dritare, me mundësinë edhe të ndarjes "
-"së IM-ve dhe Fjalosjeve"
+"së MA-ve dhe Fjalosjeve"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Formësim Gjestesh Miu"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Butoni i mesit i miut"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Butoni djathtas i miut"
 
 #  "Visual gesture display" checkbox
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Shfaqje pamore gjestesh"
 
@@ -17815,7 +13468,6 @@ msgstr "_Shfaqje pamore gjestesh"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Gjeste Miu"
 
@@ -17825,60 +13477,48 @@ msgstr "Gjeste Miu"
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Mundëson mbulim gjestesh miu"
 
 #  *  description
 #. *  description
-#: ../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"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Lejon mbulim gjestesh miu në dritare bashkëbisedimesh.\n"
-"Zvarrisni butonin e mesit të miut për të kryer ca veprime:\n"
-"\n"
-"Zvarriteni poshtë e mandej djathtas për të mbyllur një bashkëbisedim.\n"
-"Zvarriteni sipër e mandej majtas për të kaluar te bashkëbisedimi i "
+"Lejon mbulim gjestesh miu në dritare bashkëbisedimesh. Zvarrisni butonin e "
+"mesit të miut për të kryer ca veprime:\n"
+" • Zvarriteni poshtë e mandej djathtas për të mbyllur një bashkëbisedim.\n"
+" • Zvarriteni sipër e mandej majtas për të kaluar te bashkëbisedimi i "
 "mëparshëm.\n"
-"Zvarriteni sipër e mandej djathtas për të kaluar tek bashkëbisedimi pasues."
+" • Zvarriteni sipër e mandej djathtas për të kaluar tek bashkëbisedimi "
+"pasues."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Mesazhe të Atypëratyshëm"
 
 #  Add the label.
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Përzgjidhni dikë prej librit tuaj të vendndodhjeve më sipër, ose shtoni një "
 "person të ri."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Grup:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Person i Ri"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Përzgjidhni Shok"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -17887,44 +13527,34 @@ msgstr ""
 "shok, ose krijoni një person të ri."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Hollësi përdoruesi"
 
 #  "Associate Buddy" button
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Shoqëro Shok"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send email"
-msgstr "I pazoti të dërgoj email."
+msgstr "I pazoti të dërgoj email"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "I ekzekutueshmi për Evolution nuk u gjet në PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "Nuk u gjet vendndodhje e-mail për këtë shok."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Shto te Libër Vendndodhjesh"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send Email"
 msgstr "Dërgo Email"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Formësim Integrimi me Evolucionin"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Përzgjidhni tërë llogaritë tek të cilat mund të vetështohen shokë."
 
@@ -17941,7 +13571,6 @@ msgstr "Përzgjidhni tërë llogaritë tek të cilat mund të vetështohen shok�
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integrim me Evolucionin"
 
@@ -17953,38 +13582,29 @@ msgstr "Integrim me Evolucionin"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Mundëson integrim me Eolucionin."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Ju lutem jepni më poshtë të dhëna personi."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Ju lutem jepni më poshtë tip llogarie dhe emër ekrani për shokun."
+msgid "Please enter the buddy's username and account type below."
+msgstr "Ju lutem jepni më poshtë tip llogarie dhe emër përdoruesi për shokun."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Tip llogarie:"
 
 #  Optional Information section
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Të dhëna të mundshme:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Emër:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Mbiemër:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "Email:"
 msgstr "Email:"
 
@@ -18001,10 +13621,8 @@ msgstr "Email:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
-#, fuzzy
 msgid "GTK Signals Test"
-msgstr "Provë Sinjalesh"
+msgstr "Provë Sinjalesh GTK"
 
 #  *< name
 #  *< version
@@ -18014,22 +13632,17 @@ msgstr "Provë Sinjalesh"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
-#, fuzzy
 msgid "Test to see that all ui signals are working properly."
-msgstr "Provo për të parë që tërë sinjalet punojnë në rregull."
+msgstr "Provo për të parë që tërë sinjalet ui punojnë në rregull."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>I plogësht:</b> %s"
+"<b>Shënim Shoku</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historik"
 
@@ -18046,7 +13659,6 @@ msgstr "Historik"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Ikonizim për i Larguar"
 
@@ -18058,87 +13670,68 @@ msgstr "Ikonizim për i Larguar"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ikonëson listën e shokëve dhe bashkëbisedimin tuaj kur largoheni."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Kontrollor Poste"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Kontrollon për postë të re vendore."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Shton një kuti të vogël te listë shokësh që shfaqetnëse keni postë të re."
 
-#: ../pidgin/plugins/markerline.c:23
-#, fuzzy
 msgid "Markerline"
-msgstr "të Nënvizuara"
+msgstr ""
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Tërhiq një vijë për të treguar mesazhe të rinj në një bashkëbisedim."
+
+msgid "Jump to markerline"
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
-msgstr "dritare _IM"
+msgstr "dritare _MA"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "dritare C_hat"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
+"U kërkua një sesion shkëmbimi mesazhesh muzike. Për pranim, ju lutem klikoni "
+"ikonën MM."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "U pranua sesion shkëmbimi mesazhesh muzike."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
-#, fuzzy
 msgid "Music Messaging"
-msgstr "Mesazhe të Atypëratyshëm"
+msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "Pati konflikt në xhirimin e urdhrit:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
-#, fuzzy
 msgid "Error Running Editor"
-msgstr "Gabim në xhirimin e %s"
+msgstr "Gabim në Xhirimin e Përpunuesit"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
-#, fuzzy
 msgid "The following error has occurred:"
-msgstr "Ndodhi gabimi vijues gjatë ngarkimit të %s: %s-."
+msgstr "Ndodhi gabimi vijues:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
-#, fuzzy
 msgid "Music Messaging Configuration"
-msgstr "Formësim Gjestesh Miu"
+msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
-#, fuzzy
 msgid "_Apply"
-msgstr "Zbato"
+msgstr "_Zbato"
 
 #. *< type
 #. *< ui_requirement
@@ -18148,97 +13741,88 @@ msgstr "Zbato"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "Shtojcë Shkëmbimi Mesazhesh Muzike për kompozim në bashkëpunim."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 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 ""
+"Shtojca për Shkëmbim Mesazhesh Muzike u lejon një numri përdoruesish të "
+"punojnë njëkohësisht mbi një pjesë muzikore duke përpunuar partiturën e "
+"përbashkët në kohë reale."
 
 #  ---------- "Notify For" ----------
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Njoftim Për"
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr ""
+msgid "\t_Only when someone says your username"
+msgstr "\t_Vetëm kur dikush përmend emrin tuaj të përdoruesit"
 
-#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "dritare të _fokusuara"
 
 #  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Mënyra Njoftimi"
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Parafut _string në titull dritareje:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Fut nu_mërim mesazhesh të rinj në titull dritareje"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
 #, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "Fut nu_mërim mesazhesh të rinj në titull dritareje"
+msgstr "Fut numërim mesazhesh të rinj te vetitë e _X-it"
 
 #  Urgent method button
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Rregullo ndihmëzën \"_URGENT\" e administruesit të dritareve"
 
 #  IM Convo trans options
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "N_gri dritare bashkëbisedimi"
 
+#  IM Convo trans options
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "Dritaren e bashkëbisedimit të _tanishëm"
+
 #  ---------- "Notification Removals" ----------
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Heqje Njoftimi"
 
 #  Remove on focus button
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Hiq kur dritarja e bashkëbisedimit _fiton fokus"
 
 #  Remove on click button
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Hiq kur dritarja e bashkëbisedimit _klikohet"
 
 #  Remove on type button
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Hiq kur _shtypet në dritare bashkëbisedimi"
 
 #  Remove on message send button
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Hiq kur mesazhi dërgohet"
 
 #  Remove on conversation switch button
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove gjatë kalimit te një ske_dë bashkëbisedimi"
 
@@ -18248,7 +13832,6 @@ msgstr "Remove gjatë kalimit te një ske_dë bashkëbisedimi"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Njoftim Mesazhesh"
 
@@ -18256,7 +13839,6 @@ msgstr "Njoftim Mesazhesh"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Mundëson një larmi rrugësh për t'ju njoftuar mesazhe të palexuar."
 
@@ -18273,10 +13855,8 @@ msgstr "Mundëson një larmi rrugësh për t'ju njoftuar mesazhe të palexuar."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "Shtojcë Shembulli Gaim "
+msgstr "Shtojcë Demonstrimi Pidgin"
 
 #  *< name
 #  *< version
@@ -18284,13 +13864,11 @@ msgstr "Shtojcë Shembulli Gaim "
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Shtojcë shembull që bën gjëra - shihni përshkrimin"
 
 #  *  description
 #. *  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"
@@ -18302,68 +13880,48 @@ msgstr ""
 "- Kthen tërë tekstet ardhës\n"
 "- U dërgon personave në listën tuaj një mesazh sapo futen"
 
-#: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Ngjyrë Kursori"
 
-#: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "Ngjyrë e Dytë Kursori"
 
-#: ../pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr "Ngjyrë Tejlidhjeje"
 
-#: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr "Emër Ngjyre për Theksim Mesazhi"
+
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "Ndarje Horizontale GtkTreeView"
 
 #  Conversations
-#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Zë Bashkëbisedimi"
 
-#  Conversations
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Histori Bashkëbisedimi"
-
-#: ../pidgin/plugins/pidginrc.c:75
-#, fuzzy
-msgid "Log Viewer"
-msgstr "Parës Regjistrimi"
-
-#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Dialog Kërkese"
 
 #  ---------- "Notify For" ----------
-#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Dialog Njoftimi"
 
-#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Përzgjidhni Ngjyrë"
 
-#: ../pidgin/plugins/pidginrc.c:300
 #, c-format
 msgid "Select Interface Font"
 msgstr "Përzgjidhni Gërma Ndërfaqeje"
 
-#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Përzgjidhni Gërma për %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "Gërma Ndërfaqeje GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
-#, fuzzy
 msgid "GTK+ Text Shortcut Theme"
-msgstr "Temë GTK+ me Shkurtprerje Teksti"
+msgstr "Temë Shkurtoresh GTK+ Tekst"
 
 #.
 #. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
@@ -18385,19 +13943,14 @@ msgstr "Temë GTK+ me Shkurtprerje Teksti"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
-#, fuzzy
 msgid "Interface colors"
-msgstr "Gërma Ndërfaqeje GTK+"
+msgstr "Ngjyra ndërfaqeje"
 
-#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
-msgstr ""
+msgstr "Madhësi Widget-i"
 
-#: ../pidgin/plugins/pidginrc.c:473
-#, fuzzy
 msgid "Fonts"
-msgstr "Llogari"
+msgstr "Gërma"
 
 #  *< api_version
 #  *< type
@@ -18406,19 +13959,15 @@ msgstr "Llogari"
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/plugins/pidginrc.c:497
-#, fuzzy
 msgid "Gtkrc File Tools"
-msgstr "Kontroll Gaim Kartelash"
+msgstr "Mjete Kartelash Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
+msgstr "Shkruaji rregullimet te %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
-msgstr ""
+msgstr "Rilexo kartela gtkrc"
 
 #  *< api_version
 #  *< type
@@ -18427,49 +13976,39 @@ msgstr ""
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/plugins/pidginrc.c:544
-#, fuzzy
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Kontroll Teme GTK+ për Gaim-in"
+msgstr "Kontroll Teme Pidgin GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Ofron mundësi ndryshimi të rregullimeve të zakonshme gtkrc."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Bruto"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Ju lejon të dërgoni input bruto te protokolle me bazë teksti "
 
-#: ../pidgin/plugins/raw.c:178
-#, fuzzy
 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 ""
-"Ju lejon të fusni të dhëna bruto në protokolle me bazë teksti (Jabber, MSN, "
-"IRC, TOC). Për të dërguar, shtypni 'Enter' te kuti futjesh. Kqyrni dritare "
-"\"debug\"."
+"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.Ju lejon të fusni "
+"të dhëna bruto në protokolle me bazë teksti (XMPP, MSN, IRC, TOC). Për "
+"dërgime, shtypni 'Enter' te kuti futjesh. Kqyrni dritaren \"debug\"."
 
-#: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
 msgstr ""
-"Jeni duke përdorur versionin  %s të Gaim-it.  Versioni i çastit është %s.<hr>"
+"Jeni duke përdorur %s në versionin %s.  Versioni i tanishëm është %s.  Mund "
+"ta merrni prej <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "<b>ChangeLog:</b><br>%s"
-msgstr ""
-"<b>Shënime Ndryshimi:</b>\n"
-"%s<br><br>"
+msgstr "<b>Shënime Ndryshimi:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Version i Ri i Mundshëm"
 
@@ -18486,7 +14025,6 @@ msgstr "Version i Ri i Mundshëm"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Njoftim Versioni"
 
@@ -18496,13 +14034,11 @@ msgstr "Njoftim Versioni"
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Kontrollon periodikisht për versione të rinj"
 
 #  *  description
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -18510,70 +14046,80 @@ msgstr ""
 "Kontrollon periodikisht për versione të rinj dhe njofton përdoruesin me "
 "Shënime Ndryshimi"
 
-#: ../pidgin/plugins/spellchk.c:1962
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Buton Dërgimi"
+
+#  IM Convo trans options
+#. *< name
+#. *< version
 #, fuzzy
+msgid "Conversation Window Send Button."
+msgstr "Buton Dërgimi Dritaresh Bashkëbisedimi."
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+"Shton një buton Dërgo te zona e futjeve në dritaren e bashkëbisedimeve. E "
+"paramenduar për rastet kur nuk ka tastierë materiale."
+
 msgid "Duplicate Correction"
-msgstr "Dyfishim Ndreqjeje"
+msgstr "Saktësim Dyfishash"
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Fjala e treguar ekziston tashmë te lista e ndreqjeve."
 
-#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Zëvendësim Teksti"
 
-#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Shtypni"
 
-#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Dërgoni"
 
-#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Vetëm fjalë të plota"
 
-#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
-msgstr ""
+msgstr "Siç është shkruajtur"
 
-#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Shto një zëvendësim të ri teksti "
 
-#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Sh_typni:"
 
-#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "_Dërgoni:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
+"_Saktësisht siç është shkruajtur (çaktivizoni trajtimin e vetvetishëm për "
+"këto raste)"
 
-#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Zëvendëso vetëm fjalë të _plota"
 
-#: ../pidgin/plugins/spellchk.c:2338
-#, fuzzy
 msgid "General Text Replacement Options"
-msgstr "Zëvendësim Teksti"
+msgstr "Mundësi të Përgjithshme Zëvendësimi Teksti "
 
-#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
-msgstr ""
+msgstr "Aktivizo zëvendësimin e fjalës së fundit gjatë dërgimesh"
 
-#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Zëvendësim Teksti"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Zëvendëson tekst në mesazhe që dërgohen, bazuar në rregulla të përcaktuar "
@@ -18592,23 +14138,18 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
-#, fuzzy
 msgid "Buddy Ticker"
-msgstr "Paradë Shokësh"
+msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Një version rrëshqitjeje vertikale për listë shokësh."
 
-#: ../pidgin/plugins/timestamp.c:137
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "Vulë kohore iChat"
+msgstr "Shfaq Vula Kohore Çdo"
 
 #  *< api_version
 #  *< type
@@ -18623,58 +14164,41 @@ msgstr "Vulë kohore iChat"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Vulë kohore"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "Vulë kohore iChat"
+msgstr "Shfaq vula kohore në stil iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "Shton te bashkëbisedimet vula kohore në stil iChat çdo N minuta."
+msgstr "Shfaq vula kohore në stil iChat çdo N minuta."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
-msgstr ""
+msgstr "Mundësi Formati Vule Kohore"
 
-#: ../pidgin/plugins/timestamp_format.c:26
 #, c-format
 msgid "_Force 24-hour time format"
-msgstr ""
+msgstr "_Detyro format 24 orësh për kohën"
 
-#: ../pidgin/plugins/timestamp_format.c:33
-#, fuzzy
 msgid "Show dates in..."
-msgstr "Shfaq mundësi vetësie..."
+msgstr "Shfaq data në..."
 
 #  Conversations
-#: ../pidgin/plugins/timestamp_format.c:38
-#, fuzzy
 msgid "Co_nversations:"
-msgstr "bashkëbisedime"
+msgstr "_Bashkëbisedime:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
-msgstr ""
+msgstr "Për mesazhe të fshira"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "Për mesazhe të vonuar dhe në fjalosje"
 
-#: ../pidgin/plugins/timestamp_format.c:47
-#, fuzzy
 msgid "_Message Logs:"
-msgstr "_Mesazh:"
+msgstr "_Regjistrime Mesazhesh:"
 
 #. *< type
 #. *< ui_requirement
@@ -18682,63 +14206,50 @@ msgstr "_Mesazh:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
-msgstr ""
+msgstr "Formate Vulash Kohore Mesazhi"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
-msgstr ""
+msgstr "Përshtat formate vulash kohore të mesazhit."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
+"Kjo shtojcë i lejon përdoruesit të përshtasë formate vulash kohore të "
+"bashkëbisedimeve dhe regjistrimit të mesazheve."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Patejdukshmëri:"
 
 #  IM Convo trans options
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
-msgstr "Dritare Bashkëbisedimi IM"
+msgstr "Dritare Bashkëbisedimi MA"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
-msgstr "Tejdukshmëri dritareje _IM"
+msgstr "Tejdukshmëri dritareje _MA"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
-msgstr "_Shfaq shtyllë rrëshqitësi në dritare IM"
+msgstr "_Shfaq shtyllë rrëshqitësi në dritare MA"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
-msgstr "Hiq tejdukshmëri dritareje IM kur fokusohet "
+msgstr "Hiq tejdukshmëri dritareje MA kur fokusohet "
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Përherë sipër"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Dritare Listë Shokësh"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "tejdukshmëri dritareje Liste _Shokësh"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Hiq tejdukshmëri dritareje Liste Shokësh kur fokusohet"
 
@@ -18755,7 +14266,6 @@ msgstr "Hiq tejdukshmëri dritareje Liste Shokësh kur fokusohet"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Tejdukshmëri"
 
@@ -18765,13 +14275,11 @@ msgstr "Tejdukshmëri"
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Tejdukshmëri e Ndryshueshme për listë shokësh dhe bashkëbisedimesh."
 
 #  *  description
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -18783,61 +14291,46 @@ msgstr ""
 "\n"
 "* Shënim: Kjo shtojcë lyp Win2000 ose më të ri."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Version GTK+ Runtime"
 
 #  Autostart
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Nisje"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_Nis Gaim-in në nisje të Windows-it"
+msgstr "_Nise %s-in në nisje të Windows-it"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Listë e _Luajtshme Shokësh"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Mbaj dritare Liste Shokësh sipër:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr ""
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
-#, fuzzy
 msgid "_Flash window when chat messages are received"
-msgstr "_Xixëllo dritare kur merren mesazhe"
+msgstr "_Xixëllo dritare kur merren mesazhe fjalosjeje"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
-#, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "Mundësi Futjeje"
+msgstr "Mundësi për Pidgin-in nën Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
-#, fuzzy
 msgid "Options specific to Pidgin for Windows."
-msgstr "Mundësi vetëm për Windows Gaim."
+msgstr "Mundësi vetëm për Pidgin-in nën Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
-"Ofron mundësi të caktuara për Gaim-in nën Windows Gaim, si ngecje liste "
-"shokësh dhe xixëllim bashkëbisedimi."
+"Furnizon mundësi karakteristike për Pidgin-in nën Windows, si bie fjala "
+"listë të lëvizshme shokësh."
 
-#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>I dalë.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -18845,868 +14338,37 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
-msgstr ""
+msgstr "Konsolë XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
-#, fuzzy
 msgid "Account: "
 msgstr "Llogari:"
 
-#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>I palidhur te XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
-msgstr ""
+msgstr "Fut një <iq/> stanza."
 
-#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
-msgstr ""
+msgstr "Fut një <presence/> stanza."
 
-#: ../pidgin/plugins/xmppconsole.c:808
-#, fuzzy
 msgid "Insert a <message/> stanza."
-msgstr "Fute në mesazh"
+msgstr "Fut një <message/> stanza."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "Dërgo dhe prano stanza XMPP të papërpunuara."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
+"Kjo shtojcë është e dobishme për diagnostikim shërbyesish apo klientësh XMPP."
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Gjej shokë"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Portë"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Sipas gjendjeje"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Sipas madhësie regjistrimi"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "I pazoti të lidhem me shërbyesin."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "I pazoti Të Marr Listë  Shokësh"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Për çastin në"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Shtojcë Protokolli Novell GroupWise Messenger"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Mirëfilltësimi normal dështoi"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Gabim i panjohur"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "I pazoti të lidhem me shërbyesin."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s ka ndryshuar temën në: %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s tani njihet si %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s nuk është më i larguar."
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Mesazh:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Dërgo Kartelë"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Shto _Cytje Shoku"
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "E palejueshme kur jeni të lidhur"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "E palejueshme kur jeni të lidhur"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Shto Shok"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Shto Fjalosje"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Lejo"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "Llogari"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Llogari:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "_Dërgo Te"
-
-#~ msgid "Gaim Internet Messenger"
-#~ msgstr "Lajmësjellësi Internet Gaim"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "Fshih Gabime Shkëputje"
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "Fshih Gabime Hyrjeje"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "Fshih Dialog Rilidhjeje"
-
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "Kur jeni përzënë \"offline\", kjo ju rilidh"
-
-#~ msgid "Use last matching buddy"
-#~ msgstr "Përdor të fundmin e përputhshëm nga shokët"
-
-#  Explanation
-#~ 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 ""
-#~ "Shoku me pikët më të pakta është shoku që do të ketë përparësi në "
-#~ "kontaktin.\n"
-#~ "Vlerat parazgjedhje (i palidhur = 4, i larguar = 2, dhe i plogësht = 1)\n"
-#~ "do të përdorin atë çka ishte radha e trupëzuar: veprues, joveprues, i "
-#~ "larguar, i larguar+, i plogësht, jo i lidhur."
-
-#  *  DEFINES, MACROS & DATA TYPES
-#~ msgid "Gaim"
-#~ msgstr "Gaim"
-
-#~ msgid "Gaim - Signed off"
-#~ msgstr "Gaim - I Çnënshkruar"
-
-#~ msgid "Gaim - Away"
-#~ msgstr "Gaim - Larguar"
-
-#~ msgid "Join A Chat..."
-#~ msgstr "Bashkoju një Fjalosjeje..."
-
-#~ msgid "Displays an icon for Gaim in the system tray."
-#~ msgstr "Shfaq për Gaim-in një ikonë në shtyllë sistemi."
-
-#~ 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 or login window. Also "
-#~ "allows messages to be queued until the icon is clicked, similar to ICQ."
-#~ msgstr ""
-#~ "Shfaq një ikonë shtylle sistemi (në GNOME, KDE ose Windows për shembull) "
-#~ "për të treguar gjendjen e çastit të Gaim-it, për të mundësuar hyrje të "
-#~ "shpejtë në funksionet e përdorur zakonisht, dhe për të këmbyer shfaqjen e "
-#~ "listës së shokëve me dritare hyrjeje. Lejon gjithashtu të vihen në pritje "
-#~ "mesazhe deri sa të klikohet ikona, e ngjashme me ICQ."
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "Madhësi Zgjeruesi GtkTreeView"
-
-#~ msgid "The specified buddy was not found in the Evolution Contacts."
-#~ msgstr "Shoku i treguar nuk u gjet te Kontaktet e Evolucionit."
-
-#~ 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 ""
-#~ "Kur hapet një bashkëbisedim kjo shtojcë do të fusë bashkëbisedimin e "
-#~ "fundit te bashkëbisedimi i çastit.\n"
-#~ "\n"
-#~ "Shtojca e historikut lyp që regjistrimi të jetë veprues. Regjistrimi mund "
-#~ "të bëhet veprues prej Mjete -> Parapëlqime -> Regjistrim. Aktivizimi i "
-#~ "regjistrimit të mesazheve të atypëratyshëm dhe/ose fjalosje do të "
-#~ "aktivizojë historikun për të njëjtin tip bashkëbisedimi."
-
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-#~ msgstr ""
-#~ "Mund të kini versionin %s prej:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-
-#~ msgid "Delay"
-#~ msgstr "Vonesë"
-
-#~ msgid "WinGaim Options"
-#~ msgstr "Mundësi WinGaim"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d shok prej grupit %s nuk u hoq sepse nuk qe bërë hyrje prej llogarisë "
-#~ "së tij.  Ky shok dhe grupi nuk u hoqën.\n"
-#~ msgstr[1] ""
-#~ "%d shokë prej grupit %s nuk u hoqën sepse nuk qe bërë hyrje prej "
-#~ "llogarisë së tyre.  Këta shokë dhe grupi nuk u hoqën.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "Grup i pahequr"
-
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d më tepër)"
-
-#~ msgid " left the room (%s)."
-#~ msgstr " la dhomën (%s)."
-
-#~ msgid "Screen Name:"
-#~ msgstr "Emër në Ekran:"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "Ikonë shoku:"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Doni ta shtoni atë te listë juaja shokësh?"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "_Alias Shoku..."
-
-#~ msgid "Alias Contact..."
-#~ msgstr "Kontakte Aliasi..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/Mjete/Ve_prime Llogarish"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/Mjete/L_logari"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Contact Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Alias Kontakti:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Alias:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Nofkë:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Futur:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Gjendje:</b> Jo i lidhur"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Përshkrim:</b> Fjalaman"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Gjendje:</b> Awesome"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Gjendje:</b> Rockin'"
-
-#~ msgid "/Tools/Buddy Pounce"
-#~ msgstr "/Mjete/Cytje Shokësh"
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/Mjete/Veprime Llogarish"
-
-#~ msgid "me is using Gaim v%s."
-#~ msgstr "vetja ime po përdor Gaim v%s."
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Mundësi/Shfaq _Ikonë Shoku"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Mundësi/Shfaq Ikonë Shoku"
-
-#~ msgid "IM the user"
-#~ msgstr "IM përdoruesin"
-
-#~ msgid "Ignore the user"
-#~ msgstr "Shpërfill përdoruesin"
-
-#~ msgid "Get the user's information"
-#~ msgstr "Ki të dhëna përdoruesi"
-
-#~ msgid "Jabber developer"
-#~ msgstr "zhvillues i Jabber-it"
-
-#~ msgid ""
-#~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
-#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
-#~ "<BR><BR>"
-#~ msgstr ""
-#~ "Gaim-i është një klient modular shkëmbimi mesazhesh i aftë të përdorë "
-#~ "njëherazi AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, "
-#~ "Napster, Zephyr, dhe Gadu-Gadu.  Është shkruajtur duke përdorur Gtk+ dhe "
-#~ "licensuar sipas GNU GPL.<BR><BR>"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim te irc.freenode.net<BR><BR>"
-
-#~ msgid "Active Developers"
-#~ msgstr "Zhvilluesa Veprues"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "_Mbaj dialogun të hapur"
-
-#~ msgid "Smaller font size"
-#~ msgstr "Madhësi më e vogël gërmash"
-
-#~ msgid "Insert link"
-#~ msgstr "Fut lidhje"
-
-#~ msgid "Insert image"
-#~ msgstr "Fut pamje"
-
-#~ msgid "Conversation in %s on %s"
-#~ msgstr "Bashkëbisedim në %s te %s"
-
-#  Descriptive label
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">Prej:</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">Subjekt:</span> %s\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "Gabim në nisjen e <b>%s</b>: %s"
-
-#~ msgid "A_way"
-#~ msgstr "Lar_goheni"
-
-#~ msgid "_Idle"
-#~ msgstr "_I plogësht"
-
-#~ msgid "Retur_n from idle"
-#~ msgstr "Kthehet _prej plogështie"
-
-#  Create the "Pounce Action" frame.
-#~ msgid "Pounce Action"
-#~ msgstr "Veprim Cytjeje"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "Shfl_eto..."
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "Rua_j këtë cytje aktivizimi"
-
-#  "Remove Buddy Pounce"
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "Hiq Cytje Shoku"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "Dërgo si mesazhe urdhra të panjohur \"_slash\""
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "Shfaq _ikona shokësh"
-
-#  All the tab options!
-#~ msgid "Tab Options"
-#~ msgstr "Mundësi Tab"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "_Tinguj  ndërsa është i larguar"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "_Vër në radhë mesazhe kur largohesh"
-
-#~ msgid "Custom status"
-#~ msgstr "Gjendje vetjake"
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "I pazoti të luaj tingull sepse është zgjedhur metodë 'Urdhri' tingulli, "
-#~ "por nuk është caktuar urdhër."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr ""
-#~ "I pazoti të luaj tingull sepse nuk zbatohej dot urdhri i formësuar për "
-#~ "tingujt: %s"
-
-#~ msgid "_Warn"
-#~ msgstr "_Sinjalizo"
-
-#~ 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 ""
-#~ "Mund ta dërgoni këtë pamje si shpërngulje kartele ose ta trupëzoni në "
-#~ "këtë mesazh, ose përdorni si ikonë shoku për këtë përdorues."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Gjendje:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Mesazh:</b> %s"
-
-#~ msgid "Could't open file"
-#~ msgstr "S'hap dot kartelën"
-
-#  if (js->protocol_options & CHANGE_PASSWORD) {
-#~ msgid "Change password"
-#~ msgstr "Ndrysho fjalëkalim"
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> %s<br>"
-#~ msgstr "<b>%s:</b> %s<br>"
-
-#~ msgid "Realname"
-#~ msgstr "Emër i vërtetë"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "Shërbyesi lyp TLS/SSL për hyrje.  Përzgjidhni \"Përdor TLS nëse gjendet\" "
-#~ "te veti llogarie"
-
-#~ msgid "Jabber ID"
-#~ msgstr "ID Jabber"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "Kërko për përdoruesas Jabber"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "ID Jabber i pavlefshëm"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Ndrysho Fjalëkalim Jabber-i"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Protokoll Shtojce Jabber"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "Përdor TLS nëse është e mundur"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "Përdoruesi %s don të shtojë %s te listë e tij shokësh"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "Hidden"
-#~ msgstr "Padukshëm"
-
-#~ msgid "Login server"
-#~ msgstr "Shërbyes hyrjeje"
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "Përdoruesi %s (%s) don të shtojë %s te listë e tij shokësh."
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "I pazoti të lexoj titull prej shërbyesit"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr ""
-#~ "I pazoti të lexoj mesazhe prej shërbyesi: %s.  Urdhri është %hd, gjatësia "
-#~ "është %hd."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "përdoruesa: %s, kartela: %s, madhësi: %sGB"
-
-#  MSG_SERVER_HOTLIST_ERROR
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "I pazoti të shtoj \"%s\" te listë juaja Napster hotlist"
-
-#  MSG_CLIENT_PING
-#~ msgid "%s requested a PING"
-#~ msgstr "%s kërkoi PING"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "Shtojcë Protokolli NAPSTER"
-
-#~ msgid "Invalid password"
-#~ msgstr "Fjalëkalim i pavlefshëm"
-
-#~ msgid "Invalid username or password"
-#~ msgstr "Emër përdoruesi ose fjalëkalim i pavlefshëm"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "Gabim gjatë trajtimit të ngjarjes ose përgjigjes (%s)."
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "Direct IM me %s u mbyll"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "Direct IM me %s dështoi"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "I pazoti të hap Direct IM"
-
-#~ msgid "You have lost your connection to chat room %s."
-#~ msgstr "Humbët lidhjen me dhomën e fjalosjeve %s."
-
-#~ msgid "Chat is currently unavailable"
-#~ msgstr "Fjalosja është e pamundur për çastin"
-
-#~ msgid ""
-#~ "Transfer of file %s timed out.\n"
-#~ " Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-#~ "ICQ."
-#~ msgstr ""
-#~ "Shpërnguljes së kartelës %s i mbaroi koha.\n"
-#~ " Provoni duke aktivizuar shpërngulje kartelash për shërbyesa ndërmjetës "
-#~ "te Mjete->Parapëlqime->AIM/ICQ."
-
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "I pazoti të futem te ndërmjetës shpërnguljeje kartele."
-
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr ""
-#~ "I pazoti të vendos \"socket\" dëgjuesi ose nuk duhet të ketë lidhje me "
-#~ "ndërmjetës AOL."
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "Përdoruesi %s kërkon autorizim para se të shtohet te një listë shokësh.  "
-#~ "Doni të dërgoni një kërkesë autorizimi?"
-
-#~ msgid "Request Authorization"
-#~ msgstr "Kërko Mirëfilltësim"
-
-#, fuzzy
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Përdoruesi %u dëshiron t'ju shtojë te listë e tija shokësh për arsyen "
-#~ "vijuese:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "Kërkesë Mirëfilltësimi"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UIN:</B> %s<BR><B>Gjendje:</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC ktheu gabim: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "Pa të dhëna të mundshme për %s:"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "Gabim kufizimi niveli"
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Jeni çnënshkruar për një arsye të panjohur."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Emri juaj i ekranit për çastin është i formatuar si vijon:\n"
-#~ "%s"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "I pazoti të rregulloj mesazh largimi 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 ""
-#~ "Mundet të keni kërkuar të caktoni mesazh tuajin largimesh përpara se të "
-#~ "plotësohej procedura e hyrjes.  Mbeteni në gjenjden \"present\"; "
-#~ "riprovoni ta caktoni sapo të jeni futur përfundimisht."
-
-#~ 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 ""
-#~ "Për arsye të panjohur nuk munda të shtoj shokun %s.  Arsyeja më e "
-#~ "zakonshme për këtë është pasja e numrit më të madh shokësh të lejuar në "
-#~ "listën tuaj të shokëve."
-
-#, fuzzy
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Përdoruesi %s dëshiron t'ju shtojë te listë e tija shokësh për arsyen "
-#~ "vijuese:\n"
-#~ "%s"
-
-#~ msgid "Hide IP address"
-#~ msgstr "Fshih Vendndodhje IP"
-
-#~ msgid "Web aware"
-#~ msgstr "Me Web-in  parasysh"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Formatim i ri emri ekrani:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Formato Emër Ekrani..."
-
-#~ msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-#~ msgstr ""
-#~ "Përdor shërbyesa AIM/ICQ ndërmjetës (Më të Ngadaltë/Më të Sigurtë/"
-#~ "Zakonisht Funksionon)"
-
-#~ msgid "Auth host"
-#~ msgstr "Strehë autorizimi"
-
-#~ msgid "Auth port"
-#~ msgstr "Portë autorizimi"
-
-#~ msgid "Admin Alert"
-#~ msgstr "Sinjalizim Admin"
-
-#~ msgid "Active"
-#~ msgstr "Veprues"
-
-#~ msgid ""
-#~ "Could not add the buddy %s because every simple user has to start with "
-#~ "'sip:'."
-#~ msgstr ""
-#~ "Nuk shtova dot shokun %s sepse secili përdorues i thjeshtë duhet të "
-#~ "fillojë me 'sip:'."
-
-#~ msgid "Thomas Butter <butter@uni-mannheim.de>"
-#~ msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#~ msgid "EMail"
-#~ msgstr "EMail"
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "Verifiko tërë nënshkrime mesazhesh IM"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "Nënshkruaj numerikisht tërë mesazhet e kanaleve"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "Verifiko tërë nënshkrimet e mesazheve të kanaleve"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "Hidhni poshtë parjen nga përdorues të tjerë"
-
-#~ msgid "Block invites"
-#~ msgstr "Blloko ftesa"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Hidh poshtë kërkesa rreth atributesh gjendjeje \"online\""
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC ka dërguar një urdhër PUSHIMI."
-
-#~ msgid ""
-#~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Gaim will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
-#~ msgstr ""
-#~ "Kur ndodh kjo, TOC shpërfill çfarëdo mesazhi dërguar asaj, dhe mund t'ju "
-#~ "përzërë nëse dërgoni mesazh. Gaim-i do të parandalojë gjithçka që shpie "
-#~ "atje. Vetëm përkohësisht, ndaj bëni durim."
-
-#~ msgid "Gaim - Save As..."
-#~ msgstr "Gaim - Ruaj Si..."
-
-#~ msgid "TOC host"
-#~ msgstr "Strehë TOC"
-
-#~ msgid "TOC port"
-#~ msgstr "Portë TOC"
-
-#~ msgid "Message (optional) :"
-#~ msgstr "Mesazh (opsional) :"
-
-#~ msgid ""
-#~ "The normal authentication method has failed. This means either your "
-#~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Gaim will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
-#~ msgstr ""
-#~ "Mirëfilltësimi normal dështoi. Kjo do të thotë ose që fjalëkalimi juaj "
-#~ "është i pasaktë, ose që skema e mirëfillltësimit te Yahoo! ka ndryshuar. "
-#~ "Gaim-i do të përpiqet tani të hyjë duke përdorur mirëfilltësimin Web "
-#~ "Messenger, çka përkthehet në anë dhe veprimtari më të ulët."
-
-#~ msgid "Unable to read"
-#~ msgstr "I pazoti të lexoj"
-
-#  State
-#~ msgid "Stealth"
-#~ msgstr "Stealth"
-
-#~ msgid "Pager host"
-#~ msgstr "Strehë faquesi"
-
-#~ msgid "YCHT Host"
-#~ msgstr "Strehë YCHT"
-
-#~ msgid "YCHT Port"
-#~ msgstr "Portë YCHT"
-
-#~ msgid "<b>IP Address:</b> %s<br>"
-#~ msgstr "<b>Vendndodhje IP:</b> %s<br>"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(%d mesazh)"
-#~ msgstr[1] "(%d mesazhe)"
-
-#~ msgid "(1 message)"
-#~ msgstr "(1 mesazh)"
-
-#~ msgid "%s came back"
-#~ msgstr "%s u kthye"
-
-#~ msgid "Default auto-away"
-#~ msgstr "Vetëlargim parazgjedhje"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Kod [0x%02X]: %s"
 
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: Gabim në hapje lidhjeje.\n"
+#~ msgid "Group Operation Error"
+#~ msgstr "Gabim Veprimi mbi Grup"
diff --git a/po/vi.po b/po/vi.po
index 883dca88e9..3e852924cb 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,5 +1,5 @@
 # Vietnamese Translation for Pidgin.
-# Copyright © 2007 Gnome i18n Project for Vietnamese
+# Copyright © 2008 Gnome i18n Project for Vietnamese
 # Đóng góp dịch Pidgin UI Catalog sang tiếng Việt :
 # Nguyễn  Văn Vũ <vncasper@yahoo.com>.
 # Nguyễn Minh Hương <parfumi@yahoo.com>.
@@ -7,36 +7,30 @@
 # Trinh Minh Thanh <tmthanh@yahoo.com>.
 # Nguyễn Thái Ngọc Duy <pclouds@users.sf.net>.
 # Nguyễn Xuân Nguyên <xxxnnn@gmail.com>, 2007.
-# Clytie Siddall <clytie@riverland.net.au>, 2007.
+# Clytie Siddall <clytie@riverland.net.au>, 2007-2008.
 msgid ""
-""
-msgstr "Project-Id-Version: CVS Version of Pidgin\n"
+msgstr ""
+"Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-21 03:21-0500\n"
-"PO-Revision-Date: 2007-12-23 22:27+1030\n"
+"POT-Creation-Date: 2008-08-15 11:18-0400\n"
+"PO-Revision-Date: 2008-06-22 21:58+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
-
-#.Translators may want to transliterate the name.
-#.It is not to be translated.
-#: ../finch/finch.c:64
-#: ../finch/finch.c:300
-#: ../finch/finch.c:329
-#: ../finch/finch.c:417
+"X-Generator: LocFactoryEditor 1.7b3\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Chạy '%s -h' để biết thêm thông tin.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -47,7 +41,8 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
-msgstr "%s\n"
+msgstr ""
+"%s\n"
 "Cách sử dụng: %s [TÙY_CHỌN]...\n"
 "\n"
 "  -c, --config=THƯ_MỤC    dùng thư mục này cho các tập tin cấu hình\n"
@@ -56,1407 +51,884 @@ msgstr "%s\n"
 "  -n, --nologin       đừng tự động đăng nhập\n"
 "  -v, --version       hiện phiên bản hiện thời rồi thoát\n"
 
-#: ../finch/finch.c:327
-#: ../pidgin/gtkmain.c:741
 #, 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 đã gặp lỗi khi nâng cấp thiết lập của bạn từ %s lên %s. Hãy kiểm tra và nâng cấp xong bằng tay. Vui lòng thông báo lỗi này ở « http://developer.pidgin.im »."
-
-#: ../finch/gntaccount.c:124
-#: ../finch/gntaccount.c:484
-#: ../finch/gntblist.c:334
-#: ../finch/gntblist.c:467
-#: ../finch/gntblist.c:480
-#: ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244
-#: ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576
-#: ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
+msgstr ""
+"%s đã gặp lỗi khi nâng cấp thiết lập của bạn từ %s lên %s. Hãy kiểm tra và "
+"nâng cấp xong bằng tay. Vui lòng thông báo lỗi này ở « http://developer."
+"pidgin.im »."
+
 msgid "Error"
 msgstr "Lỗi"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Tài khoản chưa được thêm"
 
-#: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
-msgstr "Tên hiển thị của tài khoản không thể là rỗng."
+msgid "Username of an account must be non-empty."
+msgstr "Tên người dùng của tài khoản không thể là rỗng."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Thông báo thư mới"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Ghi nhớ mật khẩu"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Chưa cài đặt phần bổ sung giao thức."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Rất có thể là bạn quên chạy lệnh « make install ».)"
 
-#: ../finch/gntaccount.c:496
-#: ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1464
-#: ../pidgin/gtkblist.c:4460
 msgid "Modify Account"
 msgstr "Sửa tài khoản"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Tài khoản mới"
 
-#: ../finch/gntaccount.c:521
-#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Giao thức:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
-msgid "Screen name:"
-msgstr "Tên hiển thị:"
+msgid "Username:"
+msgstr "Tên người dùng:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Mật khẩu :"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Bí danh:"
 
-#.Cancel button
-#.Cancel
-#: ../finch/gntaccount.c:575
-#: ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889
-#: ../finch/gntblist.c:378
-#: ../finch/gntblist.c:455
-#: ../finch/gntblist.c:490
-#: ../finch/gntblist.c:836
-#: ../finch/gntblist.c:1038
-#: ../finch/gntblist.c:1134
-#: ../finch/gntblist.c:2271
-#: ../finch/gntblist.c:2334
-#: ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:181
-#: ../libpurple/account.c:1116
-#: ../libpurple/account.c:1405
-#: ../libpurple/account.c:1440
-#: ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508
-#: ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804
-#: ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2428
-#: ../libpurple/protocols/jabber/buddy.c:2464
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1047
-#: ../libpurple/protocols/jabber/jabber.c:1056
-#: ../libpurple/protocols/jabber/jabber.c:1761
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/jabber/usermood.c:202
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291
-#: ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325
-#: ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363
-#: ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6119
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/silc.c:966
-#: ../libpurple/protocols/silc/silc.c:1174
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1028
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
-#: ../libpurple/protocols/yahoo/yahoo.c:3521
-#: ../pidgin/gtkaccount.c:1859
-#: ../pidgin/gtkaccount.c:2417
-#: ../pidgin/gtkblist.c:6672
-#: ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:781
-#: ../pidgin/gtkdialogs.c:920
-#: ../pidgin/gtkdialogs.c:1012
-#: ../pidgin/gtkdialogs.c:1032
-#: ../pidgin/gtkdialogs.c:1056
-#: ../pidgin/gtkdialogs.c:1078
-#: ../pidgin/gtkdialogs.c:1126
-#: ../pidgin/gtkdialogs.c:1167
-#: ../pidgin/gtkdialogs.c:1223
-#: ../pidgin/gtkdialogs.c:1262
-#: ../pidgin/gtkdialogs.c:1289
-#: ../pidgin/gtkimhtmltoolbar.c:435
-#: ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289
-#: ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:539
-#: ../pidgin/gtkprivacy.c:555
-#: ../pidgin/gtkprivacy.c:580
-#: ../pidgin/gtkprivacy.c:594
-#: ../pidgin/gtkrequest.c:272
-#: ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Tạo tài khoản này trên máy phục vụ"
+
+#. Cancel button
+#. Cancel
 msgid "Cancel"
 msgstr "Thôi"
 
-#.Save button
-#.Save
-#: ../finch/gntaccount.c:579
-#: ../finch/gntcertmgr.c:311
-#: ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:478
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055
-#: ../finch/gntstatus.c:488
-#: ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1439
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727
-#: ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:278
+#. Save button
+#. Save
 msgid "Save"
 msgstr "Lưu"
 
-#: ../finch/gntaccount.c:632
-#: ../pidgin/gtkaccount.c:1851
-#: ../pidgin/gtksavedstatuses.c:333
-#: ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Bạn chắc chắn muốn xóa %s không?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Xoá tài khoản"
 
-#.Delete button
-#: ../finch/gntaccount.c:637
-#: ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319
-#: ../finch/gntpounce.c:679
-#: ../finch/gntpounce.c:742
-#: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1858
-#: ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1112
-#: ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1592
+#. Delete button
 msgid "Delete"
 msgstr "Xoá"
 
-#: ../finch/gntaccount.c:669
-#: ../finch/gntblist.c:2168
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2276
-#: ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Tài khoản"
 
-#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "Bạn có thể bật/tắt tài khoản trong danh sách này."
 
-#.Add button
-#: ../finch/gntaccount.c:698
-#: ../finch/gntaccount.c:888
-#: ../finch/gntblist.c:377
-#: ../finch/gntblist.c:455
-#: ../finch/gntblist.c:490
-#: ../finch/gntblist.c:2426
-#: ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:385
-#: ../finch/gntpounce.c:726
-#: ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5532
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2416
-#: ../pidgin/gtkblist.c:6671
-#: ../pidgin/gtkconv.c:1668
-#: ../pidgin/gtkrequest.c:276
+#. Add button
 msgid "Add"
 msgstr "Thêm"
 
-#.Modify button
-#: ../finch/gntaccount.c:703
-#: ../finch/gntpounce.c:734
+#. Modify button
 msgid "Modify"
 msgstr "Sửa"
 
-#: ../finch/gntaccount.c:811
-#: ../pidgin/gtkaccount.c:2363
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s đã đặt %s là bạn thân của họ%s%s"
 
-#: ../finch/gntaccount.c:884
-#: ../pidgin/gtkaccount.c:2415
 msgid "Add buddy to your list?"
 msgstr "Có thêm bạn thân vào danh sách của bạn không?"
 
-#: ../finch/gntaccount.c:944
-#: ../pidgin/gtkaccount.c:2473
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s muốn thêm %s vào danh sách bạn bè của họ%s%s"
 
-#: ../finch/gntaccount.c:969
-#: ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999
-#: ../pidgin/gtkaccount.c:2496
-#: ../pidgin/gtkaccount.c:2502
 msgid "Authorize buddy?"
 msgstr "Cho phép bạn thân không?"
 
-#: ../finch/gntaccount.c:976
-#: ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2497
-#: ../pidgin/gtkaccount.c:2503
 msgid "Authorize"
 msgstr "Cho phép"
 
-#: ../finch/gntaccount.c:977
-#: ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2498
-#: ../pidgin/gtkaccount.c:2504
 msgid "Deny"
 msgstr "Từ chối"
 
-#: ../finch/gntblist.c:323
-msgid "You must provide a screename for the buddy."
-msgstr "Bạn cần phải cung cấp một tên hiển thị cho bạn thân."
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Trực tuyến: %d\n"
+"Tổng: %d"
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Tài khoản: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Xem cuối: %s qua"
+
+msgid "Default"
+msgstr "Mặc định"
+
+msgid "You must provide a username for the buddy."
+msgstr "Bạn cần phải cung cấp một tên người dùng cho bạn thân."
 
-#: ../finch/gntblist.c:325
 msgid "You must provide a group."
 msgstr "Bạn cần phải cung cấp một nhóm."
 
-#: ../finch/gntblist.c:327
 msgid "You must select an account."
 msgstr "Bạn cần phải chọn một tài khoản."
 
-#: ../finch/gntblist.c:329
 msgid "The selected account is not online."
 msgstr "Tài khoản đã chọn không phải hiện thời trực tuyến."
 
-#: ../finch/gntblist.c:334
 msgid "Error adding buddy"
 msgstr "Lỗi thêm bạn thân"
 
-#: ../finch/gntblist.c:359
-#: ../libpurple/protocols/oscar/oscar.c:2893
-#: ../pidgin/gtkaccount.c:1932
-#: ../pidgin/gtksavedstatuses.c:969
-msgid "Screen Name"
-msgstr "Tên hiển thị"
-
-#: ../finch/gntblist.c:362
-#: ../finch/gntblist.c:444
-#: ../finch/gntblist.c:1283
-#: ../libpurple/protocols/msn/msn.c:1551
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:1031
-#: ../pidgin/gtkdialogs.c:1055
-#: ../pidgin/gtkdialogs.c:1077
-#: ../pidgin/gtkrequest.c:279
-msgid "Alias"
-msgstr "Bí danh"
+msgid "Username"
+msgstr "Tên đăng nhập"
 
-#: ../finch/gntblist.c:365
-#: ../finch/gntblist.c:447
-msgid "Group"
-msgstr "Nhóm"
+msgid "Alias (optional)"
+msgstr "Bí danh (tùy chọn)"
+
+msgid "Add in group"
+msgstr "Thêm vào nhóm"
 
-#: ../finch/gntblist.c:369
-#: ../finch/gntblist.c:435
-#: ../finch/gntblist.c:1338
-#: ../finch/gntblist.c:2257
-#: ../finch/gntblist.c:2321
-#: ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3154
-#: ../pidgin/gtknotify.c:514
-#: ../pidgin/gtkpounce.c:1280
-#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Tài khoản"
 
-#: ../finch/gntblist.c:375
-#: ../finch/gntblist.c:885
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3355
-#: ../pidgin/gtkblist.c:6160
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Thêm bạn thân"
 
-#: ../finch/gntblist.c:375
 msgid "Please enter buddy information."
 msgstr "Hãy nhập thông tin về bạn thân."
 
-#: ../finch/gntblist.c:404
-#: ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Cuộc Chat"
 
-#.Extract their Name and put it in
-#: ../finch/gntblist.c:441
-#: ../finch/gntblist.c:2252
-#: ../libpurple/protocols/jabber/jabber.c:975
-#: ../libpurple/protocols/jabber/jabber.c:978
-#: ../libpurple/protocols/msn/msn.c:1732
-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44
-#: ../pidgin/gtkplugin.c:599
-#: ../pidgin/gtkroomlist.c:767
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+#. Extract their Name and put it in
 msgid "Name"
 msgstr "Tên"
 
-#: ../finch/gntblist.c:450
-#: ../finch/gntblist.c:852
+msgid "Alias"
+msgstr "Bí danh"
+
+msgid "Group"
+msgstr "Nhóm"
+
 msgid "Auto-join"
 msgstr "Tự động tham gia"
 
-#: ../finch/gntblist.c:453
-#: ../finch/gntblist.c:887
-#: ../pidgin/gtkblist.c:6556
 msgid "Add Chat"
 msgstr "Thêm Chat"
 
-#: ../finch/gntblist.c:454
 msgid "You can edit more information from the context menu later."
 msgstr "Bạn có thể soạn thảo thông tin thêm từ trình đơn ngữ cảnh về sau."
 
-#: ../finch/gntblist.c:467
-#: ../finch/gntblist.c:480
 msgid "Error adding group"
 msgstr "Lỗi thêm nhóm"
 
-#: ../finch/gntblist.c:468
 msgid "You must give a name for the group to add."
 msgstr "Bạn cần phải nhập tên cho nhóm cần thêm."
 
-#: ../finch/gntblist.c:481
 msgid "A group with the name already exists."
 msgstr "Một nhóm tên đó đã có."
 
-#: ../finch/gntblist.c:488
-#: ../finch/gntblist.c:889
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530
-#: ../pidgin/gtkblist.c:6668
 msgid "Add Group"
 msgstr "Thêm nhóm"
 
-#: ../finch/gntblist.c:488
 msgid "Enter the name of the group"
 msgstr "Hãy nhập tên của nhóm"
 
-#: ../finch/gntblist.c:835
 msgid "Edit Chat"
 msgstr "Sửa Chat"
 
-#: ../finch/gntblist.c:835
 msgid "Please Update the necessary fields."
 msgstr "Hãy cập nhật các trường cần thiết."
 
-#: ../finch/gntblist.c:836
-#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Sửa"
 
-#: ../finch/gntblist.c:861
 msgid "Edit Settings"
 msgstr "Sửa thiết lập"
 
-#: ../finch/gntblist.c:897
-#: ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Thông tin"
 
-#: ../finch/gntblist.c:897
-#: ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "Đang lấy..."
 
-#: ../finch/gntblist.c:937
-#: ../finch/gntconv.c:535
-#: ../libpurple/protocols/silc/chat.c:903
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Lấy thông tin"
 
-#: ../finch/gntblist.c:941
 msgid "Add Buddy Pounce"
 msgstr "Thêm thông báo bạn thân"
 
-#.if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:948
-#: ../finch/gntconv.c:547
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/oscar/oscar.c:653
-#: ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1616
+#. if (q_bud && is_online(q_bud->status)) {
 msgid "Send File"
 msgstr "Gửi tập tin"
 
-#: ../finch/gntblist.c:952
+msgid "Blocked"
+msgstr "Bị chặn"
+
 msgid "View Log"
 msgstr "Xem sổ theo dõi"
 
-#: ../finch/gntblist.c:1033
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Hãy nhập tên mới cho %s"
 
-#: ../finch/gntblist.c:1035
-#: ../finch/gntblist.c:1283
 msgid "Rename"
 msgstr "Thay tên"
 
-#: ../finch/gntblist.c:1035
 msgid "Set Alias"
 msgstr "Đặt bí danh"
 
-#: ../finch/gntblist.c:1036
 msgid "Enter empty string to reset the name."
 msgstr "Gõ chuỗi rỗng để đặt lại tên."
 
-#: ../finch/gntblist.c:1112
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Gỡ bỏ liên lạc này thì cũng gỡ bỏ mọi bạn thân trong liên lạc"
 
-#: ../finch/gntblist.c:1120
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Gỡ bỏ nhóm này thì cũng gỡ bỏ mọi bạn thân trong nhóm"
 
-#: ../finch/gntblist.c:1125
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Bạn chắc chắn muốn gỡ bỏ %s không?"
 
-#.XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1128
+#. XXX: anything to do with the returned ui-handle?
 msgid "Confirm Remove"
 msgstr "Xác nhận gỡ bỏ"
 
-#: ../finch/gntblist.c:1133
-#: ../finch/gntblist.c:1285
-#: ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1665
-#: ../pidgin/gtkrequest.c:277
-#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Bỏ"
 
-#.Buddy List
-#: ../finch/gntblist.c:1259
-#: ../finch/gntblist.c:2479
-#: ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83
-#: ../pidgin/gtkblist.c:4901
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
+#. Buddy List
 msgid "Buddy List"
 msgstr "Danh sách bạn bè"
 
-#: ../finch/gntblist.c:1290
 msgid "Place tagged"
 msgstr "Nơi có thẻ"
 
-#: ../finch/gntblist.c:1295
 msgid "Toggle Tag"
 msgstr "Bật/tắt thẻ"
 
-#.General
-#: ../finch/gntblist.c:1331
-#: ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052
-#: ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1249
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/jabber/buddy.c:2411
-#: ../libpurple/protocols/jabber/jabber.c:986
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
-#: ../libpurple/protocols/jabber/jabber.c:1644
-#: ../libpurple/protocols/msn/msn.c:1559
-#: ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
-#: ../pidgin/gtkblist.c:3178
+#. General
 msgid "Nickname"
 msgstr "Tên hiệu"
 
-#.Idle stuff
-#: ../finch/gntblist.c:1353
-#: ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611
-#: ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2842
-#: ../libpurple/protocols/oscar/oscar.c:2917
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3206
-#: ../pidgin/gtkblist.c:3631
-#: ../pidgin/gtkprefs.c:2026
+#. Never know what those translations might end up like...
+#. Idle stuff
 msgid "Idle"
 msgstr "Nghỉ"
 
-#: ../finch/gntblist.c:1367
 msgid "On Mobile"
 msgstr "Qua điện thoại di động"
 
-#: ../finch/gntblist.c:1448
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr "Trực tuyến: %d\n"
-"Tổng: %d"
-
-#: ../finch/gntblist.c:1457
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Tài khoản: %s (%s)"
-
-#: ../finch/gntblist.c:1469
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr "\n"
-"Xem cuối: %s qua"
-
-#: ../finch/gntblist.c:1738
-#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Mới..."
 
-#: ../finch/gntblist.c:1745
-#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Đã lưu..."
 
-#: ../finch/gntblist.c:2136
-#: ../finch/gntplugin.c:352
-#: ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716
-#: ../pidgin/gtkplugin.c:548
 msgid "Plugins"
 msgstr "Phần bổ sung"
 
-#: ../finch/gntblist.c:2265
-#: ../pidgin/gtkdialogs.c:775
-msgid "New Instant Message"
-msgstr "Tin nhắn mới"
+msgid "Block/Unblock"
+msgstr "Chặn/Bỏ chặn"
+
+msgid "Block"
+msgstr "Chặn"
 
-#: ../finch/gntblist.c:2267
-#: ../pidgin/gtkdialogs.c:777
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "Hãy nhập tên hiển thị hay bí danh của người mà bạn muốn trò chuyện bằng Nhắn Tin."
-
-#.Not multiline
-#.Not masked?
-#.No hints?
-#: ../finch/gntblist.c:2270
-#: ../finch/gntcertmgr.c:90
-#: ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:180
-#: ../libpurple/account.c:1115
-#: ../libpurple/account.c:1404
-#: ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1760
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290
-#: ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324
-#: ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6118
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1027
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-#: ../libpurple/protocols/yahoo/yahoo.c:3520
-#: ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:780
-#: ../pidgin/gtkdialogs.c:919
-#: ../pidgin/gtkdialogs.c:1011
-#: ../pidgin/gtkrequest.c:271
+msgid "Unblock"
+msgstr "Bỏ chặn"
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"Hãy nhập tên người dùng hay bí danh của người mà bạn muốn Chặn hay Bỏ chặn."
+
+#. Not multiline
+#. Not masked?
+#. No hints?
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2317
+msgid "New Instant Message"
+msgstr "Tin nhắn mới"
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+"Hãy nhập tên người dùng hay bí danh của người với họ bạn muốn trò chuyện "
+"bằng Nhắn Tin."
+
 msgid "Channel"
 msgstr "Kênh"
 
-#: ../finch/gntblist.c:2329
-#: ../pidgin/gtkblist.c:960
 msgid "Join a Chat"
 msgstr "Tham gia Chat"
 
-#: ../finch/gntblist.c:2331
 msgid "Please enter the name of the chat you want to join."
 msgstr "Hãy nhập tên của cuộc chat bạn muốn tham gia."
 
-#: ../finch/gntblist.c:2333
-#: ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Tham gia"
 
-#.Create the "Options" frame.
-#: ../finch/gntblist.c:2371
-#: ../finch/gntpounce.c:460
-#: ../pidgin/gtkpounce.c:802
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Hãy nhập tên người dùng hay bí danh của người mà bạn muốn xem sổ theo dõi về "
+"họ."
+
+#. Create the "Options" frame.
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: ../finch/gntblist.c:2377
 msgid "Send IM..."
 msgstr "Gửi tin nhắn..."
 
-#: ../finch/gntblist.c:2382
+msgid "Block/Unblock..."
+msgstr "Chặn/Bỏ chặn..."
+
 msgid "Join Chat..."
 msgstr "Tham gia Chat..."
 
-#: ../finch/gntblist.c:2387
+msgid "View Log..."
+msgstr "Xem sổ theo dõi..."
+
+msgid "View All Logs"
+msgstr "Xem mọi sổ theo dõi"
+
 msgid "Show"
 msgstr "Hiện"
 
-#: ../finch/gntblist.c:2392
 msgid "Empty groups"
 msgstr "Nhóm rỗng"
 
-#: ../finch/gntblist.c:2399
 msgid "Offline buddies"
 msgstr "Bạn thân ngoại tuyến"
 
-#: ../finch/gntblist.c:2406
 msgid "Sort"
 msgstr "Sắp xếp"
 
-#: ../finch/gntblist.c:2411
 msgid "By Status"
 msgstr "Theo trạng thái"
 
-#: ../finch/gntblist.c:2416
-#: ../pidgin/gtkblist.c:4123
 msgid "Alphabetically"
 msgstr "Theo abc"
 
-#: ../finch/gntblist.c:2421
 msgid "By Log Size"
 msgstr "Theo kích cỡ sổ theo dõi"
 
-#: ../finch/gntcertmgr.c:86
-#: ../pidgin/gtkcertmgr.c:188
+msgid "Buddy"
+msgstr "Bạn chát"
+
+msgid "Chat"
+msgstr "Chát"
+
+msgid "Grouping"
+msgstr "Nhóm"
+
 msgid "Certificate Import"
 msgstr "Nhập chứng nhận"
 
-#: ../finch/gntcertmgr.c:87
-#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Ghi rõ tên máy"
 
-#: ../finch/gntcertmgr.c:88
-#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Gõ tên máy cho đó có chứng nhận này."
 
-#: ../finch/gntcertmgr.c:97
-#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
-msgstr "Tập tin %s không thể được nhập khẩu.\n"
+msgstr ""
+"Tập tin %s không thể được nhập khẩu.\n"
 "Hãy kiểm tra xem tập tin có khả năng đọc và theo định dạng PEM.\n"
 
-#: ../finch/gntcertmgr.c:99
-#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Lỗi nhập khẩu chứng nhận"
 
-#: ../finch/gntcertmgr.c:100
-#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Lỗi nhập khẩu chứng nhận X.509"
 
-#: ../finch/gntcertmgr.c:110
-#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Chọn chứng nhận PEM"
 
-#: ../finch/gntcertmgr.c:127
-#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
-msgstr "Lỗi xuất khẩu ra tập tin %s.\n"
+msgstr ""
+"Lỗi xuất khẩu ra tập tin %s.\n"
 "Hãy kiểm tra xem bạn có quyền ghi vào đường dẫn đích\n"
 
-#: ../finch/gntcertmgr.c:129
-#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Lỗi xuất khẩu chứng nhận"
 
-#: ../finch/gntcertmgr.c:130
-#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Lỗi xuất khẩu chứng nhận X.509"
 
-#: ../finch/gntcertmgr.c:159
-#: ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr "Xuất khẩu chứng nhận X.509 PEM"
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "Chứng nhận cho %s"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
 "\n"
 "SHA1 fingerprint:\n"
 "%s"
-msgstr "Tên chung: %s\n"
+msgstr ""
+"Tên chung: %s\n"
 "\n"
 "Vân tay SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr "Chứng nhận máy SSL"
 
-#: ../finch/gntcertmgr.c:233
-#: ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Thực sự xoá chứng nhận cho %s không?"
 
-#: ../finch/gntcertmgr.c:236
-#: ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr "Xác nhận xoá chứng nhận"
 
-#: ../finch/gntcertmgr.c:293
-#: ../pidgin/gtkcertmgr.c:601
 msgid "Certificate Manager"
 msgstr "Bộ Quản lý Chứng nhận"
 
-#.Creating the user splits
-#: ../finch/gntcertmgr.c:298
-#: ../libpurple/protocols/bonjour/bonjour.c:693
-#: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
+#. Creating the user splits
 msgid "Hostname"
 msgstr "Tên máy"
 
-#: ../finch/gntcertmgr.c:315
-#: ../finch/gntnotify.c:388
-#: ../pidgin/gtkconv.c:1644
-#: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Thông tin"
 
-#.Close button
-#: ../finch/gntcertmgr.c:324
-#: ../finch/gntft.c:237
-#: ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220
-#: ../finch/gntplugin.c:413
-#: ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
-#: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2390
-#: ../pidgin/gtkrequest.c:274
+#. Close button
 msgid "Close"
 msgstr "Đóng"
 
-#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s đã ngắt kết nối."
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
 "\n"
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
-msgstr "%s\n"
+msgstr ""
+"%s\n"
 "\n"
 "Finch sẽ không thử tái kết nối tài khoản đến khi bạn sửa chữa lỗi này và "
 "hiệu lực lại tài khoản."
 
-#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "Bật lại tài khoản"
 
-#: ../finch/gntconn.c:155
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
-msgstr "Tài khoản đã ngắt kết nối nên bạn không còn tham gia cuộc chat này. Tài khoản tái kết nối thì bạn tham gia lại một cách tự động."
+msgstr ""
+"Tài khoản đã ngắt kết nối nên bạn không còn tham gia cuộc chat này. Tài "
+"khoản tái kết nối thì bạn tham gia lại một cách tự động."
 
-#: ../finch/gntconv.c:144
 msgid "No such command."
 msgstr "Không có lệnh như vậy."
 
-#: ../finch/gntconv.c:148
-#: ../pidgin/gtkconv.c:482
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Lỗi cú pháp: bạn đã gõ sai số đối số của lệnh đó."
 
-#: ../finch/gntconv.c:153
-#: ../pidgin/gtkconv.c:488
 msgid "Your command failed for an unknown reason."
 msgstr "Lệnh của bạn bị lỗi do một nguyên nhân chưa xác định."
 
-#: ../finch/gntconv.c:158
-#: ../pidgin/gtkconv.c:495
 msgid "That command only works in chats, not IMs."
 msgstr "Lệnh đó chỉ có tác dụng trong chát, không có trong tin nhắn nhanh."
 
-#: ../finch/gntconv.c:161
-#: ../pidgin/gtkconv.c:498
 msgid "That command only works in IMs, not chats."
 msgstr "Lệnh đó chỉ có tác dụng trong tin nhắn nhah, không có trong chát."
 
-#: ../finch/gntconv.c:165
-#: ../pidgin/gtkconv.c:503
 msgid "That command doesn't work on this protocol."
 msgstr "Lệnh đó không có tác dụng trong giao thức này."
 
-#: ../finch/gntconv.c:173
 msgid "Message was not sent, because you are not signed on."
 msgstr "Tin nhẳn chưa gửi đi được vì bạn chưa đăng nhập."
 
-#: ../finch/gntconv.c:252
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:275
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:280
-#: ../finch/gntconv.c:812
-#: ../pidgin/gtkconv.c:3444
 #, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr "\n"
+msgstr ""
+"\n"
 "%s đang gõ phím..."
 
-#: ../finch/gntconv.c:299
 msgid "You have left this chat."
 msgstr "Bạn đã rời cuộc chat này."
 
-#: ../finch/gntconv.c:415
-#: ../pidgin/gtkconv.c:1371
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Đã mở ghi lưu. Sắp tới, những thông điệp trong cuộc trao đổi này sẽ được ghi lại."
+msgstr ""
+"Đã mở ghi lưu. Sắp tới, những thông điệp trong cuộc trao đổi này sẽ được ghi "
+"lại."
 
-#: ../finch/gntconv.c:421
-#: ../pidgin/gtkconv.c:1379
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Ngừng ghi lưu. Sắp tới, những thông điệp trong cuộc trao đổi này sẽ không được ghi lại."
+msgstr ""
+"Ngừng ghi lưu. Sắp tới, những thông điệp trong cuộc trao đổi này sẽ không "
+"được ghi lại."
 
-#: ../finch/gntconv.c:470
 msgid "Send To"
 msgstr "Gửi cho"
 
-#: ../finch/gntconv.c:514
+msgid "Invite message"
+msgstr "Lời mời"
+
+msgid "Invite"
+msgstr "Mời"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Hãy nhập tên người dùng mà bạn muốn mời,\n"
+"kèm theo lời mời tùy ý."
+
 msgid "Conversation"
 msgstr "Cuộc thoại"
 
-#: ../finch/gntconv.c:520
 msgid "Clear Scrollback"
 msgstr "Gột vùng cuộn ngược"
 
-#: ../finch/gntconv.c:524
-#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Hiện nhãn thời gian"
 
-#: ../finch/gntconv.c:540
 msgid "Add Buddy Pounce..."
 msgstr "Thêm thông báo bạn thân..."
 
-#: ../finch/gntconv.c:555
+msgid "Invite..."
+msgstr "Mời..."
+
 msgid "Enable Logging"
 msgstr "Bật theo dõi"
 
-#: ../finch/gntconv.c:561
 msgid "Enable Sounds"
 msgstr "Bật âm thanh"
 
-#: ../finch/gntconv.c:769
 msgid "<AUTO-REPLY> "
-msgstr "<Trả Lời-Tự Động> "
+msgstr "<TỰ_ĐỘNG_ĐÁP_ỨNG>"
 
-#.Print the list of users in the room
-#: ../finch/gntconv.c:900
-msgid "List of users:\n"
-msgstr "Danh sách người dùng:\n"
+#, fuzzy, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Danh sách người dùng:\n"
 
-#: ../finch/gntconv.c:1062
-#: ../pidgin/gtkconv.c:334
 msgid "Supported debug options are:  version"
 msgstr "Tùy chọn gỡ lỗi được hỗ trợ : phiên bản"
 
-#: ../finch/gntconv.c:1098
-#: ../pidgin/gtkconv.c:386
 msgid "No such command (in this context)."
 msgstr "Không có lệnh nào như vậy (trong ngữ cảnh này)."
 
-#: ../finch/gntconv.c:1101
-#: ../pidgin/gtkconv.c:389
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
-msgstr "Dùng « /help &lt;lệnh&gt; » để được hổ trợ về lệnh đó.\n"
+msgstr ""
+"Dùng « /help &lt;lệnh&gt; » để được hổ trợ về lệnh đó.\n"
 "Những lệnh dưới đây có thể dùng trong ngữ cảnh này:\n"
 
-#: ../finch/gntconv.c:1174
-#: ../pidgin/gtkconv.c:7835
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s không phải là một hạng thông điệp hợp lệ. Xem « /help msgcolor » để xem "
+"một danh sách các hạng thông điệp hợp lệ."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s không phải là một màu hợp lệ. Xem « /help msgcolor » để xem một danh sách "
+"các màu sắc hợp lệ."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
-msgstr "say &lt;thông điệp&gt;:  Gửi một thông điệp theo cách thông thường như thể là bạn không dùng câu lệnh."
+msgstr ""
+"say &lt;thông điệp&gt;:  Gửi một thông điệp theo cách thông thường như thể "
+"là bạn không dùng câu lệnh."
 
-#: ../finch/gntconv.c:1177
-#: ../pidgin/gtkconv.c:7838
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;hành động&gt;: Gởi một hoạt động kiểu IRC đến bạn thân hay chát."
+msgstr ""
+"me &lt;hành động&gt;: Gởi một hoạt động kiểu IRC đến bạn thân hay chát."
 
-#: ../finch/gntconv.c:1180
-#: ../pidgin/gtkconv.c:7841
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;tùy chọn&gt;:  gửi thông tin gỡ lỗi khác nhau cho cuộc thoại hiện tại."
+msgstr ""
+"debug &lt;tùy chọn&gt;:  gửi thông tin gỡ lỗi khác nhau cho cuộc thoại hiện "
+"tại."
 
-#: ../finch/gntconv.c:1183
-#: ../pidgin/gtkconv.c:7844
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: gột vùng cuộn ngược trong cuộc thoại."
 
-#: ../finch/gntconv.c:1186
-#: ../pidgin/gtkconv.c:7850
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;lệnh&gt;:  được trợ giúp về lệnh này."
 
-#: ../finch/gntconv.c:1189
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  hiển thị danh sách các người dùng tham gia cuộc chát này."
 
-#: ../finch/gntconv.c:1194
 msgid "plugins: Show the plugins window."
 msgstr "plugins: hiện cửa sổ phần bổ sung."
 
-#: ../finch/gntconv.c:1197
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: hiển thị danh sách bạn bè."
 
-#: ../finch/gntconv.c:1200
 msgid "accounts: Show the accounts window."
 msgstr "accounts: hiển thị cửa sổ tài khoản."
 
-#: ../finch/gntconv.c:1203
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: hiển thị cửa sổ gỡ lỗi."
 
-#: ../finch/gntconv.c:1206
 msgid "prefs: Show the preference window."
 msgstr "prefs: hiển thị cửa sổ Tùy thích."
 
-#: ../finch/gntconv.c:1209
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: hiển thị cửa sổ Trạng thái đã lưu."
 
-#: ../finch/gntdebug.c:231
-#: ../pidgin/gtkconv.c:938
-#: ../pidgin/gtkconv.c:2618
-#: ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;hạng&gt; &lt;chữ&gt; &lt;nền&gt;: Đặt màu cho các hạng tin nhẳn "
+"khác nhau trong cửa sổ cuộc trao đổi.<br>    &lt;hạng&gt;: receive (nhận), "
+"send (gửi), highlight (tô sáng), action (hành vi), timestamp (ghi giờ)"
+"<br>&lt;chữ/nền&gt;: black (đen), red (đỏ), green (lục), blue (xanh), white "
+"(trắng), gray (xám), darkgray (xám thẫm), magenta (đỏ tươi), cyan (xanh lá "
+"mạ), default (mặc định)<br><br>VÍ DỤ :<br>    msgcolor send cyan default"
+
 msgid "Unable to open file."
 msgstr "Không thể mở tập tin."
 
-#: ../finch/gntdebug.c:271
-#: ../finch/gntui.c:86
-#: ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Cửa sổ gỡ lỗi"
 
-#.XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
-#.* 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.
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * 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:292
-#: ../pidgin/gtkdebug.c:754
 msgid "Clear"
-msgstr "Gột"
+msgstr "Dọn"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Lọc:"
 
-#: ../finch/gntdebug.c:309
-#: ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Tạm dừng"
 
-#: ../finch/gntft.c:118
-#: ../pidgin/gtkft.c:229
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Truyền tập tin - %d%% trên %d tập tin"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Truyền tập tin - %d%% của %d tập tin"
 
-#.Create the window.
-#: ../finch/gntft.c:123
-#: ../finch/gntft.c:196
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234
-#: ../pidgin/gtkft.c:761
+#. Create the window.
 msgid "File Transfers"
 msgstr "Truyền tập tin"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Tiến hành"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Tên tập tin"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:659
 msgid "Size"
-msgstr "Cỡ"
+msgstr "Kích cỡ"
 
-#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Tốc độ"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Còn lại"
 
-#.XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201
-#: ../finch/gntstatus.c:547
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:380
-#: ../libpurple/protocols/gg/gg.c:1041
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1553
-#: ../libpurple/protocols/msn/msn.c:621
-#: ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636
-#: ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2705
-#: ../libpurple/protocols/oscar/oscar.c:3761
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3260
-#: ../pidgin/gtkblist.c:3250
-#: ../pidgin/gtkblist.c:3264
-#: ../pidgin/gtkblist.c:3266
-#: ../pidgin/gtksavedstatuses.c:988
-#: ../pidgin/gtksavedstatuses.c:1133
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
 msgid "Status"
 msgstr "Trạng thái"
 
-#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Đóng cửa sổ này khi mọi tập tin đã được truyền"
 
-#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Gột các việc truyền tập tin hoàn toàn"
 
-#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Dừng"
 
-#: ../finch/gntft.c:305
-#: ../pidgin/gtkft.c:169
-#: ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Đợi bắt đầu truyền"
 
-#: ../finch/gntft.c:372
-#: ../pidgin/gtkft.c:166
-#: ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Bị thôi"
 
-#: ../finch/gntft.c:374
-#: ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Bị lỗi"
 
-#: ../finch/gntft.c:420
-#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+msgid "Sent"
+msgstr "Đã gửi"
+
+msgid "Received"
+msgstr "Đã nhận"
+
+msgid "Finished"
+msgstr "Hoàn tất"
+
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Tập tin đã được lưu dạng %s."
 
-#: ../finch/gntft.c:432
-#: ../finch/gntft.c:433
-#: ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1077
-msgid "Finished"
-msgstr "Hoàn tất"
+msgid "Sending"
+msgstr "Đang gửi"
 
-#: ../finch/gntft.c:437
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:357
-msgid "Transferring"
-msgstr "Đang truyền"
+msgid "Receiving"
+msgstr "Đang nhận"
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Cuộc thoại trong %s trên %s"
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Cuộc thoại với %s trên %s"
+
+msgid "%B %Y"
+msgstr "%B %Y"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Các dữ kiện của hệ thống sẽ chỉ được ghi lại nếu mục « Ghi lại mọi thay đổi "
+"trong trạng thái vào bản ghi của hệ thống » đã bật."
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Tin nhắn sẽ chỉ được ghi lại nếu mục « Ghi lại tất cả tin nhắn » đã bật."
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Các cuộc trò chuyện sẽ chỉ được ghi lại nếu mục « Ghi lại tất cả các cuộc trò "
+"chuyện » đã bật."
+
+msgid "No logs were found"
+msgstr "Không tìm thấy sổ theo dõi"
+
+msgid "Total log size:"
+msgstr "Tổng kích cỡ sổ theo dõi:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "Cuộn/Tìm:"
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "Cuộc trao đổi trong %s"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "Cuộc trao đổi với %s"
+
+msgid "All Conversations"
+msgstr "Mọi cuộc trao đổi"
+
+msgid "System Log"
+msgstr "Sổ theo dõi hệ thống"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Thư điện tử"
 
-#: ../finch/gntnotify.c:171
-#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Bạn có thư mới !"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:521
 msgid "Sender"
 msgstr "Người gửi"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:528
 msgid "Subject"
 msgstr "Chủ đề"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) có %d tin nhẳn mới."
 
-#: ../finch/gntnotify.c:226
-#: ../pidgin/gtknotify.c:344
 msgid "New Mail"
 msgstr "Thư mới"
 
-#: ../finch/gntnotify.c:291
-#: ../pidgin/gtknotify.c:955
 #, c-format
 msgid "Info for %s"
 msgstr "Thông tin cho %s"
 
-#: ../finch/gntnotify.c:292
-#: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:956
 msgid "Buddy Information"
 msgstr "Thông tin bạn thân"
 
-#: ../finch/gntnotify.c:382
-#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: ../finch/gntnotify.c:391
-#: ../pidgin/gtkconv.c:1605
 msgid "IM"
 msgstr "Tin nhắn"
 
-#: ../finch/gntnotify.c:397
-#: ../libpurple/protocols/sametime/sametime.c:3515
-msgid "Invite"
-msgstr "Mời"
-
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(không có)"
 
-#: ../finch/gntplugin.c:84
-#: ../finch/gntplugin.c:93
+msgid "URI"
+msgstr "URI"
+
 msgid "ERROR"
 msgstr "LỖI"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "lỗi nạp phần bổ sung"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "lỗi bỏ nạp phần bổ sung"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1465,1077 +937,767 @@ msgid ""
 "Author: %s\n"
 "Website: %s\n"
 "Filename: %s\n"
-msgstr "Tên: %s\n"
+msgstr ""
+"Tên: %s\n"
 "Phiên bản: %s\n"
 "Mô tả: %s\n"
 "Tác giả: %s\n"
 "Địa chỉ Web: %s\n"
 "Tên tập tin: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Phần bổ sung cần phải được nạp trước khi cấu hình."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Không có tùy chọn cấu hình cho phần bổ sung này."
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Lỗi nạp phần bổ sung"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "Tập tin đã chọn không phải là phần bổ sung hợp lệ."
 
-#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr "Hãy mở cửa sổ gỡ lỗi rồi thử lại để xem thông điệp lỗi chính xác."
 
-#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "Chọn phần bổ sung cần cài đặt"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Bạn có thể (bỏ) nạp phần bổ sung trong danh sách này."
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Cài đặt phần bổ sung..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Cấu hình phần bổ sung"
 
-#.copy the preferences to tmp values...
-#.* I liked "take affect immediately" Oh well :-(
-#.(that should have been "effect," right?)
-#.Back to instant-apply! I win!  BU-HAHAHA!
-#.Create the window
-#: ../finch/gntplugin.c:524
-#: ../finch/gntplugin.c:531
-#: ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90
-#: ../pidgin/gtkdocklet.c:717
-#: ../pidgin/gtkprefs.c:2168
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
 msgid "Preferences"
 msgstr "Tùy thích"
 
-#: ../finch/gntpounce.c:194
-#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Hãy nhập một bạn thân để thông báo."
 
-#: ../finch/gntpounce.c:339
-#: ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Thông báo bạn thân mới"
 
-#: ../finch/gntpounce.c:339
-#: ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Sửa thông báo bạn thân"
 
-#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Thông báo cho ai"
 
-#.Account:
-#: ../finch/gntpounce.c:347
-#: ../finch/gntstatus.c:456
+#. Account:
 msgid "Account:"
 msgstr "Tài khoản:"
 
-#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Tên buddy:"
 
-#.Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387
-#: ../pidgin/gtkpounce.c:592
+#. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
 msgstr "Thông báo khi bạn thân..."
 
-#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "Đăng nhập"
 
-#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "Đăng xuất"
 
-#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "Đi vắng"
 
-#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "Có mặt trở lại"
 
-#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "Đã rơi vào trạng thái nghỉ"
 
-#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "Hoạt động trở lại."
 
-#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Bắt đầu gõ phím"
 
-#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "Tạm dừng khi gõ phím"
 
-#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "Ngừng gõ phím"
 
-#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "Gửi thông điệp"
 
-#.Create the "Action" frame.
-#: ../finch/gntpounce.c:427
-#: ../pidgin/gtkpounce.c:653
+#. Create the "Action" frame.
 msgid "Action"
 msgstr "Hành động"
 
-#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "Mở cửa sổ Nhắn Tin"
 
-#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Tự mở thông báo"
 
-#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Gửi tin nhẳn"
 
-#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "Thực thi lệnh"
 
-#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Chơi âm thanh"
 
-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
-msgstr "Thông báo chỉ khi trạng thái của tôi không công bố"
+msgid "Pounce only when my status is not Available"
+msgstr "Thông báo chỉ khi trạng thái của tôi không phải « Có mặt »"
 
-#: ../finch/gntpounce.c:463
-#: ../pidgin/gtkpounce.c:1293
 msgid "Recurring"
 msgstr "Lặp lại"
 
-#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
 msgstr "Không thể tạo thông báo"
 
-#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr "Bạn không có tài khoản."
 
-#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr "Trước tiên bạn cần phải tạo một tài khoản, để tạo thông báo."
 
-#: ../finch/gntpounce.c:675
-#: ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Bạn chắc chắn muốn xoá thông báo trên %s cho %s không?"
 
-#: ../finch/gntpounce.c:709
-#: ../finch/gntui.c:84
-#: ../pidgin/gtkpounce.c:1336
 msgid "Buddy Pounces"
 msgstr "Thông báo bạn thân"
 
-#: ../finch/gntpounce.c:823
-#: ../pidgin/gtkpounce.c:1435
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s đã bắt đầu gõ tin nhẳn cho bạn (%s)"
 
-#: ../finch/gntpounce.c:825
-#: ../pidgin/gtkpounce.c:1437
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s đã tạm dừng khi gõ tin nhẳn cho bạn (%s)"
 
-#: ../finch/gntpounce.c:827
-#: ../pidgin/gtkpounce.c:1439
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s đã đăng nhập (%s)"
 
-#: ../finch/gntpounce.c:829
-#: ../pidgin/gtkpounce.c:1441
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s hoạt động trở lại từ trạng thái nghỉ (%s)"
 
-#: ../finch/gntpounce.c:831
-#: ../pidgin/gtkpounce.c:1443
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s đã có mặt trở lại (%s)"
 
-#: ../finch/gntpounce.c:833
-#: ../pidgin/gtkpounce.c:1445
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s đã ngừng gõ tin nhẳn cho bạn (%s)"
 
-#: ../finch/gntpounce.c:835
-#: ../pidgin/gtkpounce.c:1447
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s đã đăng xuất (%s)"
 
-#: ../finch/gntpounce.c:837
-#: ../pidgin/gtkpounce.c:1449
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s đã rơi vào trạng thái nghỉ (%s)"
 
-#: ../finch/gntpounce.c:839
-#: ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s đã đi vắng. (%s)"
 
-#: ../finch/gntpounce.c:841
-#: ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s đã gửi tin nhẳn cho bạn. (%s)"
 
-#: ../finch/gntpounce.c:842
-#: ../pidgin/gtkpounce.c:1454
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Dữ kiện thông báo không rõ. Hãy ghi báo cáo việc này!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Dựa vào cách sử dụng bàn phím"
 
-#: ../finch/gntprefs.c:94
-#: ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "Từ tin nhẳn đã gửi cuối"
 
-#: ../finch/gntprefs.c:96
-#: ../pidgin/gtkprefs.c:899
-#: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:2030
-#: ../pidgin/gtkprefs.c:2044
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Hiện thời gian nghỉ"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Hiển thị bạn bè ngoại tuyến"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Thông báo bạn thân mà bạn đang gõ tin nhẳn cho họ"
 
-#: ../finch/gntprefs.c:198
-#: ../finch/plugins/gnthistory.c:156
 msgid "Log format"
 msgstr "Định dạng sổ theo dõi"
 
-#: ../finch/gntprefs.c:199
-#: ../finch/plugins/gnthistory.c:146
 msgid "Log IMs"
 msgstr "Theo dõi tin nhắn"
 
-#: ../finch/gntprefs.c:200
-#: ../finch/plugins/gnthistory.c:147
 msgid "Log chats"
 msgstr "Theo dõi chát"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Theo dõi tất cả những thay đổi trạng thái"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Thông báo thời gian nghỉ"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Thay đổi trạng thái khi nghỉ"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Số phút trước khi thay đổi trạng thái"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Đổi trạng thái thành"
 
-#.Conversations
-#: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:994
-#: ../pidgin/gtkprefs.c:2135
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#. Conversations
 msgid "Conversations"
 msgstr "Cuộc thoại"
 
-#: ../finch/gntprefs.c:260
-#: ../finch/plugins/gnthistory.c:154
-#: ../pidgin/gtkprefs.c:1563
-#: ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "Theo dõi"
 
-#: ../finch/gntrequest.c:614
+msgid "You must fill all the required fields."
+msgstr "Bạn cần phải điền vào mỗi trường đòi hỏi."
+
+msgid "The required fields are underlined."
+msgstr "Những trường sau có gạch dưới."
+
 msgid "Not implemented yet."
 msgstr "Chưa được thi hành."
 
-#: ../finch/gntrequest.c:719
-#: ../pidgin/gtkrequest.c:1545
-#: ../pidgin/gtkrequest.c:1591
 msgid "Save File..."
 msgstr "Lưu tập tin..."
 
-#: ../finch/gntrequest.c:719
-#: ../pidgin/gtkrequest.c:1546
-#: ../pidgin/gtkrequest.c:1592
 msgid "Open File..."
 msgstr "Mở tập tin..."
 
-#: ../finch/gntrequest.c:736
 msgid "Choose Location..."
 msgstr "Chọn địa chỉ..."
 
-#: ../finch/gntsound.c:97
-#: ../pidgin/gtksound.c:62
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Bấm phím Enter để tìm thêm phóng cùng phân loại."
+
+msgid "Get"
+msgstr "Lấy"
+
+#. Create the window.
+msgid "Room List"
+msgstr "Danh sách phòng"
+
 msgid "Buddy logs in"
 msgstr "Bạn thân đăng nhập"
 
-#: ../finch/gntsound.c:98
-#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Bạn thân đăng xuất"
 
-#: ../finch/gntsound.c:99
-#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Nhận tin nhẳn"
 
-#: ../finch/gntsound.c:100
-#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Nhận tin nhẳn thì khởi đầu cuộc thoại"
 
-#: ../finch/gntsound.c:101
-#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Gửi tin nhẳn"
 
-#: ../finch/gntsound.c:102
-#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Người vào phòng chat"
 
-#: ../finch/gntsound.c:103
-#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Người rời phòng chat"
 
-#: ../finch/gntsound.c:104
-#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Bạn nói trong chat"
 
-#: ../finch/gntsound.c:105
-#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Người khác nói trong chat"
 
-#: ../finch/gntsound.c:107
-#: ../pidgin/gtksound.c:73
-msgid "Someone says your screen name in chat"
-msgstr "Ai đó nói tên hiển thị của bạn trong chat"
+msgid "Someone says your username in chat"
+msgstr "Ai đó nói tên bạn trong chát"
 
-#: ../finch/gntsound.c:361
-#: ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "Lỗi GStreamer"
 
-#: ../finch/gntsound.c:362
-#: ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer không khởi tạo được."
 
-#: ../finch/gntsound.c:716
-#: ../finch/gntsound.c:802
-#: ../pidgin/gtkprefs.c:1687
-#: ../pidgin/gtkprefs.c:1776
-#: ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(mặc định)"
 
-#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr "Chọn tập tin âm thanh..."
 
-#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "Tùy thích âm thanh"
 
-#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Lý lịch"
 
-#: ../finch/gntsound.c:954
-#: ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "Tự động"
 
-#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr "Tiếng bíp bàn giao tiếp"
 
-#: ../finch/gntsound.c:958
-#: ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "Lệnh"
 
-#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "Không có âm thanh"
 
-#: ../finch/gntsound.c:961
-#: ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "Phương pháp âm thanh"
 
-#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "Phương pháp: "
 
-#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
-msgstr "Lệnh âm thanh:\n"
+msgstr ""
+"Lệnh âm thanh:\n"
 "(%s cho tên tập tin)"
 
-#.Sound options
-#: ../finch/gntsound.c:981
-#: ../pidgin/gtkprefs.c:1856
+#. Sound options
 msgid "Sound Options"
 msgstr "Tùy chọn âm thanh"
 
-#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr "Âm thanh khi cửa sổ cuộc thoại được chú ý"
 
-#: ../finch/gntsound.c:990
-#: ../pidgin/gtkprefs.c:897
-#: ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1863
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Luôn luôn"
 
-#: ../finch/gntsound.c:991
-#: ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "Chỉ khi sẵn sàng"
 
-#: ../finch/gntsound.c:992
-#: ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "Chỉ khi không sẵn sàng"
 
-#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Âm lượng(0-100):"
 
-#.Sound events
-#: ../finch/gntsound.c:1018
-#: ../pidgin/gtkprefs.c:1898
+#. Sound events
 msgid "Sound Events"
 msgstr "Dữ kiện âm thanh"
 
-#: ../finch/gntsound.c:1020
-#: ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Dữ kiện"
 
-#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "Tập tin"
 
-#: ../finch/gntsound.c:1039
-#: ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Thử"
 
-#: ../finch/gntsound.c:1042
-#: ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Đặt lại"
 
-#: ../finch/gntsound.c:1045
-#: ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Chọn..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Bạn chắc chắn muốn xoá « %s » không?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Xoá trạng thái"
 
-#: ../finch/gntstatus.c:176
-#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Trạng thái đã lưu"
 
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1361
-#: ../libpurple/protocols/msn/msn.c:725
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Tên"
 
-#: ../finch/gntstatus.c:183
-#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Kiểu"
 
-#.Statuses are almost all the same. Define a macro to reduce code repetition.
-#.PurpleStatusPrimitive
-#.id - use default
-#.name - use default
-#.savable
-#.user_settable
-#.not independent
-#.Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:564
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:292
-#: ../libpurple/protocols/bonjour/bonjour.c:299
-#: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/gg/gg.c:1079
-#: ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605
-#: ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621
-#: ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635
-#: ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1599
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/jabber.c:1641
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/msn/msn.c:677
-#: ../libpurple/protocols/msn/msn.c:683
-#: ../libpurple/protocols/msn/msn.c:689
-#: ../libpurple/protocols/msn/msn.c:695
-#: ../libpurple/protocols/msn/msn.c:700
-#: ../libpurple/protocols/msn/msn.c:705
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5579
-#: ../libpurple/protocols/oscar/oscar.c:5797
-#: ../libpurple/protocols/oscar/oscar.c:5811
-#: ../libpurple/protocols/oscar/oscar.c:5827
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5841
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526
-#: ../pidgin/gtksavedstatuses.c:999
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
 msgid "Message"
 msgstr "Thông điệp"
 
-#.Use
-#: ../finch/gntstatus.c:194
-#: ../finch/gntstatus.c:593
+#. Use
 msgid "Use"
 msgstr "Dùng"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Tựa đề không hợp lệ"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Hãy nhập tựa đề không rỗng cho trạng thái."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Tựa đề trùng"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Hãy nhập tựa đề khác cho trạng thái."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Trạng thái phụ"
 
-#: ../finch/gntstatus.c:464
-#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Trạng thái:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Thông điệp:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Sửa trạng thái"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Dùng trạng thái khác cho các tài khoản theo đây"
 
-#.Save & Use
-#: ../finch/gntstatus.c:604
+#. Save & Use
 msgid "Save & Use"
 msgstr "Lưu và Dùng"
 
-#: ../finch/gntui.c:85
 msgid "Certificates"
 msgstr "Chứng nhận"
 
-#: ../finch/gntui.c:89
-#: ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Âm thanh"
 
-#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Trạng thái"
 
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Lỗi nạp phần bổ sung."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Không tìm thấy bộ trình bày X"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Không tìm thấy cửa sổ"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "Phần bổ sung này không nạp được khi nó không phải được xây dựng với khả năng hỗ trợ X11."
+msgstr ""
+"Phần bổ sung này không nạp được khi nó không phải được xây dựng với khả năng "
+"hỗ trợ X11."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Phần bổ sung bảng nháp"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr "Khi nội dung thay đổi trên bảng nháp Gnt, nội dung sẵn sàng cho X, nếu có thể."
+msgstr ""
+"Khi nội dung thay đổi trên bảng nháp Gnt, nội dung sẵn sàng cho X, nếu có "
+"thể."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s mới đăng nhập"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s mới đăng xuất"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s mới gửi tin nhẳn cho bạn"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s mới nói tên hiệu của bạn trong %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s đã gửi tin nhẳn trong %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Bạn thân đăng nhập/xuất"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Bạn nhận tin nhắn"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Ai đó nói trong chát"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Ai đó nói tên bạn trong chát"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Thông báo với lò nướng bánh khi"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Cũng kêu bíp."
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Đặt KHẨN cho cửa sổ thiết bị cuối."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Phần bổ sung lò nướng bánh"
 
-#: ../finch/plugins/gnthistory.c:117
-#: ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Cuộc thoại với %s trên %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:175
-#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Phần bổ sung lịch sử cần thiết khả năng theo dõi"
 
-#: ../finch/plugins/gnthistory.c:176
-#: ../pidgin/plugins/history.c:154
 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)."
-msgstr "Khả năng theo dõi có thể được hiệu lực từ Công cụ > Tùy thích > Theo dõi.\n"
+msgstr ""
+"Khả năng theo dõi có thể được hiệu lực từ Công cụ > Tùy thích > Theo dõi.\n"
 "\n"
 "HIệu lực ghi lưu các tin nhắn và/hay cuộc trò chuyện sẽ kích hoạt lịch sử "
 "cho các cuộc thoại cùng kiểu."
 
 # Name: don't translate/Tên: đừng dịch
-#: ../finch/plugins/gnthistory.c:220
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:222
-#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Hiển thị các cuộc trao đổi vừa ghi lưu trong cửa sồ trao đổi mới."
 
-#: ../finch/plugins/gnthistory.c:223
-#: ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
-msgstr "Khi bắt đầu cuộc thoại mới, phần bổ sung này sẽ chèn cuộc thoại cuối cùng vào cuộc thoại hiện thời."
+msgstr ""
+"Khi bắt đầu cuộc thoại mới, phần bổ sung này sẽ chèn cuộc thoại cuối cùng "
+"vào cuộc thoại hiện thời."
+
+#, c-format
+msgid "Online"
+msgstr "Trực tuyến"
+
+msgid "Offline"
+msgstr "Ngoại tuyến"
+
+msgid "Online Buddies"
+msgstr "Bạn thân trực tuyến"
+
+msgid "Offline Buddies"
+msgstr "Bạn thân ngoại tuyến"
+
+msgid "Online/Offline"
+msgstr "Trực/Ngoại tuyến"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+msgid "No Grouping"
+msgstr "Không theo nhóm"
+
+msgid "Provides alternate buddylist grouping options."
+msgstr "Cung cấp thêm tùy chọn nhóm lại danh sách bạn thân."
 
 # Name: don't translate/Tên: đừng dịch
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#.Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
+#. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: tìm kiếm một chuỗi con trong phần hoãn."
 
 # Name: don't translate/Tên: đừng dịch
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124
-#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Phần bổ sung lastlog."
 
-#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "tài khoản"
 
-#: ../libpurple/account.c:1061
-#: ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Mật khẩu cần thiết để đăng nhập."
 
-#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Nhập mật khẩu cho %s (%s)"
 
-#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
-#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "Lưu mật khẩu"
 
-#: ../libpurple/account.c:1142
-#: ../libpurple/connection.c:107
-#: ../libpurple/connection.c:180
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Thiếu phần bổ sung giao thức cho %s"
 
-#: ../libpurple/account.c:1144
-#: ../libpurple/connection.c:110
 msgid "Connection Error"
 msgstr "Lỗi kết nối"
 
-#: ../libpurple/account.c:1341
-#: ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "New passwords do not match."
 msgstr "Sai khớp hai mật khẩu mới."
 
-#: ../libpurple/account.c:1350
 msgid "Fill out all fields completely."
 msgstr "Điền hoàn chỉnh các trường."
 
-#: ../libpurple/account.c:1373
 msgid "Original password"
 msgstr "Mật khẩu cũ"
 
-#: ../libpurple/account.c:1380
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: ../libpurple/account.c:1387
 msgid "New password (again)"
 msgstr "Nhập lại mật khẩu mới"
 
-#: ../libpurple/account.c:1393
 #, c-format
 msgid "Change password for %s"
 msgstr "Đổi mật khẩu cho %s"
 
-#: ../libpurple/account.c:1401
 msgid "Please enter your current password and your new password."
 msgstr "Hãy nhập mật khẩu hiện tại và mật khẩu mới của bạn."
 
-#: ../libpurple/account.c:1432
 #, c-format
 msgid "Change user information for %s"
 msgstr "Đổi thông tin người dùng cho %s"
 
-#: ../libpurple/account.c:1435
-#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Lập thông tin người dùng"
 
-#: ../libpurple/account.c:1906
-#: ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2032
-#: ../libpurple/protocols/jabber/buddy.c:2049
-#: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/qq/qq.c:233
-#: ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531
-#: ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3301
-#: ../pidgin/gtkblist.c:6050
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Bạn bè"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "danh sách bạn bè"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(KHÔNG KHỚP)"
 
-#.Make messages
-#: ../libpurple/certificate.c:562
+#. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s đã cung cấp chứng nhận theo đây để sử dụng chỉ một lần bây giờ :"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
-msgstr "Tên chung: %s %s\n"
+msgstr ""
+"Tên chung: %s %s\n"
 "Vân tay (SHA1): %s"
 
-#.TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
+#. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
 msgstr "Thẩm tra chứng nhận dùng một lần"
 
-#.Scheme name
-#.Pool name
-#: ../libpurple/certificate.c:894
+#. Scheme name
+#. Pool name
 msgid "Certificate Authorities"
 msgstr "Nhà cầm quyền chứng nhận"
 
-#.Scheme name
-#.Pool name
-#: ../libpurple/certificate.c:1062
+#. Scheme name
+#. Pool name
 msgid "SSL Peers Cache"
 msgstr "Bộ nhớ tạm đồng đẳng SSL"
 
-#.Make messages
-#: ../libpurple/certificate.c:1193
+#. Make messages
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Chấp nhận chứng nhận cho %s không?"
 
-#.TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
+#. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
 msgstr "Thẩm tra chứng nhận SSL"
 
-#.Number of actions
-#: ../libpurple/certificate.c:1208
+#. Number of actions
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: ../libpurple/certificate.c:1209
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Từ chối"
 
-#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Xem chứng nhận..."
 
-#.Prompt the user to authenticate the certificate
-#.TODO: Provide the user with more guidance about why he is
-#.being prompted
-#.vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1310
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr "« %s » cung cấp một chứng nhận có vẻ là theo dạng « %s » thay thế. Có thể nghĩa là bạn không phải có kết nối đến dịch vụ bạn tin là đó."
-
-#.Prompt the user to authenticate the certificate
-#.vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1335
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
-msgstr "« %s » cung cấp một chứng nhận tự ký. Không thể tự động kiểm tra chứng nhận như vậy."
+msgstr ""
+"« %s » cung cấp một chứng nhận tự ký. Không thể tự động kiểm tra chứng nhận "
+"như vậy."
 
-#: ../libpurple/certificate.c:1353
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Dãy chứng nhận được cung cấp cho %s không phải là hợp lệ."
 
-#.TODO: Make this error either block the ensuing SSL
-#.connection error until the user dismisses this one, or
-#.stifle it.
-#.TODO: Probably wrong.
-#.TODO: Probably wrong
-#: ../libpurple/certificate.c:1361
-#: ../libpurple/certificate.c:1431
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
 msgid "SSL Certificate Error"
 msgstr "Lỗi chứng nhận SSL"
 
-#: ../libpurple/certificate.c:1362
 msgid "Invalid certificate chain"
 msgstr "Dãy chứng nhận không hợp lệ"
 
-#.vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1383
+#. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr "Bạn không có cơ sở dữ liệu chứng nhận gốc nên không thể thẩm tra chứng nhận này."
+msgstr ""
+"Bạn không có cơ sở dữ liệu chứng nhận gốc nên không thể thẩm tra chứng nhận "
+"này."
 
-#.vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1406
+#. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "Pidgin không nhận ra chứng nhận gốc có vẻ đã cấp chứng nhận này."
 
-#: ../libpurple/certificate.c:1423
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
-msgstr "%s đã cung cấp một dãy chứng nhận không có chữ ký số hợp lệ từ Nhà cầm quyền chứng nhận từ đó nó tuyên bố có chữ ký."
+msgstr ""
+"%s đã cung cấp một dãy chứng nhận không có chữ ký số hợp lệ từ Nhà cầm quyền "
+"chứng nhận từ đó nó tuyên bố có chữ ký."
 
-#: ../libpurple/certificate.c:1432
 msgid "Invalid certificate authority signature"
 msgstr "Chữ ký nhà cầm quyền chứng nhận không hợp lệ"
 
-#.Make messages
-#: ../libpurple/certificate.c:1891
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"« %s » cung cấp một chứng nhận có vẻ là theo dạng « %s » thay thế. Có thể "
+"nghĩa là bạn không phải có kết nối đến dịch vụ bạn tin là đó."
+
+#. Make messages
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2544,5093 +1706,3589 @@ msgid ""
 "\n"
 "Activation date: %s\n"
 "Expiration date: %s\n"
-msgstr "Tên chung: %s\n"
+msgstr ""
+"Tên chung: %s\n"
 "\n"
 "Vân tay (SHA1): %s\n"
 "\n"
 "Ngày kích hoạt: %s\n"
 "Ngày hết hạn: %s\n"
 
-#.TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1900
+#. TODO: Find what the handle ought to be
 msgid "Certificate Information"
 msgstr "Thông tin chứng nhận"
 
-#: ../libpurple/connection.c:109
 msgid "Registration Error"
 msgstr "Lỗi đăng ký"
 
-#: ../libpurple/connection.c:182
 msgid "Unregistration Error"
 msgstr "Lỗi hủy đăng ký"
 
-#: ../libpurple/connection.c:336
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s đã đăng nhập"
 
-#: ../libpurple/connection.c:366
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s đã đăng xuất"
 
-#: ../libpurple/connection.c:511
-#: ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2352
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:378
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Không thể gửi tin nhẳn vì nó quá lớn."
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Không thể gửi tin nhẳn cho %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Tin nhẳn quá lớn."
 
-#: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:272
-#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "Không thể gửi tin nhẳn."
 
-#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Gửi tin nhẳn"
 
-#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Gửi tin nhẳn"
 
-#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s vào phòng."
 
-#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] vào phòng."
 
-#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Bạn bây giờ đổi là %s"
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s bây giờ đổi là %s"
 
-#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s rời phòng."
 
-#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s rời phòng (%s)."
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Không lấy được kết nối: %s"
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Không lấy được tên: %s"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Không lấy được tên máy phục vụ : %s"
 
-#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Máy phục vụ D-BUS của Purple không đang chạy, vì lý do bên dưới"
 
-#: ../libpurple/desktopitem.c:287
-#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Không tên"
 
-#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "Không thể tạo tiến trình giải quyết mới\n"
 
-#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "Không thể gửi yêu cầu cho tiến trình giải quyết\n"
 
-#: ../libpurple/dnsquery.c:549
-#: ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
-msgstr "Lỗi giải quyết %s:\n"
+msgstr ""
+"Lỗi giải quyết %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552
-#: ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Lỗi giải quyết %s: %d"
 
-#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "Lỗi đọc từ tiến trình giải quyết:\n"
+msgstr ""
+"Lỗi đọc từ tiến trình giải quyết:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Gặp kết thúc tập tin khi đọc từ tiến trình giải quyết"
 
-#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Lỗi tạo mạch: %s"
 
-#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Lý do không rõ"
 
-#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
-msgstr "Lỗi đọc %s: \n"
+msgstr ""
+"Lỗi đọc %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
-msgstr "Lỗi ghi %s: \n"
+msgstr ""
+"Lỗi ghi %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
-msgstr "Lỗi truy cập %s: \n"
+msgstr ""
+"Lỗi truy cập %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "Thư mục không cho phép ghi."
 
-#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "Không thể gửi tập tin kích cỡ 0 byte."
 
-#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Không thể gửi thư mục."
 
-#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s không phải là một tập tin thông thường nên từ chối ghi đè.\n"
 
-#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s muốn gửi cho bạn %s (%s)"
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s muốn gửi cho bạn một tập tin"
 
-#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Chấp nhận yêu cầu truyền tải tập tin từ %s không?"
 
-#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
 "Remote host: %s\n"
 "Remote port: %d"
-msgstr "Một tập tin đang sẵn sàng tải xuống từ :\n"
+msgstr ""
+"Một tập tin đang sẵn sàng tải xuống từ :\n"
 "Máy ở xa: %s\n"
 "Cổng ở xa: %d"
 
-#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s muốn gửi tập tin %s"
 
-#: ../libpurple/ft.c:489
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s không phải là tên tập tin hợp lệ.\n"
 
-#: ../libpurple/ft.c:510
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Muốn gửi %s cho %s"
 
-#: ../libpurple/ft.c:522
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Đang bắt đầu truyền %s từ %s"
 
-#: ../libpurple/ft.c:683
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Đã truyền xong tập tin %s"
 
-#: ../libpurple/ft.c:686
+#, c-format
 msgid "File transfer complete"
 msgstr "Đã truyền xong tập tin"
 
-#: ../libpurple/ft.c:1109
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Bạn đã thôi truyền %s"
 
-#: ../libpurple/ft.c:1114
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Tiến trình truyền tập tin bị thôi."
 
-#: ../libpurple/ft.c:1172
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s đã thôi truyền %s"
 
-#: ../libpurple/ft.c:1177
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s đã thôi truyền tập tin"
 
-#: ../libpurple/ft.c:1234
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiến trình truyền tập tin cho %s bị lỗi."
 
-#: ../libpurple/ft.c:1236
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiến trình truyền tập tin từ %s bị lỗi."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Chạy lệnh trong thiết bị cuối"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « aim », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « gg », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « icq », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « irc », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « msnim », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « sip », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « xmpp », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Lệnh dùng để quản lý địa chỉ URL « ymsgr », nếu bật."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « aim »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « gg »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « icq »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « irc »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « msnim »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « sip »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « xmpp »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Bộ quản lý địa chỉ URL « ymsgr »"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « aim »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"aim »."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « gg »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"gg »."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « icq »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"icq »."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « irc »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"irc »."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « msnim »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"msnim »."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « sip »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"sip »."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « xmpp »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"xmpp »."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
-msgstr "Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « ymsgr »."
+msgstr ""
+"Đúng nếu lệnh được ghi rõ trong koá « command » nên quản lý địa chỉ URL kiểu « "
+"ymsgr »."
 
-#: ../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 "Đúng nếu lệnh được dùng để quản lý địa chỉ URL kiểu này nên được chạy trong thiết bị cuối."
+msgstr ""
+"Đúng nếu lệnh được dùng để quản lý địa chỉ URL kiểu này nên được chạy trong "
+"thiết bị cuối."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « aim » hay không"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « gg » hay không"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « icq » hay không"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « irc » hay không"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « msnim » hay không"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « sip » hay không"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « xmpp » hay không"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Lệnh đã ghi rõ có nên quản lý địa chỉ URL kiểu « ymsgr » hay không"
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Trình ghi lưu không có chức năng đọc</font></b>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Nhập thô"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Định dạng phẳng cũ"
 
-#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Không thể theo dõi được cuộc trao đổi này."
 
-#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1365
 #, 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;Trả-Lời-Tự-"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;Trả-Lời-Tự-"
 "Động&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1367
 #, 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;Trả-Lời-Tự-"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;Trả-Lời-Tự-"
 "Động&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1425
-#: ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Không tìm được đường dẫn tới bản ghi.</b></font>"
+msgstr ""
+"<font color=\"red\"><b>Không tìm được đường dẫn tới bản ghi.</b></font>"
 
-#: ../libpurple/log.c:1437
-#: ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Không thể đọc tập tin: %s</b></font>"
 
-#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Trả Lời-Tự Động>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Bạn đang sử dụng %s, còn phần bổ sung này cần thiết %s."
 
-#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Phần bổ sung này chưa xác định mã ID."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Sai khớp ma thuật phần bổ sung %d (cần %d)"
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Sai khớp phiên bản ABI %d.%d.x (cần %d.%d.x)"
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions"
-msgstr "Phần bổ sung không thực hiện tất cả các hàm cần thiết"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Phần bổ sung không thực hiện tất cả các hàm cần thiết (list_icon, đăng nhập "
+"và đóng)"
 
-#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "Không tìm thấy phần bổ sung cần thiết %s. Hãy cài đặt nó rồi thử lại."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Không thể nạp phần bổ sung"
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Không nạp được phần bổ sung %s theo yêu cầu."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Không thể nạp phần bổ sung của bạn."
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s cần thiết %s, nhưng nó không bỏ nạp được."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Tự động chấp nhận"
 
-#: ../libpurple/plugins/autoaccept.c:25
-#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "Tự động chấp nhận yêu cầu truyền tải tập tin từ các người dùng đã chọn."
+msgstr ""
+"Tự động chấp nhận yêu cầu truyền tải tập tin từ các người dùng đã chọn."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Việc truyền tập tin « %s » từ « %s » đã chạy xong (đã tự động chấp nhận)."
+msgstr ""
+"Việc truyền tập tin « %s » từ « %s » đã chạy xong (đã tự động chấp nhận)."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Tự động chấp nhận hoàn tất"
 
-#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Khi nhận được yêu cầu truyền tập tin từ %s"
 
-#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Đặt thiết lập tự động chấp nhận"
 
-#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Lưu"
 
-#: ../libpurple/plugins/autoaccept.c:176
-#: ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204
-#: ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1449
-#: ../libpurple/protocols/oscar/oscar.c:2238
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:5911
-#: ../libpurple/protocols/oscar/oscar.c:5966
-#: ../libpurple/protocols/oscar/oscar.c:6192
-#: ../libpurple/protocols/oscar/oscar.c:6262
-#: ../libpurple/request.h:1454
-#: ../libpurple/request.h:1464
-#: ../pidgin/gtkblist.c:548
 msgid "_Cancel"
 msgstr "_Thôi"
 
-#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Hỏi"
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Tự động chấp nhận"
 
-#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Tự động từ chối"
 
-#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Tự động chấp nhận yêu cầu truyền tập tin..."
 
-#.XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
+#. XXX: Is there a better way than this? There really should be.
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
-msgstr "Đường dẫn vào đó cần lưu các tập tin\n"
+msgstr ""
+"Đường dẫn vào đó cần lưu các tập tin\n"
 "(Hãy cung cấp đường dẫn đầy đủ)"
 
-#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "Tự động từ chối yêu cầu từ người dùng không nằm trên danh sách bạn bè"
 
-#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
-msgstr "Tự mở thông báo khi việc truyền tập tin đã chấp nhận tự động đã chạy xong\n"
+msgstr ""
+"Tự mở thông báo khi việc truyền tập tin đã chấp nhận tự động đã chạy xong\n"
 "(chỉ khi không có cuộc thoại với người gửi)"
 
-#: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#, fuzzy
+msgid "Create a new directory for each user"
+msgstr "Chọn một thư mục người dùng trong đó cần tìm kiếm"
+
 msgid "Notes"
 msgstr "Ghi chú"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Ghi chú vào bên dưới..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
-msgstr "Sửa bản ghi chú..."
-
-#.*< major version
-#.*< minor version
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/buddynote.c:90
-#: ../pidgin/plugins/gtkbuddynote.c:74
+msgstr "Sửa ghi chú..."
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Notes"
 msgstr "Ghi chú bạn thân"
 
-#.*< name
-#.*< version
-#: ../libpurple/plugins/buddynote.c:92
-#: ../pidgin/plugins/gtkbuddynote.c:76
+#. *< name
+#. *< version
 msgid "Store notes on particular buddies."
 msgstr "Lưu bản ghi chú về bạn thân nào đó"
 
-#.*< summary
-#: ../libpurple/plugins/buddynote.c:93
-#: ../pidgin/plugins/gtkbuddynote.c:77
+#. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Thêm tùy chọn để lưu bản ghi chú về bạn thân trên danh sách bạn bè."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/ciphertest.c:264
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Cipher Test"
 msgstr "Thử mật mã"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/ciphertest.c:267
-#: ../libpurple/plugins/ciphertest.c:269
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Thử các mật mã có sẵn trong thư viện libpurple."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/dbus-example.c:155
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "DBus Example"
 msgstr "Thí dụ DBus"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "DBus Plugin Example"
 msgstr "Thí dụ phần bổ sung DBus"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/filectl.c:248
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "File Control"
 msgstr "Điều khiển tập tin"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/filectl.c:251
-#: ../libpurple/plugins/filectl.c:253
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Allows control by entering commands in a file."
 msgstr "Cho phép điều khiển bằng các lệnh ghi trong tập tin."
 
-#: ../libpurple/plugins/idle.c:158
-#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Phút"
 
-#.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
+#. 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.
 msgid "I'dle Mak'er"
 msgstr "Bộ làm nghỉ"
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Đặt thời gian nghỉ tài khoản"
 
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Lập"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Bạn không có tài khoản nghỉ."
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Hủy đặt thời gian nghỉ tài khoản"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Bỏ lập"
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Đặt thời gian nghỉ cho mọi tài khoản"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Bỏ đặt thời gian nghỉ cho mọi tài khoản đã nghỉ"
 
-#: ../libpurple/plugins/idle.c:320
-#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Cho phép bạn tự cấu hình thời gian nghỉ"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/ipc-test-client.c:87
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "IPC Test Client"
 msgstr "Trình khách thử IPC"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
+#. *< name
+#. *< version
+#. *  summary
 msgid "Test plugin IPC support, as a client."
 msgstr "Kiểm tra hỗ trợ phần bổ sung IPC, như là trình khách."
 
-#.*  description
-#: ../libpurple/plugins/ipc-test-client.c:92
+#. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr "Kiểm tra hỗ trợ phần bổ sung IPC, như là trình khách. Việc này định vị phần "
+msgstr ""
+"Kiểm tra hỗ trợ phần bổ sung IPC, như là trình khách. Việc này định vị phần "
 "bổ sung máy phục vụ và gọi các lệnh đã đăng ký."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/ipc-test-server.c:74
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "IPC Test Server"
 msgstr "Trình phục vụ thử IPC"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
+#. *< name
+#. *< version
+#. *  summary
 msgid "Test plugin IPC support, as a server."
 msgstr "Kiểm tra hỗ trợ phần bổ sung IPC, như là trình phục vụ."
 
-#.*  description
-#: ../libpurple/plugins/ipc-test-server.c:79
+#. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Kiểm tra hỗ trợ phần bổ sung IPC, như là trình phục vụ. Việc này đăng ký các lệnh IPC."
+msgstr ""
+"Kiểm tra hỗ trợ phần bổ sung IPC, như là trình phục vụ. Việc này đăng ký các "
+"lệnh IPC."
 
-#: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "Cấu hình ẩn việc Vào/Rời"
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Kích cỡ phòng tối thiểu"
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Thời hạn người dùng không hoạt động (theo phút)"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/joinpart.c:270
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Join/Part Hiding"
 msgstr "Ẩn Vào/Rời"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../libpurple/plugins/joinpart.c:273
+#. *< name
+#. *< version
+#. *  summary
 msgid "Hides extraneous join/part messages."
 msgstr "Ẩn các thông điệp Vào/Rời thừa."
 
-#.*  description
-#: ../libpurple/plugins/joinpart.c:275
+#. *  description
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
-msgstr "Phần bổ sung này ẩn các thông điệp Vào/Rời trong phòng lớn, trừ thông điệp về những người dùng đang nói chuyện."
+msgstr ""
+"Phần bổ sung này ẩn các thông điệp Vào/Rời trong phòng lớn, trừ thông điệp "
+"về những người dùng đang nói chuyện."
 
-#.This is used in the place of a timezone abbreviation if the
-#.* offset is way off.  The user should never really see it, but
-#.* it's here just in case.  The parens are to make it clear it's
-#.* not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Người dùng chưa kết nối."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Gửi trả lời tự động:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s đã đăng xuất."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Có thể không phát được một hay nhiều thông điệp."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Bạn đã bị ngắt kết nối khỏi máy phục vụ."
 
-#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr "Hiện thời bạn không có kết nối. Không đăng nhập nên không nhận thông điệp."
+msgstr ""
+"Hiện thời bạn không có kết nối. Không đăng nhập nên không nhận thông điệp."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Thông điệp không gửi đi được vì vượt quá chiều dài tối đa."
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Thông điệp đã không được gửi."
 
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-#.The names of IM clients are marked for translation at the request of
-#.translators who wanted to transliterate them.  Many translators
-#.choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
 msgid "Adium"
 msgstr "Adium"
 
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-#.The names of IM clients are marked for translation at the request of
-#.translators who wanted to transliterate them.  Many translators
-#.choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2840
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
 msgid "Fire"
 msgstr "Fire"
 
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-#.The names of IM clients are marked for translation at the request of
-#.translators who wanted to transliterate them.  Many translators
-#.choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2844
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-#.The names of IM clients are marked for translation at the request of
-#.translators who wanted to transliterate them.  Many translators
-#.choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2849
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
 msgid "QIP"
 msgstr "QIP"
 
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-#.The names of IM clients are marked for translation at the request of
-#.translators who wanted to transliterate them.  Many translators
-#.choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-#.The names of IM clients are marked for translation at the request of
-#.translators who wanted to transliterate them.  Many translators
-#.choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2857
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
 msgid "Trillian"
 msgstr "Trillian"
 
-#.The names of IM clients are marked for translation at the request of
-#.translators who wanted to transliterate them.  Many translators
-#.choose to leave them alone.  Choose what's best for your language.
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2861
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
 msgid "aMSN"
 msgstr "aMSN"
 
-#.Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
+#. Add general preferences.
 msgid "General Log Reading Configuration"
 msgstr "Cấu hình đọc sổ theo dõi chung"
 
-#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Tính nhanh kích cỡ"
 
-#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Dùng cách tìm ra tên"
 
-#.Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
+#. Add Log Directory preferences.
 msgid "Log Directory"
 msgstr "Thư mục chứa sổ theo dõi"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/log_reader.c:2890
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Log Reader"
 msgstr "Bộ đọc sổ theo dõi"
 
-#.*< name
-#.*< version
-#.* summary
-#: ../libpurple/plugins/log_reader.c:2894
+#. *< name
+#. *< version
+#. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Bao gồm trong bộ xem bản ghi các bản ghi của ứng dụng khách tin nhắn khác."
+msgstr ""
+"Bao gồm trong bộ xem bản ghi các bản ghi của ứng dụng khách tin nhắn khác."
 
-#.* description
-#: ../libpurple/plugins/log_reader.c:2898
+#. * description
 msgid ""
 "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!"
-msgstr "Khi xem bản ghi, phần bổ sung này sẽ cũng bao gồm các bản ghi của ứng dụng khách tin nhắn khác. Hiện thời, gồm có Adium, MSN Messenger, và Trillian.\n"
+msgstr ""
+"Khi xem bản ghi, phần bổ sung này sẽ cũng bao gồm các bản ghi của ứng dụng "
+"khách tin nhắn khác. Hiện thời, gồm có Adium, MSN Messenger, và Trillian.\n"
 "\n"
-"CẢNH BÁO : phần bổ sung này vẫn còn là mã nguồn anfa (rất mới, chưa thử) nên có thể sụp đổ nhiều. Hãy tự chịu trách nhiệm khi dùng nó !"
+"CẢNH BÁO : phần bổ sung này vẫn còn là mã nguồn anfa (rất mới, chưa thử) nên "
+"có thể sụp đổ nhiều. Hãy tự chịu trách nhiệm khi dùng nó !"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Bộ nạp phần bổ sung Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Nạp phần bổ sung .NET với Mono."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "Thêm dòng mới vào tin nhắn"
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr "Thêm dòng mới vào chat"
 
-#.*< magic
-#.*< major version
-#.*< minor version
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/newline.c:104
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "New Line"
 msgstr "Dòng mới"
 
-#.*< name
-#.*< version
-#: ../libpurple/plugins/newline.c:106
+#. *< name
+#. *< version
 msgid "Prepends a newline to displayed message."
 msgstr "Thêm dòng mới vào trước tin nhẳn đã hiển thị."
 
-#.*< summary
-#: ../libpurple/plugins/newline.c:107
+#. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr "Thêm dòng mới vào trước tin nhẳn, để phần còn lại của tin nhẳn sẽ xuất hiện bên dưới tên hiển thị trong cửa sổ thoại."
+"the username in the conversation window."
+msgstr ""
+"Thêm một dòng mới vào trước tin nhẳn, để phần còn lại của tin nhẳn sẽ xuất "
+"hiện bên dưới tên người dùng trong cửa sổ thoại."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Mô phỏng tin nhẳn ngoại tuyến"
 
-#: ../libpurple/plugins/offlinemsg.c:25
-#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lưu dạng thông báo các tin nhẳn được gửi cho người dùng chưa kết nối."
 
-#: ../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 "Phần còn lại của các tin nhẳn sẽ được lưu dạng thông báo. Bạn cũng có thể chỉnh sửa/xoá thông báo trong hộp thoại « Thông báo bạn thân »."
+msgstr ""
+"Phần còn lại của các tin nhẳn sẽ được lưu dạng thông báo. Bạn cũng có thể "
+"chỉnh sửa/xoá thông báo trong hộp thoại « Thông báo bạn thân »."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, 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 » chưa kết nối. Bạn có muốn lưu phần còn lại của các tin nhẳn trong thông báo rồi gửi tự động khi « %s » đăng nhập lại không?"
+msgstr ""
+"« %s » chưa kết nối. Bạn có muốn lưu phần còn lại của các tin nhẳn trong "
+"thông báo rồi gửi tự động khi « %s » đăng nhập lại không?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Tin nhẳn ngoại tuyến"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Bạn cũng có thể chỉnh sửa/xoá thông báo trong hộp thoại « Thông báo bạn thân »."
-
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113
-#: ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307
-#: ../pidgin/gtkrequest.c:269
+msgstr ""
+"Bạn cũng có thể chỉnh sửa/xoá thông báo trong hộp thoại « Thông báo bạn thân "
+"»."
+
 msgid "Yes"
 msgstr "Có"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114
-#: ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308
-#: ../pidgin/gtkrequest.c:270
 msgid "No"
 msgstr "Không"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Lưu tin nhẳn ngoại tuyến trong thông báo"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Đừng hỏi. Luôn luôn lưu trong thông báo."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/perl/perl.c:601
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Perl Plugin Loader"
 msgstr "Bộ nạp phần bổ sung Perl"
 
-#.*< name
-#.*< version
-#.*< summary
-#: ../libpurple/plugins/perl/perl.c:603
-#: ../libpurple/plugins/perl/perl.c:604
+#. *< name
+#. *< version
+#. *< summary
 msgid "Provides support for loading perl plugins."
 msgstr "Cung cấp hỗ trợ để nạp phần bổ sung Perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Chế độ dự đoán"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Chế độ dự đoán về cuộc thoại gửi đến"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr "Gây ra cửa sổ thoại xuất hiện khi người dùng khác bắt đầu gửi tin nhẳn. Hoạt động được cho AIM, ICQ, XMPP, Sametime, và Yahoo!"
+msgstr ""
+"Gây ra cửa sổ thoại xuất hiện khi người dùng khác bắt đầu gửi tin nhẳn. Hoạt "
+"động được cho AIM, ICQ, XMPP, Sametime, và Yahoo!"
 
 # Đây là lời trích dẫn từ phim Star Wars: khó dịch thì dịch sự nghĩa trong chương trình.
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Bạn phát hiện cái gì bị thay đổi..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Chỉ hiệu lực cho người dùng trong danh sách bạn bè"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Tắt khi vắng mặt"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Hiển thị tin nhẳn thông báo trong cuộc thoại"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Nâng lên cuộc thoại dự đoán"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/signals-test.c:753
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Signals Test"
 msgstr "Kiểm tra tín hiệu"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Test to see that all signals are working properly."
 msgstr "Kiểm tra để biết là mọi tín hiệu hoạt động tốt."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/simple.c:37
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Simple Plugin"
 msgstr "Phần bổ sung đơn giản"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/simple.c:40
-#: ../libpurple/plugins/simple.c:42
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Tests to see that most things are working."
 msgstr "Kiểm tra để biết phần lớn thứ đang hoạt động."
 
-#.Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
+#. Scheme name
 msgid "X.509 Certificates"
 msgstr "Chứng nhận X.509"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Provides SSL support through GNUTLS."
 msgstr "Cung cấp hỗ trợ SSL thông qua GNUTLS."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "NSS"
 msgstr "NSS"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Cung cấp hỗ trợ SSL thông qua Mozilla NSS."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/ssl/ssl.c:94
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "SSL"
 msgstr "SSL"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/ssl/ssl.c:97
-#: ../libpurple/plugins/ssl/ssl.c:99
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Cung cấp một lớp bọc cho thư viện hỗ trợ SSL."
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s thôi vắng mặt."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s đã đi vắng."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s rơi vào trạng thái nghỉ."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s hoạt động trở lại."
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s đã đăng nhập."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Thông báo khi"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Bạn thân đi _vắng"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Bạn thân mới _nghỉ:"
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Bạn thân đăn_g nhập/xuất"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../libpurple/plugins/statenotify.c:148
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy State Notification"
 msgstr "Thông báo trạng thái bạn thân"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/plugins/statenotify.c:151
-#: ../libpurple/plugins/statenotify.c:154
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "Thông báo trong cửa sổ cuộc thoại trạng thái vắng mặt, có mặt, hay nghỉ của bạn thân."
+msgstr ""
+"Thông báo trong cửa sổ cuộc thoại trạng thái vắng mặt, có mặt, hay nghỉ của "
+"bạn thân."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Bộ nạp phần bổ sung Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:425
-#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Cung cấp hỗ trợ để nạp phần bổ sung Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
-msgstr "Không thể phát hiện bản cài đặt ActiveTCL. Muốn sử dụng phần bổ sung TCL thì cài đặt ActiveTCL từ địa chỉ « http://www.activestate.com ».\n"
+msgstr ""
+"Không thể phát hiện bản cài đặt ActiveTCL. Muốn sử dụng phần bổ sung TCL thì "
+"cài đặt ActiveTCL từ địa chỉ « http://www.activestate.com ».\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:101
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
-msgstr "Không tìm thấy bộ công cụ Apple Bonjour For Windows, xem FAQ (Hỏi Đáp) ở địa chỉ « http://d.pidgin.im/BonjourWindows » để tìm chi tiết."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
+msgstr ""
+"Không tìm thấy bộ công cụ Apple Bonjour For Windows, xem FAQ (Hỏi Đáp) ở địa "
+"chỉ « http://d.pidgin.im/BonjourWindows » để tìm chi tiết."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Không thể lắng nghe kết nối tin nhắn gửi đến\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:147
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Không thể thiết lập kết nối đến máy phục vụ mDNS cục bộ. Nó chạy chưa?"
 
-#.Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:392
-#: ../libpurple/protocols/bonjour/bonjour.c:697
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:990
+#. Creating the options for the protocol
 msgid "First name"
 msgstr "Tên"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:700
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Last name"
 msgstr "Họ"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1327
-#: ../libpurple/protocols/jabber/buddy.c:1337
-#: ../libpurple/protocols/jabber/buddy.c:2221
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "Email"
 msgstr "Địa chỉ thư"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:401
-#: ../libpurple/protocols/bonjour/bonjour.c:706
 msgid "AIM Account"
 msgstr "Tài khoản AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:709
 msgid "XMPP Account"
 msgstr "Tài khoản XMPP"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/bonjour/bonjour.c:508
-#: ../libpurple/protocols/bonjour/bonjour.c:510
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Bonjour Protocol Plugin"
 msgstr "Phần bổ sung giao thức Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr "Người Purple"
 
 # Đây là tên của giao thức Apple: đừng dịch.
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s đã đóng cửa sổ cuộc thoại."
 
-#: ../libpurple/protocols/bonjour/jabber.c:457
-#: ../libpurple/protocols/bonjour/jabber.c:522
-#: ../libpurple/protocols/bonjour/jabber.c:567
-#: ../libpurple/protocols/bonjour/jabber.c:744
-#: ../libpurple/protocols/bonjour/jabber.c:762
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Không thể gửi tin, vì không thể bắt đầu nói chuyện."
 
-#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "Không thể mở ổ cắm."
 
-#: ../libpurple/protocols/bonjour/jabber.c:671
-msgid "Error setting socket options"
-msgstr "Lỗi đặt tùy chọn ổ cắm"
-
-#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "Không thể đóng kết ổ cắm tới cổng"
 
-#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "Không thể lắng nghe trên ổ cắm"
 
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1845
+msgid "Error communicating with local mDNSResponder."
+msgstr "Lỗi liên lạc với cơ chế đáp ứng DNS mDNSResponder cục bộ."
+
 msgid "Invalid proxy settings"
 msgstr "Thiết lập ủy nhiệm không hợp lệ"
 
-#: ../libpurple/protocols/gg/gg.c:77
-#: ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr "Bạn chỉ định tên máy hay số hiệu cổng không hợp lệ cho kiểu ủy nhiệm đã cho."
+msgstr ""
+"Bạn chỉ định tên máy hay số hiệu cổng không hợp lệ cho kiểu ủy nhiệm đã cho."
 
-#: ../libpurple/protocols/gg/gg.c:115
-#: ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Lỗi hiệu bài"
 
-#: ../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 "Không thể lấy hiệu bài.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267
-#: ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Lưu danh sách bạn bè..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Danh sách bạn bè trống, không có nội dung gì được ghi vào tập tin."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Lưu thành công danh sách bạn bè."
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "Không thể ghi vào %2$s danh sách bạn bè cho %1$s"
 
-#: ../libpurple/protocols/gg/gg.c:303
-#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Không thể nạp danh sách bạn bè"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Nạp danh sách bạn bè..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Nạp thành công danh sách bạn bè."
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Lưu danh sách bạn bè..."
 
-#: ../libpurple/protocols/gg/gg.c:382
+msgid "Load buddylist from file..."
+msgstr "Nạp danh sách bạn bè từ tập tin..."
+
 msgid "Fill in the registration fields."
 msgstr "Đìên vào các trường đăng ký."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Hai mật khẩu không trùng."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Không thể đăng ký tài khoản mới. Lỗi xảy ra.\n"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Tài khoản Gadu-Gadu mới đã đăng ký"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Đăng ký thành công."
 
-#: ../libpurple/protocols/gg/gg.c:483
-#: ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:965
-#: ../libpurple/protocols/jabber/jabber.c:968
-#: ../libpurple/protocols/jabber/jabber.c:1746
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: ../libpurple/protocols/gg/gg.c:488
-#: ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Mật khẩu (gõ lại)"
 
-#: ../libpurple/protocols/gg/gg.c:493
-#: ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Nhập hiệu bài hiện có"
 
-#: ../libpurple/protocols/gg/gg.c:499
-#: ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Hiệu bài hiện có"
 
-#: ../libpurple/protocols/gg/gg.c:503
-#: ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Đăng ký tài khoản Gadu-Gadu mới"
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Vui lòng điền vào các trường sau"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1002
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "T.P."
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Năm sinh"
 
-#: ../libpurple/protocols/gg/gg.c:651
-#: ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3713
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233
-#: ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Giới tính"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Nam hay nữ"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3713
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Nam"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3713
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Nữ"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Chỉ trực tuyến"
 
-#: ../libpurple/protocols/gg/gg.c:662
-#: ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Tìm bạn bè"
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Hãy nhập bên dưới tiêu chuẩn tìm kiếm"
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Điền vào trường."
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Mật khẩu hiện tại khác với mật khẩu bạn đã cung cấp."
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Không thể đổi mật khẩu. Lỗi xảy ra.\n"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Đổi mật khẩu cho tài khoản Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Đổi thành công mật khẩu."
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Mật khẩu hiện tại"
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Hãy nhập mật khẩu hiện tại và mật khẩu mới của bạn cho UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:800
-#: ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Đổi mật khẩu Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Chọn cuộc chát cho bạn thân: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881
-#: ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Thêm vào chát..."
 
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5629
-#: ../libpurple/protocols/qq/qq.c:171
-#: ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
-#: ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3250
-#: ../pidgin/gtkblist.c:3607
-#: ../pidgin/gtkdocklet.c:561
-#: ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Ngoại tuyến"
-
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2833
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
-#: ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545
-#: ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Có mặt"
 
-#.get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#.* the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#.Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016
-#: ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2042
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4528
-#: ../libpurple/protocols/oscar/oscar.c:5657
-#: ../libpurple/protocols/qq/qq.c:181
-#: ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3665
-#: ../libpurple/protocols/yahoo/yahoo.c:3739
-#: ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549
-#: ../pidgin/gtkprefs.c:2040
-#: ../pidgin/gtkstatusbox.c:1058
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#, c-format
 msgid "Away"
 msgstr "Vắng mặt"
 
-#: ../libpurple/protocols/gg/gg.c:1045
-#: ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2704
-#: ../libpurple/protocols/oscar/oscar.c:3680
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048
-#: ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/oscar/oscar.c:3691
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Tên"
 
-#: ../libpurple/protocols/gg/gg.c:1061
-#: ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Năm sinh"
 
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Unable to display the search results."
 msgstr "Không thể hiển thị kết quả tìm kiếm."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Danh bạ Gadu-Gadu công cộng"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Kết quả tìm kiếm"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Không tìm thấy người dùng tương ứng"
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Không có người dùng tương ứng với tiêu chuẩn tìm kiếm bạn đã xác định."
 
-#: ../libpurple/protocols/gg/gg.c:1314
-#: ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Không thể đọc ổ cắm"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Danh sách bạn bè đã tải xuống"
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Danh sách bạn bè của bạn đã được tải xuống máy phục vụ."
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Danh sách bạn bè đã tải lên"
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Danh sách bạn bè của bạn đã được cất giữ trên máy phục vụ."
 
-#: ../libpurple/protocols/gg/gg.c:1517
-#: ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Lỗi kết nối."
 
-#: ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:664
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr "Bị chặn"
-
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Thêm vào chát"
 
-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "Bỏ chặn"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "Chặn"
-
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "Tê_n chát:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Lỗi chát"
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Tên chát này đang được dùng"
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Không phải có kết nối tới máy phục vụ."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Tìm bạn bè..."
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Đổi mật khẩu..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Tải danh sách bạn bè lên máy phục vụ"
 
 # Hành động này tải xuống một bản sao, vẫn còn để lại danh sách bạn bè của bạn trên máy phục vụ.
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Tải danh sách bạn bè xuống máy phục vụ"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Xoá danh sách bạn bè khỏi máy phục vụ"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Lưu danh sách bạn bè vào tập tin..."
 
-#: ../libpurple/protocols/gg/gg.c:2070
-msgid "Load buddylist from file..."
-msgstr "Nạp danh sách bạn bè từ tập tin..."
-
-#.magic
-#.major_version
-#.minor_version
-#.plugin type
-#.ui_requirement
-#.flags
-#.dependencies
-#.priority
-#.id
-#.name
-#.version
-#: ../libpurple/protocols/gg/gg.c:2174
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Phần bổ sung giao thức Gadu-Gadu"
 
-#.summary
-#: ../libpurple/protocols/gg/gg.c:2175
+#. summary
 msgid "Polish popular IM"
 msgstr "Hệ tin nhắn nhanh phổ biến ở Phần Lan"
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Người dùng Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Lệnh không rõ : %s"
 
-#: ../libpurple/protocols/irc/cmds.c:506
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "chủ đề hiện thời: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:510
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Chưa lập chủ đề"
 
-#: ../libpurple/protocols/irc/dcc_send.c:293
-#: ../libpurple/protocols/irc/dcc_send.c:334
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:344
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:353
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:365
 msgid "File Transfer Failed"
 msgstr "Lỗi truyền tập tin"
 
-#: ../libpurple/protocols/irc/dcc_send.c:294
-#: ../libpurple/protocols/irc/dcc_send.c:335
 msgid "Could not open a listening port."
 msgstr "Không thể mở cổng lắng nghe."
 
 # MOTD: Message Of The Day: thông điệp của hôm nay
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Lỗi hiển thị MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "MOTD hiện không có"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Không có MOTD (thông điệp của hôm nay) liên quan đến kết nối này."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD cho %s"
 
-#: ../libpurple/protocols/irc/irc.c:129
-#: ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:632
-#: ../libpurple/protocols/irc/irc.c:661
-#: ../libpurple/protocols/myspace/myspace.c:2407
 msgid "Server has disconnected"
 msgstr "Máy phục vụ đã ngắt kết nối"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Xem MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:272
-#: ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kênh:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:514
 msgid "_Password:"
 msgstr "_Mật khẩu :"
 
-#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "Tên hiệu cho IRC không được chứa dấu cách"
 
-#.1. connect to server
-#.connect to the server
-#: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1326
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1288
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
-#: ../libpurple/protocols/simple/simple.c:1893
-#: ../libpurple/protocols/yahoo/yahoo.c:2948
-#: ../libpurple/protocols/zephyr/zephyr.c:1621
-#: ../pidgin/gtkstatusbox.c:662
+#. 1. connect to server
+#. connect to the server
 msgid "Connecting"
 msgstr "Đang kết nối"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:658
-#: ../libpurple/protocols/jabber/jabber.c:1138
 msgid "SSL support unavailable"
 msgstr "Hiện không có hỗ trợ SSL"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:320
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "Không thể tạo ổ cắm"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "Không thể kết nối với máy phục vụ"
 
-#: ../libpurple/protocols/irc/irc.c:627
-#: ../libpurple/protocols/irc/irc.c:656
-#: ../libpurple/protocols/myspace/myspace.c:2401
 msgid "Read error"
 msgstr "Lỗi đọc"
 
-#: ../libpurple/protocols/irc/irc.c:797
-#: ../libpurple/protocols/silc/chat.c:1398
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Người dùng"
 
-#: ../libpurple/protocols/irc/irc.c:800
-#: ../libpurple/protocols/sametime/sametime.c:3416
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Chủ đề"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#: ../libpurple/protocols/irc/irc.c:938
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
 msgid "IRC Protocol Plugin"
 msgstr "Phần bổ sung giao thức IRC"
 
-#.*  summary
-#: ../libpurple/protocols/irc/irc.c:939
+#. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Phần bổ sung giao thức IRC ít rắc rối"
 
-#.host to connect to
-#: ../libpurple/protocols/irc/irc.c:964
-#: ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2335
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6696
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
-#: ../libpurple/protocols/toc/toc.c:2327
+#. host to connect to
 msgid "Server"
 msgstr "Máy phục vụ"
 
-#.port to connect to
-#: ../libpurple/protocols/irc/irc.c:967
-#: ../libpurple/protocols/msn/msn.c:2340
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6699
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
-#: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
+#. port to connect to
 msgid "Port"
 msgstr "Cổng"
 
-#: ../libpurple/protocols/irc/irc.c:970
 msgid "Encodings"
 msgstr "Bảng mã"
 
-#: ../libpurple/protocols/irc/irc.c:973
-#: ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:958
-#: ../libpurple/protocols/jabber/jabber.c:960
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
-#: ../libpurple/protocols/silc/silc.c:1148
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
-msgid "Username"
-msgstr "Tên đăng nhập"
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
 
-#: ../libpurple/protocols/irc/irc.c:976
-#: ../libpurple/protocols/irc/msgs.c:319
-#: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Tên thật"
 
 #.
-#.option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
-#.prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#. 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:984
 msgid "Use SSL"
 msgstr "Dùng SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "Chế độ sai"
 
-#: ../libpurple/protocols/irc/msgs.c:200
+#, fuzzy, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "%s bị %s cấm, đặt %ld giây trước"
+
+#, c-format
+msgid "Ban on %s"
+msgstr "%s bị cấm"
+
+msgid "End of ban list"
+msgstr "Kết thúc danh sách cấm"
+
 #, c-format
 msgid "You are banned from %s."
-msgstr "Bạn bị cấm từ %s."
+msgstr "Bạn bị cấm ra %s."
 
-#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "Bị cấm"
 
-#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Không thể cấm %s: danh sách người cấm đã đầy"
 
-#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(đã nhận diện)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3681
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Tên hiệu"
 
-#: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Hiện thời trên"
 
-#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "Nghỉ trong"
 
-#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
-msgstr "Đã kết nối từ"
+msgstr "Đã kết nối kể từ"
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Tính từ xác định:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr "Hết sức thú vị"
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s đã đổi chủ đề thành: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s đã gột chủ đề."
 
-#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Chủ đề cho %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Thông điệp không rõ « %s »"
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "Thông điệp không rõ"
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "Máy phục vụ IRC đã nhận một thông điệp nó không hiểu."
 
-#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Người dùng trên %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr "Đáp ứng thời gian"
 
-#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr "Thời gian tại máy phục vụ IRC:"
 
-#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr "Không có kênh như vậy"
 
-#.does this happen?
-#: ../libpurple/protocols/irc/msgs.c:600
+#. does this happen?
 msgid "no such channel"
 msgstr "không có kênh như vậy"
 
-#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr "Người dùng chưa đăng nhập"
 
-#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr "Không có tên hiệu hay kênh như vậy"
 
-#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr "Không thể gửi"
 
-#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Việc tham gia vào %s cần có lời mời."
 
-#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr "Chỉ người được mời"
 
-#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Bạn bị %s đá: (%s)"
 
-#.Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:806
-#: ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
+#. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Bị %s đá (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:829
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "chế độ (%s %s) bởi %s"
 
-#: ../libpurple/protocols/irc/msgs.c:914
-#: ../libpurple/protocols/irc/msgs.c:915
 msgid "Invalid nickname"
 msgstr "Tên hiệu không hợp lệ"
 
-#: ../libpurple/protocols/irc/msgs.c:916
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "Tên hiệu bạn chọn bị mày phục vụ từ chối. Có thể vì tên này có chứa các ký "
+msgstr ""
+"Tên hiệu bạn chọn bị mày phục vụ từ chối. Có thể vì tên này có chứa các ký "
 "tự không hợp lệ."
 
-#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "Tên tài khoản bạn chọn bị mày chủ từ chối. Có thể vì tên này có chứa các ký "
+msgstr ""
+"Tên tài khoản bạn chọn bị mày chủ từ chối. Có thể vì tên này có chứa các ký "
 "tự không hợp lệ."
 
-#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Cannot change nick"
 msgstr "Không thể thay đổi tên hiệu"
 
-#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Could not change nick"
 msgstr "Không thể thay đổi tên hiệu"
 
-#: ../libpurple/protocols/irc/msgs.c:981
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Bạn rời khỏi kênh %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1023
 msgid "Error: invalid PONG from server"
 msgstr "Lỗi: PONG không hợp lệ từ máy phục vụ"
 
-#: ../libpurple/protocols/irc/msgs.c:1025
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Đáp lại PING -- Trễ: %lu giây"
 
-#: ../libpurple/protocols/irc/msgs.c:1116
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Không thể tham gia %s: cần thiết đăng ký."
 
-#: ../libpurple/protocols/irc/msgs.c:1117
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Không thể vào kênh"
 
-#: ../libpurple/protocols/irc/msgs.c:1151
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Tên hiệu hay kênh này tạm thời không sẵn sàng."
 
-#: ../libpurple/protocols/irc/msgs.c:1163
 #, c-format
 msgid "Wallops from %s"
 msgstr "Tin nhẳn gửi cho mọi quản trị từ %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;việc cần làm&gt;:  Thực hiện một hành động."
 
-#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
-msgstr "away [thông điệp]:  Đặt một thông báo đi vắng, hay không dùng thông điệp để trở lại sau khi đi vắng."
+msgstr ""
+"away [thông điệp]:  Đặt một thông báo đi vắng, hay không dùng thông điệp để "
+"trở lại sau khi đi vắng."
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: gửi lệnh cho trình phục vụ kênh"
 
-#: ../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."
-msgstr "deop &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Loại bỏ trạng thái người điều hành "
+msgstr ""
+"deop &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Loại bỏ trạng thái người điều hành "
 "kênh khỏi ai đó. Bạn phải là một người điều hành kênh để làm điều này."
 
-#: ../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 "
 "must be a channel operator to do this."
-msgstr "devoice &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Loại bỏ trạng thái thoại trong "
+msgstr ""
+"devoice &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Loại bỏ trạng thái thoại trong "
 "kênh khỏi ai đó, ngăn họ trò chuyện nếu kênh được đặt (+m). Bạn phải là một "
 "người điều hành kênh để làm điều này."
 
-#: ../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."
-msgstr "invite &lt;tên_hiệu&gt; [phòng]:  Mời bạn hữu tham gia kênh đã ghi rõ, hay "
+msgstr ""
+"invite &lt;tên_hiệu&gt; [phòng]:  Mời bạn hữu tham gia kênh đã ghi rõ, hay "
 "kênh hiện tại."
 
-#: ../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;phòng1&gt;[,phòng2][,...] [khoá1[,khoá2][,...]]:  Nhập vào một hay "
+msgstr ""
+"j &lt;phòng1&gt;[,phòng2][,...] [khoá1[,khoá2][,...]]:  Nhập vào một hay "
 "nhiều kênh, tùy chọn cung cấp một khoá cho mỗi kênh nếu cần."
 
-#: ../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;phòng1&gt;[,phòng2][,...] [khoá1[,khoá2][,...]]:  Vào một hay nhiều "
+msgstr ""
+"join &lt;phòng1&gt;[,phòng2][,...] [khoá1[,khoá2][,...]]:  Vào một hay nhiều "
 "kênh, tùy chọn cung cấp một khoá cho mỗi kênh nếu cần."
 
-#: ../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."
-msgstr "kick &lt;tên_hiệu&gt; [thông_điệp]: Loại bỏ ai đó khỏi một kênh. Bạn phải là "
+msgstr ""
+"kick &lt;tên_hiệu&gt; [thông_điệp]: Loại bỏ ai đó khỏi một kênh. Bạn phải là "
 "người điều hành kênh để làm điều này."
 
-#: ../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: hiển thị danh sách các phòng trò chuyện nằm trên mạng này. <i>Cảnh "
+msgstr ""
+"list: hiển thị danh sách các phòng trò chuyện nằm trên mạng này. <i>Cảnh "
 "báo : một số máy phục vụ có thể ngắt kết nối khi bạn làm điều này.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;hành động cần làm&gt;:  Thực hiện một hành động"
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: gửi lệnh cho trình phục vụ ghi nhớ (memoserv)"
 
-#: ../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;tên_hiệu|kênh&gt;:  Đặt hay bỏ đặt một kênh "
-"hay chế độ người dùng."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;tên_hiệu|kênh&gt;:  Đặt hay bỏ đặt một "
+"kênh hay chế độ người dùng."
 
-#: ../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;tên_hiệu&gt; &lt;thông_điệp&gt;:  Gửi một tin nhẳn riêng cho một người dùng (thay vì gửi đến cả kênh)"
+msgstr ""
+"msg &lt;tên_hiệu&gt; &lt;thông_điệp&gt;:  Gửi một tin nhẳn riêng cho một "
+"người dùng (thay vì gửi đến cả kênh)"
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kênh]:  Liệt kê danh sách người dùng đang trong một kênh."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2336
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;tên hiệu mới&gt;:  Đổi tên hiệu."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Gửi lệnh cho trình phục vụ tên hiệu (nickserv)"
 
-#: ../libpurple/protocols/irc/parse.c:139
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;đích&lt;:  Gửi thông báo cho một người dùng hay kênh."
+
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
-msgstr "op &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Tặng trạng thái người điều hành kênh "
+msgstr ""
+"op &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Tặng trạng thái người điều hành kênh "
 "cho bạn khác. Bạn phải là người điều hành kênh để làm việc này."
 
-#: ../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."
-msgstr "operwall &lt;thông_điệp&gt;: Nếu bạn không biết điều này nghĩa là gì, bạn có "
+msgstr ""
+"operwall &lt;thông_điệp&gt;: Nếu bạn không biết điều này nghĩa là gì, bạn có "
 "lẽ không thể dùng nó."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: gửi lệnh cho trình phục vụ người điều hành (operserv)"
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [phòng] [thông_điệp]: Rời khỏi kênh hiện tại, hay một kênh nào đó, tùy "
+msgstr ""
+"part [phòng] [thông_điệp]: Rời khỏi kênh hiện tại, hay một kênh nào đó, tùy "
 "chọn để lại một thông điệp."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr "ping [tên_hiệu]: Hỏi một thời gian trễ của người dùng (hay máy phục vụ nếu "
+msgstr ""
+"ping [tên_hiệu]: Hỏi một thời gian trễ của người dùng (hay máy phục vụ nếu "
 "không xác định tên người dùng cụ thể)."
 
-#: ../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)."
-msgstr "query &lt;tên_hiệu&gt; &lt;thông_điệp&gt;: Gởi một thông điệp riêng cho "
+msgstr ""
+"query &lt;tên_hiệu&gt; &lt;thông_điệp&gt;: Gởi một thông điệp riêng cho "
 "người dùng (thay vì gửi đến cả kênh)"
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [thông_điệp]:  Ngưng kết nối với máy phục vụ, kèm theo một thông báo tuỳ chọn."
+msgstr ""
+"quit [thông_điệp]:  Ngưng kết nối với máy phục vụ, kèm theo một thông báo "
+"tuỳ chọn."
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Gởi một dòng lệnh thô đến máy phục vụ."
 
-#: ../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;tên_hiệu&gt; [thông_điệp]: Loại bỏ một người ra khỏi phòng. Bạn phải "
-"là người điều hành kênh để làm điều này."
+msgstr ""
+"remove &lt;tên_hiệu&gt; [thông_điệp]: Loại bỏ một người ra khỏi phòng. Bạn "
+"phải là người điều hành kênh để làm điều này."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Hiển thị thời gian hiện tại của máy phục vụ IRC."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [chủ đề mới]:  Xem hay thay đổi chủ đề kênh."
 
-#: ../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;:  Đặt hay bỏ chế độ người dùng."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [tên_hiệu]: gửi cho người dùng một yêu cầu 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."
-msgstr "voice &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Tặng trạng thái thoại trong kênh "
+msgstr ""
+"voice &lt;tên_hiệu1&gt; [tên_hiệu2] ...:  Tặng trạng thái thoại trong kênh "
 "cho người khác. Bạn phải là người điều hành kênh để làm điều này."
 
-#: ../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."
-msgstr "wallops &lt;thông_điệp&gt;:  Nếu bạn không biết điều này nghĩa là gì, bạn có "
+msgstr ""
+"wallops &lt;thông_điệp&gt;:  Nếu bạn không biết điều này nghĩa là gì, bạn có "
 "lẽ không thể dùng nó."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [máy_phục_vụ] &lt;tên_hiệu&gt;:  Thu thập thông tin về một người dùng."
+msgstr ""
+"whois [máy_phục_vụ] &lt;tên_hiệu&gt;:  Thu thập thông tin về một người dùng."
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;tên_hiệu&gt;: Thu thập thông tin về một người dùng đã đăng xuất."
+msgstr ""
+"whowas &lt;tên_hiệu&gt;: Thu thập thông tin về một người dùng đã đăng xuất."
 
-#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Thời gian đáp lại từ %s: %lu giây"
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Trả lời PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640
-#: ../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 "Bị ngắt kết nối."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:719
-#: ../libpurple/protocols/jabber/jabber.c:749
-#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Unknown Error"
 msgstr "Lỗi không rõ"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Lệnh như thế đã bị lỗi"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "thực hiện"
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Máy phục vụ yêu cầu TLS/SSL để đăng nhập. Không tìm thấy khả năng hỗ trợ TLS/SSL."
+msgstr ""
+"Máy phục vụ yêu cầu TLS/SSL để đăng nhập. Không tìm thấy khả năng hỗ trợ TLS/"
+"SSL."
+
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr "Bạn cần chức năng mật mã, nhưng không tìm thấy hỗ trợ TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Máy phục vụ yêu cầu xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
+msgstr ""
+"Máy phục vụ yêu cầu xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
 
-#: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:525
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
-msgstr "%s yêu cầu xác thực bằng nhập thô qua kết nối không mật mã. Cho phép điều này và "
-"tiếp tục xác thực không? (KHÔNG BẢO MẬT)"
-
-#: ../libpurple/protocols/jabber/auth.c:325
-#: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:528
-#: ../libpurple/protocols/jabber/auth.c:719
-#: ../libpurple/protocols/jabber/auth.c:720
+msgstr ""
+"%s yêu cầu xác thực bằng nhập thô qua kết nối không mật mã. Cho phép điều "
+"này và tiếp tục xác thực không? (KHÔNG BẢO MẬT)"
+
 msgid "Plaintext Authentication"
 msgstr "Xác thực nhập thô"
 
-#: ../libpurple/protocols/jabber/auth.c:479
-#: ../libpurple/protocols/jabber/auth.c:652
-#: ../libpurple/protocols/jabber/auth.c:900
-#: ../libpurple/protocols/jabber/auth.c:1049
-#: ../libpurple/protocols/jabber/auth.c:1076
-#: ../libpurple/protocols/jabber/auth.c:1098
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Máy phục vụ trả lời không hợp lệ."
 
-#: ../libpurple/protocols/jabber/auth.c:541
-#: ../libpurple/protocols/jabber/auth.c:732
 msgid "Server does not use any supported authentication method"
 msgstr "Máy phục vụ không sử dụng bất kỳ phương thức xác thực được hỗ trợ nào"
 
-#: ../libpurple/protocols/jabber/auth.c:721
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr "Máy phục vụ này yêu cầu xác thực bằng nhập thô qua kết nối không mật mã. Cho phép "
-"điều này và tiếp tục xác thực không? (KHÔNG BẢO MẬT)"
-
-#: ../libpurple/protocols/jabber/auth.c:923
-#: ../libpurple/protocols/jabber/auth.c:948
 msgid "Invalid challenge from server"
 msgstr "Kiểm tra từ máy phục vụ không hợp lệ"
 
-#: ../libpurple/protocols/jabber/auth.c:1022
 msgid "SASL error"
 msgstr "Lỗi SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1221
-#: ../libpurple/protocols/sametime/sametime.c:4174
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Tên đầy đủ"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1233
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Họ"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1236
 msgid "Given Name"
 msgstr "Tên hay gọi"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1018
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1284
 msgid "Street Address"
 msgstr "Địa chỉ nhà"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1281
 msgid "Extended Address"
 msgstr "Địa chỉ khác"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1287
 msgid "Locality"
 msgstr "Nơi ở"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1290
 msgid "Region"
 msgstr "Vùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1293
 msgid "Postal Code"
 msgstr "Mã vùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1297
-#: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Quốc gia"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1308
-#: ../libpurple/protocols/jabber/buddy.c:1315
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Điện thoại"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1352
 msgid "Organization Name"
 msgstr "Tên tổ chức"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1355
 msgid "Organization Unit"
 msgstr "Phòng ban"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1364
 msgid "Role"
 msgstr "Vị trí"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1252
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3730
 msgid "Birthday"
 msgstr "Ngày sinh"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1367
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193
-#: ../pidgin/gtkblist.c:3262
-#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Mô tả"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Sửa vCard XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "Mọi mục bên dưới là tùy chọn. Chỉ nhập thông tin bạn thấy cần thiết."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Trình khách"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Hệ điều hành"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
 msgstr "Hoạt động cuối cùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Service Discovery Info"
 msgstr "Thông tin phát hiện dịch vụ"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
 msgstr "Mục phát hiện dịch vụ"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Extended Stanza Addressing"
 msgstr "Đặt địa chỉ kiểu đoạn dòng mở rộng"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Multi-User Chat"
 msgstr "Chat đa người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Thông tin về mặt ở đã mở rộng cho chat đa người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
 msgstr "Luồng byte bên trong dải"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "Ad-Hoc Commands"
 msgstr "Lệnh như thế"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
 msgstr "Dịch vụ PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
 msgstr "Luồng byte SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
 msgstr "Dữ liệu bên ngoài dải"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
 msgid "In-Band Registration"
 msgstr "Đăng ký bên trong dải"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "User Location"
 msgstr "Nơi ở người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Avatar"
 msgstr "Ảnh riêng người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "Chat State Notifications"
 msgstr "Thông báo tình trạng chat"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Software Version"
 msgstr "Phiên bản phần mềm"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Stream Initiation"
 msgstr "Khởi tạo luồng"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "Truyền tập tin"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
 msgid "User Mood"
 msgstr "Tâm trạng người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Activity"
 msgstr "Hoạt động người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "Entity Capabilities"
 msgstr "Khả năng thực thể"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
 msgstr "Dàn xếp phiên bản đã mật mã"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "User Tune"
 msgstr "Điệu người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "Roster Item Exchange"
 msgstr "Trao đổi mục bản liệt kê"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Reachability Address"
 msgstr "Địa chỉ có thể tới"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "User Profile"
 msgstr "Lý lịch người dùng"
 
 # Name: don't translate/Tên: đừng dịch
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
 msgstr "Âm thanh Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "User Nickname"
 msgstr "Tên hiệu người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
 msgstr "Jingle Raw UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Video"
 msgstr "Ảnh động Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
 msgstr "Jingle DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Message Receipts"
 msgstr "Người nhận tin nhẳn"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Public Key Publishing"
 msgstr "Xuất bản khoá công"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "User Chatting"
 msgstr "Người dùng nói chuyện"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Browsing"
 msgstr "Người dùng duyệt"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Gaming"
 msgstr "Người dùng chơi trò"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Viewing"
 msgstr "Người dùng xem"
 
 # Name: don't translate/Tên: đừng dịch
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
 msgid "Stanza Encryption"
 msgstr "Mật mã đoạn dòng"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
 msgstr "Thời gian thực thể"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
 msgstr "Phát trễ"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
 msgstr "Đối tượng dữ liệu hợp tác"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
 msgstr "Kho lưu tập tin và chia sẻ"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
 msgstr "Phát hiện dịch vụ STUN cho Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Dàn xếp phiên chạy mật mã đơn giản"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
 msgstr "Kiểm tra bước"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Capabilities"
 msgstr "Khả năng"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1094
-msgid "Resource"
-msgstr "Tài nguyên"
-
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1598
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
 msgid "Priority"
 msgstr "Ưu tiên"
 
-#: ../libpurple/protocols/jabber/buddy.c:1239
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Tài nguyên"
+
 msgid "Middle Name"
 msgstr "Tên đệm"
 
-#: ../libpurple/protocols/jabber/buddy.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: ../libpurple/protocols/jabber/buddy.c:1278
 msgid "P.O. Box"
 msgstr "Hòm thư"
 
-#: ../libpurple/protocols/jabber/buddy.c:1388
 msgid "Photo"
 msgstr "Ảnh chụp"
 
-#: ../libpurple/protocols/jabber/buddy.c:1388
 msgid "Logo"
 msgstr "Biểu hình"
 
-#: ../libpurple/protocols/jabber/buddy.c:1947
 msgid "Un-hide From"
 msgstr "Thôi ẩn từ"
 
-#: ../libpurple/protocols/jabber/buddy.c:1951
 msgid "Temporarily Hide From"
 msgstr "Ẩn tạm thời từ"
 
-#.&& NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1959
+#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Thôi thông báo có mặt"
 
-#: ../libpurple/protocols/jabber/buddy.c:1966
 msgid "(Re-)Request authorization"
 msgstr "Yêu cầu (lại) sư cho phép"
 
-#.if(NOT ME)
-#.shouldn't this just happen automatically when the buddy is
-#.removed?
-#: ../libpurple/protocols/jabber/buddy.c:1975
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
 msgid "Unsubscribe"
 msgstr "Hủy đăng ký"
 
-#: ../libpurple/protocols/jabber/buddy.c:1990
 msgid "Log In"
 msgstr "Đăng xuất"
 
-#: ../libpurple/protocols/jabber/buddy.c:1994
 msgid "Log Out"
 msgstr "Đăng xuất"
 
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Chatty"
 msgstr "Thích chát"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
 msgid "Extended Away"
 msgstr "Vắng mắt lâu"
 
-#: ../libpurple/protocols/jabber/buddy.c:2046
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/sametime/sametime.c:3339
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Xin đừng quấy rầy"
 
-#: ../libpurple/protocols/jabber/buddy.c:2213
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2406
-#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "Last Name"
 msgstr "Họ"
 
-#: ../libpurple/protocols/jabber/buddy.c:2249
 msgid "The following are the results of your search"
 msgstr "Dưới đây là kết quả tìm kiếm"
 
-#.current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2334
+#. current comment from Jabber User Directory users.jabber.org
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
-msgstr "Tìm liên lạc bằng cách gõ vào trường tiêu chuẩn tìm kiếm. Ghi chú : mỗi trường cũng hỗ trợ tìm kiếm bằng ký tự đại diện (%)"
+msgstr ""
+"Tìm liên lạc bằng cách gõ vào trường tiêu chuẩn tìm kiếm. Ghi chú : mỗi "
+"trường cũng hỗ trợ tìm kiếm bằng ký tự đại diện (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2354
 msgid "Directory Query Failed"
 msgstr "Truy vấn danh bạ bị lỗi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2355
 msgid "Could not query the directory server."
 msgstr "Không thể hỏi máy phục vụ danh bạ."
 
-#.Try to translate the message (see static message
-#.list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2389
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Hướng dẫn máy phục vụ : %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2396
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Điền vào một hay nhiều mục để tìm thông tin về người dùng XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:2416
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Email Address"
-msgstr "Địa chỉ thư"
+msgstr "Địa chỉ thư điện tử"
 
-#: ../libpurple/protocols/jabber/buddy.c:2425
-#: ../libpurple/protocols/jabber/buddy.c:2426
 msgid "Search for XMPP users"
 msgstr "Tìm người dùng XMPP"
 
-#.Search
-#: ../libpurple/protocols/jabber/buddy.c:2427
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5657
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
+#. "Search"
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../libpurple/protocols/jabber/buddy.c:2442
 msgid "Invalid Directory"
 msgstr "Thư mục không hợp lệ"
 
-#: ../libpurple/protocols/jabber/buddy.c:2459
 msgid "Enter a User Directory"
 msgstr "Nhập thư mục người dùng"
 
-#: ../libpurple/protocols/jabber/buddy.c:2460
 msgid "Select a user directory to search"
 msgstr "Chọn một thư mục người dùng trong đó cần tìm kiếm"
 
-#: ../libpurple/protocols/jabber/buddy.c:2463
 msgid "Search Directory"
 msgstr "Thư mục tìm kiếm"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5313
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Phòng:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Máy phục vụ :"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "Tên _hiệu :"
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s không phải là tên phòng hợp lệ."
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Tên phòng không hợp lệ"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s không phải tên máy phục vụ hợp lệ"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Tên máy phục vụ không hợp lệ"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s không phải một tên hiệu phòng hợp lệ"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Tên hiệu phòng không hợp lệ"
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Không thể cấu hình"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Lỗi cấu hình phòng"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Phòng này không có tính năng cấu hình"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Lỗi đăng ký"
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Không hỗ trợ việc thay đổi tên hiệu trong các phòng chát không phải MUC (trò chuyện đa người dùng)"
+msgstr ""
+"Không hỗ trợ việc thay đổi tên hiệu trong các phòng chát không phải MUC (trò "
+"chuyện đa người dùng)"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Lỗi lấy danh sách phòng"
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Máy phục vụ không hợp lệ"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Nhập máy phục vụ hội thảo"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Chọn một máy phục vụ hội thảo để hỏi"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Tìm phòng"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Bạn cần mật mã, nhưng máy phục vụ này không cung cấp."
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Lỗi ghi"
 
-#: ../libpurple/protocols/jabber/jabber.c:399
 msgid "Ping timeout"
 msgstr "Quá hạn ping"
 
-#: ../libpurple/protocols/jabber/jabber.c:444
-#: ../libpurple/protocols/jabber/jabber.c:483
 msgid "Read Error"
 msgstr "Lỗi đọc"
 
-#: ../libpurple/protocols/jabber/jabber.c:520
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2562
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
-msgstr "Không thể thiết lập kết nối đến máy phục vụ :\n"
+msgstr ""
+"Không thể thiết lập kết nối đến máy phục vụ :\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:571
 msgid "Unable to create socket"
 msgstr "Không thể tạo ổ cắm"
 
-#: ../libpurple/protocols/jabber/jabber.c:619
-#: ../libpurple/protocols/jabber/jabber.c:1104
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP không hợp lệ"
 
-#: ../libpurple/protocols/jabber/jabber.c:626
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP không hợp lệ. Phải đặt miền (domain)."
 
-#: ../libpurple/protocols/jabber/jabber.c:704
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Đăng ký thành công %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:710
 #, c-format
 msgid "Registration to %s successful"
-msgstr ""
-#msgstr "Đăng ký thành công với %s@%"
+msgstr "Đăng ký thành công với %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:712
-#: ../libpurple/protocols/jabber/jabber.c:713
 msgid "Registration Successful"
 msgstr "Đăng ký thành công"
 
-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Registration Failed"
 msgstr "Lỗi đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:740
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Đăng ký với %s đã được gỡ bỏ"
 
-#: ../libpurple/protocols/jabber/jabber.c:742
-#: ../libpurple/protocols/jabber/jabber.c:743
 msgid "Unregistration Successful"
 msgstr "Hủy đăng ký thành công"
 
-#: ../libpurple/protocols/jabber/jabber.c:751
-#: ../libpurple/protocols/jabber/jabber.c:752
 msgid "Unregistration Failed"
 msgstr "Lỗi hủy đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:918
-#: ../libpurple/protocols/jabber/jabber.c:919
 msgid "Already Registered"
 msgstr "Đã đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:1006
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "State"
 msgstr "Bang"
 
-#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Postal code"
 msgstr "Mã vùng"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: ../libpurple/protocols/jabber/jabber.c:1022
 msgid "Date"
 msgstr "Ngày tháng"
 
-#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Unregister"
 msgstr "Hủy đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "Hãy điền thông tin bên dưới để thay đổi sự đăng ký tài khoản của bạn."
 
-#: ../libpurple/protocols/jabber/jabber.c:1036
 msgid "Please fill out the information below to register your new account."
 msgstr "Hãy điền thông tin bên dưới để đăng ký tài khoản mới cho bạn."
 
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/jabber/jabber.c:1045
 msgid "Register New XMPP Account"
 msgstr "Đăng ký tài khoản XMPP mới"
 
-#: ../libpurple/protocols/jabber/jabber.c:1046
-#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Register"
 msgstr "Đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:1051
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Đổi sự đăng ký tài khoản ở %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Đăng ký tài khoản mới ở %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Change Registration"
 msgstr "Đổi sự đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:1163
-#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "Error unregistering account"
 msgstr "Lỗi hủy đăng ký tài khoản"
 
-#: ../libpurple/protocols/jabber/jabber.c:1169
-#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Account successfully unregistered"
 msgstr "Hủy đăng ký thành công tài khoản"
 
 # Stream is a name, in this case: don't translate/Stream là tên trong trường hợp này: đừng dịch
-#: ../libpurple/protocols/jabber/jabber.c:1330
 msgid "Initializing Stream"
 msgstr "Đang khởi tạo Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1335
 msgid "Initializing SSL/TLS"
 msgstr "Đang khởi tạo SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1339
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "Đang xác thực"
 
 # Stream is a name, in this case: don't translate/Stream là tên trong trường hợp này: đừng dịc
-#: ../libpurple/protocols/jabber/jabber.c:1348
 msgid "Re-initializing Stream"
 msgstr "Đang khởi tạo lại Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
-#: ../libpurple/protocols/jabber/jabber.c:1894
-#: ../libpurple/protocols/jabber/jabber.c:1937
-#: ../libpurple/protocols/jabber/jabber.c:1975
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5627
 msgid "Not Authorized"
 msgstr "Không cho phép"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Both"
 msgstr "Cả hai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "From (To pending)"
 msgstr "Từ (chưa điền Cho)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "From"
 msgstr "Từ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "To"
 msgstr "Cho"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
 msgid "None (To pending)"
 msgstr "Không (chưa điền Cho)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Không"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Subscription"
 msgstr "Đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
-#: ../libpurple/protocols/jabber/jabber.c:1517
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Tâm trạng"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
-#: ../libpurple/protocols/msn/msn.c:647
-msgid "Current media"
-msgstr "Vật chứa hiện thời"
+msgid "Now Listening"
+msgstr "Đang nghe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
 msgid "Mood Text"
 msgstr "Kiểm tra tâm trạng"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1617
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#: ../libpurple/protocols/jabber/jabber.c:1645
 msgid "Allow Buzz"
 msgstr "Cho phép kêu gọi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1663
 msgid "Tune Artist"
 msgstr "Nghệ sĩ điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1664
 msgid "Tune Title"
 msgstr "Tên điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Tune Album"
 msgstr "Tập nhạc điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Tune Genre"
 msgstr "Loại điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Tune Comment"
 msgstr "Chú thích điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1668
 msgid "Tune Track"
 msgstr "Rãnh điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1669
 msgid "Tune Time"
 msgstr "Thời gian điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
 msgid "Tune Year"
 msgstr "Năm điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Tune URL"
 msgstr "URL điệu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Password Changed"
 msgstr "Mật khẩu đã đổi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1688
 msgid "Your password has been changed."
 msgstr "Mật khẩu của bạn đã được thay đổi."
 
-#: ../libpurple/protocols/jabber/jabber.c:1694
-#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Error changing password"
 msgstr "Lỗi khi thay đổi mật khẩu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1752
 msgid "Password (again)"
 msgstr "Nhập lại mật khẩu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
-#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Change XMPP Password"
 msgstr "Đổi mật khẩu XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Please enter your new password"
 msgstr "Hãy nhập mật khẩu mới của bạn"
 
-#: ../libpurple/protocols/jabber/jabber.c:1773
-#: ../libpurple/protocols/oscar/oscar.c:6413
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Lập thông tin người dùng..."
 
-#.if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1778
-#: ../libpurple/protocols/oscar/oscar.c:6424
-#: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1000
+#. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
 msgstr "Đổi mật khẩu..."
 
-#.}
-#: ../libpurple/protocols/jabber/jabber.c:1783
+#. }
 msgid "Search for Users..."
 msgstr "Tìm người dùng..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1874
 msgid "Bad Request"
 msgstr "Yêu cầu sai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid "Conflict"
 msgstr "Xung đột"
 
-#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid "Feature Not Implemented"
 msgstr "Tính năng chưa được thi hành."
 
-#: ../libpurple/protocols/jabber/jabber.c:1880
 msgid "Forbidden"
 msgstr "Cấm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
 msgid "Gone"
 msgstr "Không còn nữa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1884
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Internal Server Error"
 msgstr "Lỗi tại máy phục vụ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1886
 msgid "Item Not Found"
 msgstr "Không tìm thấy"
 
-#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Malformed XMPP ID"
 msgstr "ID XMPP dạng sai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Not Acceptable"
 msgstr "Không thích hợp"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Not Allowed"
 msgstr "Không cho phép"
 
-#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Payment Required"
 msgstr "Yêu cầu trả tiền"
 
-#: ../libpurple/protocols/jabber/jabber.c:1898
 msgid "Recipient Unavailable"
 msgstr "Người nhận không sẵn sàng"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Registration Required"
 msgstr "Yêu cầu đăng ký"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Remote Server Not Found"
 msgstr "Không tìm thấy máy phục vụ từ xa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Remote Server Timeout"
 msgstr "Quá hạn máy phục vụ từ xa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Server Overloaded"
 msgstr "Quá tải máy phục vụ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1910
 msgid "Service Unavailable"
 msgstr "Dịch vụ không sẵn sàng"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Subscription Required"
 msgstr "Yêu cầu góp tiền"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Unexpected Request"
 msgstr "Yêu cầu bất thường"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Authorization Aborted"
 msgstr "Tiến trình cho phép bị hủy bỏ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Incorrect encoding in authorization"
 msgstr "Gặp bảng mã không đúng trong tiến trình cho phép"
 
-#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Invalid authzid"
 msgstr "ID cho phép không hợp lệ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Invalid Authorization Mechanism"
 msgstr "Cơ chế cho phép không hợp lệ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Authorization mechanism too weak"
 msgstr "Cơ chế cho phép quá yếu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Temporary Authentication Failure"
 msgstr "Lỗi xác thực tạm thời"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Authentication Failure"
 msgstr "Lỗi xác thực"
 
-#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Bad Format"
 msgstr "Định dạng sai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Bad Namespace Prefix"
 msgstr "Tiền tố khoảng tên sai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Resource Conflict"
 msgstr "Xung đột tài nguyên"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Quá hạn tạo kết nối"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Host Gone"
 msgstr "Máy không còn nữa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Host Unknown"
 msgstr "Máy không rõ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Improper Addressing"
 msgstr "Sai đặt địa chỉ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "Invalid ID"
 msgstr "ID không hợp lệ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Invalid Namespace"
 msgstr "Khoảng tên không hợp lệ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Invalid XML"
 msgstr "XML không hợp lệ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Non-matching Hosts"
 msgstr "Sai khớp máy"
 
-#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Policy Violation"
 msgstr "Vi phạm chính sách"
 
-#: ../libpurple/protocols/jabber/jabber.c:1979
 msgid "Remote Connection Failed"
 msgstr "Lỗi kết nối từ xa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Constraint"
 msgstr "Ràng buộc tài nguyên"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Restricted XML"
 msgstr "XML bị hạn chế"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "See Other Host"
 msgstr "Xem máy khác"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "System Shutdown"
 msgstr "Hệ thống đã tắt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Undefined Condition"
 msgstr "Điều kiện chưa được định nghĩa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Unsupported Encoding"
 msgstr "Bảng mã không được hỗ trợ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Unsupported Stanza Type"
 msgstr "Loại đoạn dòng không được hỗ trợ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Unsupported Version"
 msgstr "Phiên bản không được hỗ trợ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "XML Not Well Formed"
 msgstr "XML dạng sai"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Stream Error"
 msgstr "Lỗi Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:2084
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Không thể cấm người dùng %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2104
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Sự nhập hội không rõ : « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:2109
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Không thể nhập hội người dùng %s như « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:2128
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Nhiệm vụ không rõ : « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:2133
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Không thể đặt nhiệm vụ « %s » cho người dùng: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2186
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Không thể đá người dùng %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2217
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Không thể gửi tin hiệu ping cho người dùng %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2235
-#: ../libpurple/protocols/jabber/jabber.c:2246
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Không thể kêu gọi vì không biết gì về người dùng %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2241
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Không thể kêu gọi, vì người dùng %s có thể chưa đăng nhập."
 
-#: ../libpurple/protocols/jabber/jabber.c:2272
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Không thể kêu gọi, vì người dùng %s không hỗ trợ."
 
-#: ../libpurple/protocols/jabber/jabber.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
 msgid "Buzz"
 msgstr "Kêu gọi"
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4132
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s đã kêu gọi bạn !"
 
-#: ../libpurple/protocols/jabber/jabber.c:2296
-#: ../libpurple/protocols/yahoo/yahoo.c:4133
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Đang kêu gọi %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2328
 msgid "config:  Configure a chat room."
 msgstr "config:  (viết tắt) cấu hình một phòng trò chuyện."
 
-#: ../libpurple/protocols/jabber/jabber.c:2332
 msgid "configure:  Configure a chat room."
 msgstr "configure:  cấu hình một phòng trò chuyện."
 
-#: ../libpurple/protocols/jabber/jabber.c:2341
 msgid "part [room]:  Leave the room."
 msgstr "part [phòng]:  Rời khỏi phòng."
 
-#: ../libpurple/protocols/jabber/jabber.c:2346
 msgid "register:  Register with a chat room."
 msgstr "register:  Đăng ký vào một phòng trò chuyện."
 
-#: ../libpurple/protocols/jabber/jabber.c:2352
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [chủ đề mới]:  Xem hay thay đổi chủ đề."
 
-#: ../libpurple/protocols/jabber/jabber.c:2358
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;người_dùng&gt; [phòng]:  Cấm một người dùng ra khỏi phòng."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;người_dùng&gt; [lý_do]:  Cấm một người dùng ra khỏi phòng."
 
-#: ../libpurple/protocols/jabber/jabber.c:2364
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
-msgstr "affiliate &lt;người_dùng&gt; &lt;owner|admin|member|outcast|none&gt;: Đặt tư "
+msgstr ""
+"affiliate &lt;người_dùng&gt; &lt;owner|admin|member|outcast|none&gt;: Đặt tư "
 "cách người dùng trong phòng\n"
-" • owner		người sở hữu\n"
-" • admin		quản trị\n"
-" • member	thành viên\n"
-" • outcast	người bị ruồng bỏ\n"
-" • none		không có."
+" • owner\t\tngười sở hữu\n"
+" • admin\t\tquản trị\n"
+" • member\tthành viên\n"
+" • outcast\tngười bị ruồng bỏ\n"
+" • none\t\tkhông có."
 
-#: ../libpurple/protocols/jabber/jabber.c:2370
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
-msgstr "role &lt;người_dùng&gt; &lt;moderator|participant|visitor|none&gt;: Đặt nghiệm vụ của người dùng trong phòng\n"
-" • moderator		điều tiết viên\n"
-" • participant		người tham gia\n"
-" • visitor			người thăm\n"
-" • none			không có."
+msgstr ""
+"role &lt;người_dùng&gt; &lt;moderator|participant|visitor|none&gt;: Đặt "
+"nghiệm vụ của người dùng trong phòng\n"
+" • moderator\t\tđiều tiết viên\n"
+" • participant\t\tngười tham gia\n"
+" • visitor\t\t\tngười thăm\n"
+" • none\t\t\tkhông có."
 
-#: ../libpurple/protocols/jabber/jabber.c:2376
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;người_dùng&gt; [thông_điệp]:  Mời một người dùng vào phòng."
 
-#: ../libpurple/protocols/jabber/jabber.c:2382
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;phòng&gt; [máy_phục_vụ]:  Tham gia chát trên máy phục vụ này."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;phòng&gt; [mật_khẩu]:  Tham gia chát trên máy phục vụ này."
 
-#: ../libpurple/protocols/jabber/jabber.c:2388
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;người_dùng&gt; [phòng]: Đá người dùng ra khỏi phòng."
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;người_dùng&gt; [lý_do]: Đá người dùng ra khỏi phòng."
 
-#: ../libpurple/protocols/jabber/jabber.c:2393
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;người_dùng&gt; &lt;thông_điệp&gt;:  Gởi thông điệp riêng đến một người dùng khác."
+msgstr ""
+"msg &lt;người_dùng&gt; &lt;thông_điệp&gt;:  Gởi thông điệp riêng đến một "
+"người dùng khác."
 
-#: ../libpurple/protocols/jabber/jabber.c:2399
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr "ping &lt;jid&gt;:\tGửi tín hiệu ping cho một người dùng/thành phần/máy phục vụ."
+msgstr ""
+"ping &lt;jid&gt;:\tGửi tín hiệu ping cho một người dùng/thành phần/máy phục "
+"vụ."
 
-#: ../libpurple/protocols/jabber/jabber.c:2404
-#: ../libpurple/protocols/yahoo/yahoo.c:4157
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Kêu gọi một bạn chát để gây chú ý"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "XMPP Protocol Plugin"
 msgstr "Phần bổ sung giao thức XMPP"
 
-#.Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205
-#: ../pidgin/gtkaccount.c:496
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
 msgid "Domain"
 msgstr "Miền"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Cần thiết SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Buộc dùng SSL cũ (cổng 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Cho phép xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3334
-#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "Cổng kết nối"
 
-#.TODO: default to automatically try different ports. Make the user be
-#.* able to set the first port to try (like LastConnectedPort in Windows client).
-#.Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3331
-#: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1857
-#: ../pidgin/gtkaccount.c:827
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
 msgid "Connect server"
 msgstr "Máy phục vụ kết nối"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "Ủy nhiệm truyền tập tin"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s đã rời cuộc thoại."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Tin nhẳn từ %s"
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s đặt chủ đề là: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Chủ đề: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Không gửi được tin nhẳn tới %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Lỗi thông điệp XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
-msgid " (Code %s)"
-msgstr " (Mã %s)"
+msgid "(Code %s)"
+msgstr "(Mã %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Lỗi phân tích XML"
 
-#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr "Gặp lỗi không rõ trong sự có mặt"
 
-#: ../libpurple/protocols/jabber/presence.c:522
-#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "Tạo phòng mới"
 
-#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
-msgstr "Bạn đang tạo phòng mới. Bạn muốn cấu hình nó không hoặc chấp nhận các thiết "
+msgstr ""
+"Bạn đang tạo phòng mới. Bạn muốn cấu hình nó không hoặc chấp nhận các thiết "
 "lập mặc định?"
 
-#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "_Cấu hình phòng"
 
-#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "Chấp nhận _mặc định"
 
-#: ../libpurple/protocols/jabber/presence.c:573
-#, c-format
-msgid "Error in chat %s"
-msgstr "Lỗi trong chát %s"
-
-#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Lỗi vào chát %s"
 
-#: ../libpurple/protocols/jabber/si.c:1009
+#, c-format
+msgid "Error in chat %s"
+msgstr "Lỗi trong chát %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Không thể gửi tập tin cho %s, người dùng không hỗ trợ truyền tải tập tin"
+msgstr ""
+"Không thể gửi tập tin cho %s, người dùng không hỗ trợ truyền tải tập tin"
 
-#: ../libpurple/protocols/jabber/si.c:1010
-#: ../libpurple/protocols/jabber/si.c:1011
-#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Không gửi được tập tin"
 
-#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Không thể gửi tập tin cho %s, JID không hợp lệ"
 
-#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Không thể gửi tập tin cho %s, người dùng chưa kết nối"
 
-#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Không thể gửi tập tin cho %s, không đăng ký với sự có mặt của người dùng"
+msgstr ""
+"Không thể gửi tập tin cho %s, không đăng ký với sự có mặt của người dùng"
 
-#: ../libpurple/protocols/jabber/si.c:1092
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Hãy chọn tài nguyên nào của %s cho đó bạn muốn gửi tập tin"
 
-#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "Chọn tài nguyên"
 
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "Sửa tâm trạng người dùng"
 
-#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Hãy chọn tâm trạng trong danh sách này."
 
-#: ../libpurple/protocols/jabber/usermood.c:201
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Đặt"
 
-#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "Đặt tâm trạng..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Đặt tên hiệu người dùng"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Hãy ghi rõ tên hiệu mới cho bạn."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr "Thông tin này hiện rõ cho mọi liên lạc trên danh sách liên lạc: khuyên bạn chọn một tên thích hợp."
+msgstr ""
+"Thông tin này hiện rõ cho mọi liên lạc trên danh sách liên lạc: khuyên bạn "
+"chọn một tên thích hợp."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Đặt tên hiệu..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
 msgstr "Hành động"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 msgid "Select an action"
 msgstr "Chọn hành động"
 
-#: ../libpurple/protocols/msn/contact.c:712
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Không thể lấy Sổ địa chỉ MSN"
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Vấn đề đồng bộ hoá danh sách bạn bè trong %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/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 trên danh sách cục bộ nằm trong nhóm « %s » nhưng không có trong danh "
-"sách máy phục vụ. Bạn có muốn thêm bạn thân này không?"
+msgstr ""
+"%s trên danh sách cục bộ nằm trong nhóm « %s » nhưng không có trong danh sách "
+"máy phục vụ. Bạn có muốn thêm bạn thân này không?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/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 nằm trên danh sách cục bộ nhưng không nằm trên danh sách máy phục vụ. Bạn "
+msgstr ""
+"%s nằm trên danh sách cục bộ nhưng không nằm trên danh sách máy phục vụ. Bạn "
 "có muốn thêm bạn thân này không?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Không thể phân tích tin nhẳn"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Lỗi cú pháp (có thể trình khách bị lỗi)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr "Địa chỉ thư điện tử không hợp lệ"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Người dùng đó không tồn tại."
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Thiếu tên miền đăng ký hoàn chỉnh (FQDN)"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Đã đăng nhập"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
-msgid "Invalid screen name"
-msgstr "Tên hiển thị không hợp lệ"
+#, c-format
+msgid "Invalid username"
+msgstr "Tên người dùng không hợp lệ"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Tên thân thiện không hợp lệ"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Danh sách đã đầy"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Đã ở đó"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Không trong danh sách"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "Người dùng chưa kết nối"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Đã trong chế độ này"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Đã trong danh sách đối diện"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Quá nhiều nhóm"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Nhóm không hợp lệ"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Người dùng không có trong nhóm"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Tên nhóm quá dài"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Không thể gỡ bỏ nhóm số không"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Cố thêm một người dùng vào một nhóm không tồn tại"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Hệ thống chuyển mạch bị lỗi"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Lỗi thông báo truyền"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Thiếu các trường được yêu cầu"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Có quá kết quả tới FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "Chưa đăng nhập"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tạm thời không có dịch vụ"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Có lỗi tại máy phục vụ cơ sở dữ liệu"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Lệnh bị tắt"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Lỗi thực thi tập tin"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Lỗi cấp phát bộ nhớ"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Giá trị CHL gửi tới máy phục vụ bị sai"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Máy phục vụ bận"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Máy phục vụ không sẵn sàng"
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Máy phục vụ thông báo ngang hàng ngừng hoạt động"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Có lỗi khi kết nối tới cơ sở dữ liệu"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Máy phục vụ đang ngừng (rời đi)"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Lỗi khi tạo kết nối"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Tham số CVR hoặc không rõ hoặc không được phép"
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Không thể ghi"
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Phiên kết nối quá tải"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Người dùng quá hoạt náo"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Quá nhiều phiên kết nối"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Tập tin bạn bè hỏng"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Bất thường"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Tên thân thiện thay đổi quá nhanh"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Máy phục vụ quá bận"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1375
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1393
+#, c-format
 msgid "Authentication failed"
 msgstr "Không xác thực được"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Không được phép khi chưa kết nối"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Không chấp nhận người dùng mới"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport của trẻ không có sự đồng ý của cha mẹ"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Tài khoản Passport chưa được thẩm định"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Phiếu sai"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Mã lỗi không rõ %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Lỗi MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
-#: ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
 msgstr "Làm nổi bật"
 
-#: ../libpurple/protocols/msn/msn.c:131
-#: ../libpurple/protocols/msnp9/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s đã làm bạn nổi bật !"
 
-#: ../libpurple/protocols/msn/msn.c:132
-#: ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr "Đang làm nổi bật %s..."
 
-#: ../libpurple/protocols/msn/msn.c:174
-#: ../libpurple/protocols/msnp9/msn.c:174
+msgid "Email Address..."
+msgstr "Địa chỉ thư điện tử..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Tên thân mật MSN bạn đặt quá dài."
 
-#: ../libpurple/protocols/msn/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "Đặt tên thân mật của bạn"
 
-#: ../libpurple/protocols/msn/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Người dùng MSN khác sẽ nhìn thấy bạn với tên này."
 
-#: ../libpurple/protocols/msn/msn.c:305
-#: ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "Nhập số điện thoại nhà."
 
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "Nhập số điện thoại chỗ làm."
 
-#: ../libpurple/protocols/msn/msn.c:339
-#: ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Nhập số điện thoại di động,"
 
-#: ../libpurple/protocols/msn/msn.c:354
-#: ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Cho phép nhắn tin vào di động MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:355
-#: ../libpurple/protocols/msnp9/msn.c:351
 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 "Bạn muốn cho phép hoặc cấm người khác (trên danh sách bạn bè) gửi tin nhắn "
-"MSN Mobile vào điện thoại di động hay thiết bị di động nào khác của bạn hay không?"
+msgstr ""
+"Bạn muốn cho phép hoặc cấm người khác (trên danh sách bạn bè) gửi tin nhắn "
+"MSN Mobile vào điện thoại di động hay thiết bị di động nào khác của bạn hay "
+"không?"
 
-#: ../libpurple/protocols/msn/msn.c:361
-#: ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "Cho phép"
 
-#: ../libpurple/protocols/msn/msn.c:362
-#: ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "Cấm"
 
-#: ../libpurple/protocols/msn/msn.c:378
-#: ../libpurple/protocols/msnp9/msn.c:374
-msgid "This Hotmail account may not be active."
+#, fuzzy, c-format
+msgid "Blocked Text for %s"
+msgstr "Chú thích bạn chát về %s"
+
+#, fuzzy
+msgid "No text is blocked for this account."
+msgstr "Dùng biểu tượng bạn chát cho tài khoản này:"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+#, fuzzy
+msgid "This account does not have email enabled."
 msgstr "Tài khoản Hotmail này có lẽ chưa kích hoạt."
 
-#: ../libpurple/protocols/msn/msn.c:404
-#: ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "Gửi tin nhắn tới di động."
 
-#: ../libpurple/protocols/msn/msn.c:406
-#: ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "Nhắn tin"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+msgid "Home Phone Number"
+msgstr "Số điện thoại ở nhà"
+
+msgid "Work Phone Number"
+msgstr "Số điện thoại chỗ làm"
+
+msgid "Mobile Phone Number"
+msgstr "Số điện thoại di động"
+
 msgid "Be Right Back"
 msgstr "Sẽ quay lại ngay"
 
-#: ../libpurple/protocols/msn/msn.c:694
-#: ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "Busy"
 msgstr "Đang bận"
 
-#: ../libpurple/protocols/msn/msn.c:699
-#: ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3099
-#: ../libpurple/protocols/yahoo/yahoo.c:3788
 msgid "On the Phone"
 msgstr "Đang bận nói điện thoại"
 
-#: ../libpurple/protocols/msn/msn.c:704
-#: ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3103
-#: ../libpurple/protocols/yahoo/yahoo.c:3794
 msgid "Out to Lunch"
 msgstr "Đi ăn trưa"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
 msgid "Artist"
 msgstr "Nghệ sĩ"
 
 # Tên của ứng dụng khách tin nhắn khác: đừng dịch.
-#: ../libpurple/protocols/msn/msn.c:724
 msgid "Album"
 msgstr "Tập nhạc"
 
-#: ../libpurple/protocols/msn/msn.c:742
-#: ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Đặt tên thân mật..."
 
-#: ../libpurple/protocols/msn/msn.c:747
-#: ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Đặt số điện thoại nhà..."
 
-#: ../libpurple/protocols/msn/msn.c:751
-#: ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Đặt số điện thoại chỗ làm..."
 
-#: ../libpurple/protocols/msn/msn.c:755
-#: ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Đặt số điện thoại di động..."
 
-#: ../libpurple/protocols/msn/msn.c:761
-#: ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Bật/tắt thiết bị di động..."
 
-#: ../libpurple/protocols/msn/msn.c:766
-#: ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Cho phép/Cấm tin nhắn tới thiết bị di động..."
 
-#: ../libpurple/protocols/msn/msn.c:777
-#: ../libpurple/protocols/msnp9/msn.c:658
+msgid "View Blocked Text..."
+msgstr ""
+
 msgid "Open Hotmail Inbox"
 msgstr "Mở hộp thư đến Hotmail."
 
-#: ../libpurple/protocols/msn/msn.c:801
-#: ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "Gửi tới thiết bị di động"
 
-#: ../libpurple/protocols/msn/msn.c:811
-#: ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "Khởi tạo _Chát"
 
-#: ../libpurple/protocols/msn/msn.c:849
-#: ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN yêu cầu có hỗ trợ SSL. Hãy cài đặt thư viện SSL được hỗ trợ."
 
-#: ../libpurple/protocols/msn/msn.c:879
-#: ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "Không kết nối được với máy phục vụ."
 
-#: ../libpurple/protocols/msn/msn.c:1663
-#: ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Lỗi lấy lý lịch"
 
-#: ../libpurple/protocols/msn/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582
-#: ../pidgin/plugins/convcolors.c:366
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Ghung"
 
-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3736
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Tuổi"
 
-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Công việc"
 
-#: ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Nơi ở"
 
-#: ../libpurple/protocols/msn/msn.c:1744
-#: ../libpurple/protocols/msn/msn.c:1936
-#: ../libpurple/protocols/msn/msn.c:1942
-#: ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "Sở thích"
 
-#: ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876
-#: ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1891
-#: ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "Đôi chút về bản thân"
 
-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "Xã hội"
 
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Tình trạng hôn nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "Sở thích"
 
-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "Con vật nuôi"
 
-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "Nhà thì"
 
-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "Nơi đã ở"
 
-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "Mốt"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "Hài hước"
 
-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "Âm nhạc"
 
-#: ../libpurple/protocols/msn/msn.c:1777
-#: ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Câu trích dẫn ưa thích"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "Thông tin liên lạc"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "Vợ/chồng"
 
-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "Điện thoại nhà"
 
-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "Điện thoại nhà 2"
 
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Home Address"
 msgstr "Địa chỉ nhà"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "Điện thoại di động cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "Điện thư nhà"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal Email"
 msgstr "Thư điện tử cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "Tin nhắn cá nhân"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "Kỷ niệm"
 
-#.Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
+#. Business
 msgid "Work"
 msgstr "Việc làm"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Chức danh"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Company"
 msgstr "Công ty"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Phòng ban"
 
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "Nghề"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "Điện thoại chỗ làm"
 
-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "Điện thoại chỗ làm 2"
 
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3787
 msgid "Work Address"
 msgstr "Địa chỉ chỗ làm"
 
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "Điện thoại di động việc làm"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "Máy nhắn tin việc làm"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "Điện thư chỗ làm"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work Email"
 msgstr "Thư điện tử việc làm"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "Tin nhắn việc làm"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "Ngày bắt đầu"
 
-#: ../libpurple/protocols/msn/msn.c:1907
-#: ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "Những thứ yêu thích"
 
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "Cập nhật lần cuối"
 
-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: ../libpurple/protocols/msn/msn.c:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "Người dùng này chưa tạo lý lịch công cộng."
 
-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
 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 "MSN cho biết không tìm thấy lý lịch của người dùng này. Điều này nghĩa là người "
-"dùng không tồn tại, hay người dùng chưa tạo lý lịch công cộng."
+msgstr ""
+"MSN cho biết không tìm thấy lý lịch của người dùng này. Điều này nghĩa là "
+"người dùng không tồn tại, hay người dùng chưa tạo lý lịch công cộng."
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
-msgstr "Không tìm thấy thông tin trong lý lịch của người dùng này. Người này rất có "
+msgstr ""
+"Không tìm thấy thông tin trong lý lịch của người dùng này. Người này rất có "
 "thể không tồn tại."
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL lý lịch"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/msn/msn.c:2307
-#: ../libpurple/protocols/msn/msn.c:2309
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Phần bổ sung giao thức Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "Dùng phương thức HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
 msgstr "Máy phục vụ phương thức HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Hiển thị hình cười tự chọn"
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: làm nổi bật một liên lạc để thu hút sự chú ý"
 
-#: ../libpurple/protocols/msn/nexus.c:70
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Xác thực ID Windows Live: không thể kết nối"
 
-#.we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:126
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr "Xác thực ID Windows Live: không tìm thấy hiệu bài xác thực trong đáp ứng máy phục vụ"
-
-#: ../libpurple/protocols/msn/nexus.c:172
-msgid "Windows Live ID authentication Failed"
-msgstr "Không xác thực được ID Windows Live"
+#, fuzzy
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Xác thực ID Windows Live: không thể kết nối"
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s không phải là nhóm hợp lệ."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:388
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "Lỗi không rõ."
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s trên %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vừa gửi cho bạn một lời kêu gọi."
 
-#: ../libpurple/protocols/msn/notification.c:836
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Lỗi không rõ (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
 msgid "Unable to add user"
 msgstr "Không thể thêm người dùng"
 
-#: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Không thể thêm người dùng trên %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Không thể chận người dùng trên %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Không thể cho phép người dùng trên %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s không thể được thêm vào vì danh sách bạn bè của bạn đã đầy"
 
-#: ../libpurple/protocols/msn/notification.c:922
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s không phải tài khoản Passport hợp lệ."
 
-#: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Tạm thời không có dịch vụ."
 
-#: ../libpurple/protocols/msn/notification.c:1276
-#: ../libpurple/protocols/msnp9/notification.c:866
+#, fuzzy
+msgid "Mobile message was not sent because it was too long."
+msgstr "Tin nhẳn chưa gửi đi được vì bạn chưa đăng nhập."
+
 msgid "Unable to rename group"
 msgstr "Không thể thay đổi tên của nhóm"
 
-#: ../libpurple/protocols/msn/notification.c:1331
-#: ../libpurple/protocols/msnp9/notification.c:921
 msgid "Unable to delete group"
 msgstr "Không thể xoá nhóm"
 
-#: ../libpurple/protocols/msn/notification.c:1945
-#: ../libpurple/protocols/msnp9/notification.c:1340
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7639,4210 +5297,3158 @@ msgid ""
 "\n"
 "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 "
+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"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] "Máy phục vụ MSN sẽ tắt trong vòng %d phút nữa để bảo trì. Bạn sẽ được tự "
+msgstr[0] ""
+"Máy phục vụ MSN sẽ tắt trong vòng %d phút nữa để bảo trì. Bạn sẽ được tự "
 "động ngắt kết nối vào lúc đó. Hãy kết thúc mọi cuộc thoại đang diễn ra.\n"
 "\n"
 "Sau khi hoàn tất việc bảo trì, bạn có thể kết nối trở lại như bình thường."
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+#, fuzzy
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Thông điệp không gửi đi được vì gửi quá nhanh:"
+
+#, fuzzy
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
+
+#, fuzzy
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
+
 msgid "Unable to connect"
 msgstr "Không thể kết nối"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Lỗi ghi"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Lỗi đọc"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
-msgstr "Lỗi kết nối từ máy phục vụ %s:\n"
+msgstr ""
+"Lỗi kết nối từ máy phục vụ %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:350
-#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "Giao thức này không được hỗ trợ bởi trình phục vụ."
 
-#: ../libpurple/protocols/msn/session.c:355
-#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "Lỗi phân tích HTTP."
 
-#: ../libpurple/protocols/msn/session.c:359
-#: ../libpurple/protocols/msnp9/session.c:311
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Bạn đã đăng nhập từ một vị trí khác."
 
-#: ../libpurple/protocols/msn/session.c:365
-#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Các máy phục vụ MSN tạm thời không sẵn sàng. Vui lòng chờ và thử lại lần nữa."
+msgstr ""
+"Các máy phục vụ MSN tạm thời không sẵn sàng. Vui lòng chờ và thử lại lần nữa."
 
-#: ../libpurple/protocols/msn/session.c:371
-#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "Các máy phục vụ MSN tạm thời bị ngừng."
 
-#: ../libpurple/protocols/msn/session.c:376
-#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Không thể xác thực: %s"
 
-#: ../libpurple/protocols/msn/session.c:382
-#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "Danh sách bạn bè MSN của bạn tạm thời không dùng được. Vui lòng chờ và thử lại lần nữa."
+msgstr ""
+"Danh sách bạn bè MSN của bạn tạm thời không dùng được. Vui lòng chờ và thử "
+"lại lần nữa."
 
-#: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "Đang thiết lập quan hệ"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:359
+msgid "Transferring"
+msgstr "Đang truyền"
+
 msgid "Starting authentication"
 msgstr "Đang bắt đầu xác thực"
 
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "Đang lấy cookie"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "Đang gửi cookie"
 
-#: ../libpurple/protocols/msn/session.c:411
-#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "Đang lấy danh sách bạn bè"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Rời khỏi máy tính"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Đang bận nói điện thoại"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Đi ăn trưa"
 
-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Thông điệp có lẽ không gửi được vì quá hạn chờ :"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Thông điệp không gửi đi được, không được phép khi đang ẩn danh."
 
-#: ../libpurple/protocols/msn/switchboard.c:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Thông điệp không gửi đi được vì người dùng chưa kết nối:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Thông điệp không gửi đi được vì có lỗi kết nối:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Thông điệp không gửi đi được vì gửi quá nhanh:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
-msgstr "Thông điệp không gửi đi được vì không thể thiết lập phiên kết nối với máy phục "
-"vụ. Rất có thể là vấn đề trình phục vụ : hãy thử lại sau vài phút nữa:"
+msgstr ""
+"Thông điệp không gửi đi được vì không thể thiết lập phiên kết nối với máy "
+"phục vụ. Rất có thể là vấn đề trình phục vụ : hãy thử lại sau vài phút nữa:"
 
-#: ../libpurple/protocols/msn/switchboard.c:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Thông điệp không gửi đi được vì có lỗi trong hệ thống chuyển mạch."
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s đã thêm bạn vào danh sách bạn bè."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s đã loại bỏ bạn ra khỏi danh sách bạn bè."
 
-#.only notify the user about problems adding to the friends list
-#.* maybe we should do something else for other lists, but it probably
-#.* won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
-#: ../libpurple/protocols/msnp9/userlist.c:653
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Không thể thêm « %s »."
 
-#: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:655
-msgid "The screen name specified is invalid."
-msgstr "Bạn đã ghi rõ một tên hiển thị không hợp lệ."
+msgid "The username specified is invalid."
+msgstr "Bạn đã ghi rõ một tên người dùng không hợp lệ."
+
+msgid "This Hotmail account may not be active."
+msgstr "Tài khoản Hotmail này có lẽ chưa kích hoạt."
 
-#: ../libpurple/protocols/msnp9/msn.c:549
 msgid "Has you"
 msgstr "Có bạn"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "MSN Protocol Plugin"
 msgstr "Phần bổ sung giao thức MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Thiếu mật mã"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "Không tìm thấy mật mã RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
-msgstr "Nâng cấp lên thư viện libpurple hỗ trợ RC4 (≥2.0.1). Phần bổ sung MySpaceIM sẽ không được nạp."
-
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr "Tiếc là mật khẩu dài hơn %d ký tự (mật khẩu của bạn có %d ký tự) không được MySpace hỗ trợ."
-
-#.Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1849
-msgid "MySpaceIM Error"
-msgstr "Lỗi MySpaceIM"
+msgstr ""
+"Nâng cấp lên thư viện libpurple hỗ trợ RC4 (≥2.0.1). Phần bổ sung MySpaceIM "
+"sẽ không được nạp."
 
-#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
 msgstr "Đố đọc"
 
-#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
 msgstr "Chiều dài đố bất thường từ máy phục vụ"
 
-#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr "Đang đăng nhập"
 
-#: ../libpurple/protocols/myspace/myspace.c:1318
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "Kết nối đến máy phục vụ bị mất (không nhận dữ liệu trong vòng %d giây)"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] ""
+"Kết nối đến máy phục vụ bị mất (không nhận dữ liệu trong vòng %d giây)"
 
-#.Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1361
+#. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
 msgstr "Thư tín mới"
 
-#: ../libpurple/protocols/myspace/myspace.c:1362
 msgid "New blog comments"
 msgstr "Chú thích nhật ký mới"
 
-#: ../libpurple/protocols/myspace/myspace.c:1363
 msgid "New profile comments"
 msgstr "Chú thích lý lịch mới"
 
-#: ../libpurple/protocols/myspace/myspace.c:1364
 msgid "New friend requests!"
 msgstr "Yêu cầu bạn mới !"
 
-#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New picture comments"
 msgstr "Chú thích ảnh mới"
 
 # Name: don't translate/Tên: đừng dịch
-#: ../libpurple/protocols/myspace/myspace.c:1395
 msgid "MySpace"
 msgstr "MySpace"
 
-#.The session is now set up, ready to be connected. This emits the
-#.* signedOn signal, so clients can now do anything with msimprpl, and
-#.* we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1583
-#: ../libpurple/protocols/sametime/sametime.c:1546
-msgid "Connected"
-msgstr "Đã kết nối"
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM — Chưa đặt tên người dùng"
 
-#: ../libpurple/protocols/myspace/myspace.c:1594
-#: ../libpurple/protocols/myspace/myspace.c:1597
-msgid "No username set"
-msgstr "Chưa đặt tên người dùng"
+msgid "You appear to have no MySpace username."
+msgstr "Có vẻ là bạn chưa có một tên người dùng MySpace."
 
-#: ../libpurple/protocols/myspace/myspace.c:1595
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr "Hãy thăm « http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username » để chọn tên người dùng, rồi thử lại đăng nhập."
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+"Bạn có muốn đặt một tên người dùng ngay bây giờ không? (Ghi chú : KHÔNG THỂ "
+"THAY ĐỔI LẠI !)"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Đã kết nối"
 
-#: ../libpurple/protocols/myspace/myspace.c:1823
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Lỗi giao thức, mã %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2019
-#: ../libpurple/protocols/myspace/myspace.c:2053
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr ""
+"%s Bạn đã đặt một mật khẩu chứa %d ký tự, vượt quá chiều dài tối đa mong đợi "
+"%d ở MySpaceIM. Hãy cắt ngắn mật khẩu ở địa chỉ « http://profileedit.myspace."
+"com/index.cfm?fuseaction=accountSettings.changePassword », rồi thử lại."
+
+msgid "MySpaceIM Error"
+msgstr "Lỗi MySpaceIM"
+
 msgid "Failed to add buddy"
 msgstr "Không thêm được bạn thân"
 
-#: ../libpurple/protocols/myspace/myspace.c:2019
 msgid "'addbuddy' command failed."
 msgstr "Lỗi « addbuddy » (thêm bạn thân) bị lỗi."
 
-#: ../libpurple/protocols/myspace/myspace.c:2053
-#: ../libpurple/protocols/myspace/myspace.c:2290
 msgid "persist command failed"
 msgstr "Lỗi « persist » (bền bỉ) bị lỗi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2158
 #, c-format
 msgid "No such user: %s"
 msgstr "Không có người dùng như vậy: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2159
 msgid "User lookup"
 msgstr "Tra cứu người dùng"
 
-#: ../libpurple/protocols/myspace/myspace.c:2271
-#: ../libpurple/protocols/myspace/myspace.c:2290
-#: ../libpurple/protocols/myspace/myspace.c:2312
 msgid "Failed to remove buddy"
 msgstr "Không gỡ bỏ được bạn thân"
 
-#: ../libpurple/protocols/myspace/myspace.c:2271
 msgid "'delbuddy' command failed"
 msgstr "Lỗi « delbuddy » (xoá bạn thân) bị lỗi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2312
 msgid "blocklist command failed"
 msgstr "Lỗi « blocklist » (danh sách chận) bị lỗi"
 
-#: ../libpurple/protocols/myspace/myspace.c:2360
 msgid "Invalid input condition"
 msgstr "Điều kiện nhập không hợp lệ"
 
-#: ../libpurple/protocols/myspace/myspace.c:2380
-#: ../libpurple/protocols/myspace/myspace.c:2417
-msgid "Read buffer full"
-msgstr "Bộ đệm đọc đã đầy"
+msgid "Read buffer full (2)"
+msgstr "Bộ đệm đọc đã đầy (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2459
 msgid "Unparseable message"
 msgstr "Thông điệp không thể phân tích"
 
-#: ../libpurple/protocols/myspace/myspace.c:2528
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Không thể kết nối đến máy: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2699
 msgid "IM Friends"
 msgstr "Bạn bè Nhắn Tin"
 
-#: ../libpurple/protocols/myspace/myspace.c:2798
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr "%d bạn thân đã được thêm hay cập nhật từ máy phục vụ (gồm có bạn thân đã nằm trên danh sách bên máy phục vụ)"
+msgstr[0] ""
+"%d bạn thân đã được thêm hoặc cập nhật từ máy phục vụ (gồm có bạn thân đã "
+"nằm trên danh sách bên máy phục vụ)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2799
 msgid "Add contacts from server"
 msgstr "Thêm liên lạc từ máy phục vụ"
 
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#: ../libpurple/protocols/myspace/myspace.c:2916
 msgid "Add friends from MySpace.com"
 msgstr "Thêm bạn bè từ MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2852
 msgid "Importing friends failed"
 msgstr "Không nhập khẩu được bạn bè"
 
-#.TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2908
+#. TODO: find out how
 msgid "Find people..."
 msgstr "Tìm người..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2911
 msgid "Change IM name..."
 msgstr "Đổi tên Nhắn Tin..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3213
 msgid "myim URL handler"
 msgstr "Bộ quản lý URL « myim »"
 
-#: ../libpurple/protocols/myspace/myspace.c:3214
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr "Không tìm thấy tài khoản MySpaceIM thích hợp để mở địa chỉ URL « myim » này."
+msgstr ""
+"Không tìm thấy tài khoản MySpaceIM thích hợp để mở địa chỉ URL « myim » này."
 
-#: ../libpurple/protocols/myspace/myspace.c:3215
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Hiệu lực tài khoản MySpaceIM thích hợp rồi thử lại."
 
-#: ../libpurple/protocols/myspace/myspace.c:3338
 msgid "Show display name in status text"
 msgstr "Hiện tên hiển thị trong văn bản trạng thái"
 
-#: ../libpurple/protocols/myspace/myspace.c:3341
 msgid "Show headline in status text"
 msgstr "Hiện hàng đầu trong văn bản trạng thái"
 
-#: ../libpurple/protocols/myspace/myspace.c:3346
 msgid "Send emoticons"
 msgstr "Gửi biểu tượng xúc cảm"
 
-#: ../libpurple/protocols/myspace/myspace.c:3351
 msgid "Screen resolution (dots per inch)"
 msgstr "Độ phân giải màn hình (điểm trên mỗi insơ)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3354
 msgid "Base font size (points)"
 msgstr "Kích cỡ phông cơ bản (điểm)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Người dùng"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2969
 msgid "Profile"
 msgstr "Lý lịch"
 
-#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
 msgstr "Hàng đầu"
 
-#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr "Bài hát"
 
-#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr "Tổng bạn bè"
 
-#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr "Phiên bản khách"
 
-#.TODO: icons for each zap
-#.Lots of comments for translators:
-#.Zap means "to strike suddenly and forcefully as if with a
-#.* projectile or weapon."  This term often has an electrical
-#.* connotation, for example, "he was zapped by electricity when
-#.* he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Chưa đặt tên người dùng"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM — Hãy đặt một tên người dùng"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Hãy gõ một tên người dùng để kiểm tra tính hợp lệ:"
+
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM — Tên người dùng sẵn sàng"
+
+msgid "This username is available. Would you like to set it?"
+msgstr "Tên người dùng này sẵn có để dùng. Bạn có muốn đặt nó không?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "MỘT KHI ĐẶT ĐƯỢC THÌ KHÔNG THỂ THAY ĐỔI LẠI !"
+
+msgid "This username is unavailable."
+msgstr "Không thể đặt tên người dùng này."
+
+msgid "Please try another username:"
+msgstr "Hãy thử một tên người dùng khác:"
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
 msgid "Zap"
 msgstr "Hạ gục"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s đã hạ gục bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr "Đang hạ gục %s..."
 
-#.Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
+#. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
 msgstr "Đánh mạnh"
 
-#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s đã đánh mạnh bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
 msgstr "Đang đánh mạnh %s..."
 
-#.Torch means "to set on fire."  Don't worry, this doesn't
-#.* make a whole lot of sense in English, either.  Feel free
-#.* to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
 msgid "Torch"
 msgstr "Đốt chảy"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s đã đốt chảy bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Đang đốt chảy %s..."
 
-#.Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
+#. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
 msgstr "Hôn"
 
-#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s đã hôn bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr "Đang hôn %s..."
 
-#.A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
+#. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
 msgstr "Ôm"
 
-#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s đã ôm bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr "Đang ôm %s..."
 
-#.Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
+#. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
 msgstr "Vỗ"
 
-#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s đã vỗ bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr "Đang vỗ %s..."
 
-#.Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
+#. Goose means "to pinch someone on their butt"
 msgid "Goose"
 msgstr "Véo đít"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s đã véo đít bạn một cái !"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Goosing %s..."
 msgstr "Đang véo đít %s một cái"
 
-#.A high-five is when two people's hands slap each other
-#.* in the air above their heads.  It is done to celebrate
-#.* something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
 msgid "High-five"
 msgstr "Vỗ tay cao"
 
-#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s đã vỗ tay cao với bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Đang vỗ tay cao với %s..."
 
-#.We're not entirely sure what the MySpace people mean by
-#.* this... but we think it's the equivalent of "prank."  Or, for
-#.* someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
 msgstr "Chơi ác"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s đã chơi ác bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr "Đang chơi ác %s..."
 
-#.Raspberry is a slang term for the vibrating sound made
-#.* when you stick your tongue out of your mouth with your
-#.* lips closed and blow.  It is typically done when
-#.* gloating or bragging.  Nowadays it's a pretty silly
-#.* gesture, so it does not carry a harsh negative
-#.* connotation.  It is generally used in a playful tone
-#.* with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
 msgid "Raspberry"
 msgstr "Bĩu môi"
 
-#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s đã gửi một cái bĩu môi cho bạn !"
 
-#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Đang gửi một cái búi môi cho %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Tham số yêu cầu chưa được gửi vào"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Không thể ghi vào mạng"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Không thể đọc từ mạng"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Lỗi liên lạc với máy phục vụ"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Không tìm thấy cuộc hội thảo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Cuộc hội thảo đó không tồn tại"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Một thư mục tên đó đã có"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Không được hỗ trợ"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Mật khẩu đã hết hạn dùng"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Mật khẩu sai"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Không tìm thấy người dùng"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Tài khoản đã bị tắt"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Máy phục vụ không thể truy cập đến danh bạ"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Quản trị hệ thống của bạn đã cấm hoạt động này"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Máy phục vụ này hiện không sử dụng được, hãy thử lại sau"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Không thể thêm một liên lạc vào cùng một thư mục hai lần"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Không thể tự thêm mình"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Kho lưu chủ sai cấu hình"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr "Tên hiển thị hoặc mật khẩu sai"
+msgid "Incorrect username or password"
+msgstr "Tên người dùng hoặc mật khẩu sai"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
-msgstr "Không thể nhận ra máy của tên hiển thị bạn vừa nhập vào"
+msgid "Could not recognize the host of the username you entered"
+msgstr "Không thể nhận ra máy của tên người dùng bạn vừa nhập vào"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr "Tài khoản của bạn không sữ dụng dụng được vì có quá nhiều mật khẩu không hợp lệ được nhập vào."
+msgstr ""
+"Tài khoản của bạn không sữ dụng dụng được vì có quá nhiều mật khẩu không hợp "
+"lệ được nhập vào."
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Bạn không thể thêm cùng một người hai lần vào một cuộc trao đổi"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Bạn đã đến giới hạn số liên hệ cho phép"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
-msgstr "Bạn đã nhập một tên hiển thị không đúng"
+msgid "You have entered an incorrect username"
+msgstr "Bạn đã nhập một tên người dùng không đúng"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Có lỗi khi cập nhật danh bạ"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Phiên bản giao thức không tương thích"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Người dùng đã chặn bạn"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr "Phiên bản thử nghiệm này không cho phép hơn 10 người dùng đăng nhập cùng lúc"
+msgstr ""
+"Phiên bản thử nghiệm này không cho phép hơn 10 người dùng đăng nhập cùng lúc"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Người dùng này đang ngoại tuyến hoặc bạn đã bị chặn lại"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Lỗi không rõ : 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Không đăng nhập được (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Không thể gửi tin. Không thể lấy chi tiết về người dùng (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Không thể thêm « %s » vào danh sách bạn bè của bạn (%s)."
 
-#.TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
+#. TODO: Improve this! message to who or for what conference?
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Không thể gửi tin (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Không thể mời người dùng (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Không thể gửi tin cho %s. Không thể tạo cuộc hội thảo (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Không thể gửi tin. Không thể tạo cuộc hội thảo (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
-msgstr "Không thể di chuyền người dùng %s đến thư mục %s trong danh sách bên máy phục vụ. Có lỗi khi tạo thư mục (%s)."
+msgstr ""
+"Không thể di chuyền người dùng %s đến thư mục %s trong danh sách bên máy "
+"phục vụ. Có lỗi khi tạo thư mục (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
-msgstr "Không thể thêm « %s » vào danh sách bạn bè của bạn. Gặp lỗi khi tạo thư mục trong danh sách bên máy phục vụ (%s)."
+msgstr ""
+"Không thể thêm « %s » vào danh sách bạn bè của bạn. Gặp lỗi khi tạo thư mục "
+"trong danh sách bên máy phục vụ (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Không thể lấy chi tiết về người dùng %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Không thể thêm người dùng vào danh sách riêng tư (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Không thể thêm « %s » vào danh sách từ chối (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Không thể thêm « %s » vào danh sách cho phép (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Không thể gỡ bỏ %s ra khỏi danh sách riêng tư (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Không thể đổi thiết lập riêng tư bên máy phục vụ (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Không thể tạo cuộc hội thảo (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Lỗi liên lạc với máy phục vụ nên đóng kết nối."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Số điện thoại"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Tuổi tác"
 
 # Name: don't translate/Tên: đừng dịch
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "ID người dùng"
 
-#.tag = _("DN");
-#.value = nm_user_record_get_dn(user_record);
-#.if (value) {
-#.purple_notify_user_info_add_pair(user_info, tag, value);
-#.}
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
 # GroupWise là tên: đừng dịch.
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Hội thảo GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Không thể kết nối đến máy phục vụ."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Đợi hồi âm..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s đã được mời vào cuộc thoại này."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Lời mời vào cuộc thoại"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
 "\n"
 "Sent: %s"
-msgstr "Lời mời từ : %s\n"
+msgstr ""
+"Lời mời từ : %s\n"
 "\n"
 "Gửi: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Bạn có muốn tham gia cuộc thoại này không?"
 
-#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Bạn bị đăng xuất vì bạn cũng đăng nhập bằng một máy trạm khác."
 
-#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s có vẻ là đang ngoại tuyến nên không thể nhận tin bạn vừa gửi."
 
-#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
-msgstr "Không thể kết nối đến máy phục vụ. Hãy nhập địa chỉ của máy phục vụ tới đó bạn muốn kết nối."
+msgstr ""
+"Không thể kết nối đến máy phục vụ. Hãy nhập địa chỉ của máy phục vụ tới đó "
+"bạn muốn kết nối."
 
-#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "Lỗi: chưa cài đặt khả năng hỗ trợ SSL."
 
-#: ../libpurple/protocols/novell/novell.c:2521
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cuộc hội thảo này đã đóng nên không thể gửi thêm tin nào."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Phần bổ sung giao thức Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Địa chỉ máy phục vụ"
 
-#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Cổng máy phục vụ"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:62
 msgid "Could not join chat room"
 msgstr "Không thể tham gia phòng trò chuyện"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Invalid chat room name"
 msgstr "Tên phòng trò chuyện không hợp lệ"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2473
-#: ../libpurple/protocols/yahoo/yahoo.c:2641
-#: ../libpurple/protocols/yahoo/ycht.c:482
-#: ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129
-#: ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338
-#: ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Máy phục vụ đã đóng kết nối."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
-#: ../libpurple/protocols/yahoo/yahoo.c:2634
-#: ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141
-#: ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350
-#: ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
-msgstr "Mất kết nối với máy phục vụ :\n"
+msgstr ""
+"Mất kết nối với máy phục vụ :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158
-#: ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362
-#: ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "Nhận dữ liệu không hợp lệ khi kết nối tới máy phục vụ."
 
 # AIM là mạng trò chuyện khác.
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "AIM Protocol Plugin"
 msgstr "Phần bổ sung giao thức AIM"
 
 # ICQ là mạng trò chuyện khác.
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "ICQ Protocol Plugin"
 msgstr "Phần bổ sung giao thức ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4422
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Bảng mã"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Người dùng từ xa đã đóng kết nối."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Người dùng từ xa đã từ chối yêu cầu của bạn."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Mất kết nối với người dùng từ xa:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Nhận dữ liệu không hợp lệ khi kết nối với người dùng từ xa."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Không thể thiết lập kết nối với người dùng từ xa."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Đã thiết lập nhắn tin nhanh trực tiếp"
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
-msgstr "%s đã cố gửi một tập tin %s, nhưng mạng này chỉ cho phép tập tin đến %s thông qua Nhắn Tin Nhanh Trực Tiếp. Hãy thử sử dụng tính năng truyền tải tập tin thay vào đó.\n"
+msgstr ""
+"%s đã cố gửi một tập tin %s, nhưng mạng này chỉ cho phép tập tin đến %s "
+"thông qua Nhắn Tin Nhanh Trực Tiếp. Hãy thử sử dụng tính năng truyền tải tập "
+"tin thay vào đó.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Tập tin %s là %s mà lớn hơn kích cỡ tối đa %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Lỗi không hợp lệ"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "SNAC không hợp lệ"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "Tốc độ tới máy phục vụ"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Tốc độ tới trình khách"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Dịch vụ không sẵn sàng"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Chưa xác định dịch vụ"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "SNAC quá cũ"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "Máy không hỗ trợ"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "Trình khách không hỗ trợ"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Trình khách từ chối"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Trả lời lại quá lớn"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "Mất trả lời"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "Yêu cầu bị từ chối"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "Làm mất trọng tải SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Không đủ quyền"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "Nằm trong phạm vi bị giới hạn/từ chối cục bộ"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (sender)"
-msgstr "Quá cao (người gửi)"
+msgid "Warning level too high (sender)"
+msgstr "Cấp cảnh báo quá cao (người gửi)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
-msgstr "Quá cao (người nhận)"
+msgid "Warning level too high (receiver)"
+msgstr "Cấp cảnh báo quá cao (người nhận)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "Tạm thời không có người dùng"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "Không tìm thấy"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr "Tràn danh sách"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "Yêu cầu không rõ ràng"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Hàng đợi đã đầy"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Không phải khi trên AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:347
 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 "(Gặp lỗi khi nhận tin này. Bạn thân với họ bạn đang nói chuyện rất có thể sử dụng bảng mã khác với điều mong đợi. Biết bảng mã đó thì bạn ghi rõ nó trong các tùy chọn tài khoản cấp cao cho tài khoản AIM/ICQ của bạn.)"
+msgstr ""
+"(Gặp lỗi khi nhận tin này. Bạn thân với họ bạn đang nói chuyện rất có thể sử "
+"dụng bảng mã khác với điều mong đợi. Biết bảng mã đó thì bạn ghi rõ nó trong "
+"các tùy chọn tài khoản cấp cao cho tài khoản AIM/ICQ của bạn.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:456
 #, 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 "(Có lỗi khi nhận tin này. Hoặc bạn và %s đã chọn các bảng mã khác nhau, hoặc %s chạy trình khách bị lỗi.)"
+msgstr ""
+"(Có lỗi khi nhận tin này. Hoặc bạn và %s đã chọn các bảng mã khác nhau, hoặc "
+"%s chạy trình khách bị lỗi.)"
 
-#.Label
-#: ../libpurple/protocols/oscar/oscar.c:638
-#: ../pidgin/gtkutils.c:2444
-#: ../pidgin/gtkutils.c:2474
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
+#. Label
 msgid "Buddy Icon"
 msgstr "Biểu tượng bạn thân"
 
-#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Nói"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "Nhắn tin nhanh trực tiếp AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:647
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Chát"
-
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Get File"
 msgstr "Lấy tập tin"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Trò chơi"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Phần bổ trợ"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Gửi danh sách bạn bè"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "Kết nối trực tiếp ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "Người dùng AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
 # Name or function? Tên hay hàm?
-#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "Chuyển tiếp máy phục vụ ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "UTF-8 ICQ cũ"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Mật mã Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "UTF-8 ICQ"
 
 # Tên thiết bị.
-#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Bật bảo mật"
 
-#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Trò chuyện ảnh động"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Ảnh động trực tiếp"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Máy ảnh"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5805
+msgid "Screen Sharing"
+msgstr "Chia sẻ màn hình"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "Rảnh rỗi để Chát"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#, c-format
 msgid "Not Available"
 msgstr "Không có mặt"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5826
+#, c-format
 msgid "Occupied"
 msgstr "Đang bận"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#, c-format
 msgid "Web Aware"
 msgstr "Kiến thức Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:736
-#: ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557
-#: ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "Giấu mặt"
 
-#: ../libpurple/protocols/oscar/oscar.c:738
-msgid "Online"
-msgstr "Trực tuyến"
-
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3688
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1153
 msgid "IP Address"
 msgstr "Địa chỉ IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Warning Level"
 msgstr "Mức cảnh báo"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Chú thích bạn thân"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
-msgstr "Không thể kết nối tới máy phục vụ xác thực:\n"
+msgstr ""
+"Không thể kết nối tới máy phục vụ xác thực:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
-msgstr "Không thể kết nối tới máy phục vụ BOS:\n"
+msgstr ""
+"Không thể kết nối tới máy phục vụ BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
-msgid "Screen name sent"
-msgstr "Tên hiển thị đã được gửi"
+msgid "Username sent"
+msgstr "Tên người dùng đã được gửi"
 
-#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Kết nối được thiết lập, đã gửi cookie"
 
-#.TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#. TODO: Don't call this with ssi
 msgid "Finalizing connection"
 msgstr "Đang hoàn tất kết nối"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Không thể đăng nhập. Không thể đăng nhập như %s vì tên hiển thị không hợp lệ. Tên hiển thị phải là một địa chỉ thư điện tử hợp lệ, hoặc bắt đầu với một chữ cái và chỉ bao gồm chữ cái, chữ số và khoảng trống, hoặc chỉ gồm chữ số."
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Không thể đăng nhập. Không thể đăng nhập dưới %s vì tên người dùng không hợp "
+"lệ. Tên người dùng phải là một địa chỉ thư điện tử hợp lệ, hoặc bắt đầu với "
+"một chữ cái và chỉ chứa chữ cái, chữ số và khoảng trống, hoặc chỉ chứa chữ "
+"số."
 
-#.Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2102
-msgid "Invalid screen name."
-msgstr "Tên hiển thị không hợp lệ."
+#. Unregistered screen name
+msgid "Invalid username."
+msgstr "Tên người dùng sai."
 
-#: ../libpurple/protocols/oscar/oscar.c:1351
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2124
 msgid "Incorrect password."
 msgstr "Mật khẩu sai."
 
-#.Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1355
+#. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Tài khoản của bạn tạm thời bị đình chỉ."
 
-#.service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1359
+#. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tạm thời không dùng được Dịch Vụ Nhắn Tin Nhanh AOL."
 
-#.screen name connecting too frequently
-#.IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#. screen name connecting too frequently
+#. IP address connecting too frequently
 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 "Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Xin chờ 10 phút rồi thử lại. Nếu bạn tiếp tục kết nối, bạn sẽ phải đợi lâu hơn."
+msgstr ""
+"Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Xin chờ 10 phút rồi thử "
+"lại. Nếu bạn tiếp tục kết nối, bạn sẽ phải đợi lâu hơn."
 
-#.client too old
-#: ../libpurple/protocols/oscar/oscar.c:1367
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Bạn đang dùng phiên bản trình khách quá cũ. Hãy nâng cấp tại %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1405
 msgid "Could Not Connect"
 msgstr "Không thể kết nối"
 
-#: ../libpurple/protocols/oscar/oscar.c:1409
 msgid "Received authorization"
 msgstr "Nhận được sự cho phép"
 
 # SecurID là tên: đừng dịch
-#: ../libpurple/protocols/oscar/oscar.c:1432
 msgid "The SecurID key entered is invalid."
 msgstr "Khoá SecurID nhập vào không hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:1445
 msgid "Enter SecurID"
 msgstr "Nhập vào SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1446
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Nhập vào 6 chữ số hiển thị trên màn hình."
 
-#.*
-#.* A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1448
-#: ../libpurple/protocols/oscar/oscar.c:2237
-#: ../libpurple/protocols/oscar/oscar.c:2286
-#: ../libpurple/protocols/oscar/oscar.c:5910
-#: ../libpurple/protocols/oscar/oscar.c:6191
-#: ../libpurple/request.h:1454
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1487
-#: ../libpurple/protocols/oscar/oscar.c:1530
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
-msgstr "Bạn có thể bị ngắt kết nối một thời gian ngắn. Trong lúc chờ đợi lỗi được "
+msgstr ""
+"Bạn có thể bị ngắt kết nối một thời gian ngắn. Trong lúc chờ đợi lỗi được "
 "sửa, bạn có thể sử dụng TOC. Hãy kiểm tra %s để cập nhật."
 
-#: ../libpurple/protocols/oscar/oscar.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:1533
 msgid "Unable to get a valid AIM login hash."
 msgstr "Không thể lấy mã đăng nhập AIM hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:1618
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Bạn có thể bị ngắt kết nối một thời gian ngắn. Hãy kiểm tra %s để cập nhật."
+msgstr ""
+"Bạn có thể bị ngắt kết nối một thời gian ngắn. Hãy kiểm tra %s để cập nhật."
 
-#: ../libpurple/protocols/oscar/oscar.c:1621
 msgid "Unable to get a valid login hash."
 msgstr "Không thể lấy mã đăng nhập hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:1651
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Đã gửi mật khẩu"
 
-#: ../libpurple/protocols/oscar/oscar.c:1707
 msgid "Unable to initialize connection"
 msgstr "Không thể khởi tạo kết nối"
 
-#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Xin hãy cho phép tôi để tôi có thể thêm bạn vào danh sách bạn bè."
 
-#: ../libpurple/protocols/oscar/oscar.c:2235
 msgid "Authorization Request Message:"
 msgstr "Thông điệp yêu cầu sự cho phép:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2236
 msgid "Please authorize me!"
 msgstr "Xin hãy cho phép tôi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:2285
-#: ../libpurple/protocols/oscar/oscar.c:2412
-#: ../libpurple/protocols/oscar/oscar.c:5282
-#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "No reason given."
 msgstr "Không nêu lý do."
 
-#: ../libpurple/protocols/oscar/oscar.c:2284
 msgid "Authorization Denied Message:"
 msgstr "Thông điệp từ chối cho phép:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2412
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
-msgstr "Người dùng %u từ chối để bạn thêm họ vào danh sách bạn bè của bạn vì lý do "
+msgstr ""
+"Người dùng %u từ chối để bạn thêm họ vào danh sách bạn bè của bạn vì lý do "
 "sau :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
 msgid "ICQ authorization denied."
 msgstr "Sự cho phép ICQ bị từ chối."
 
-#.Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2420
+#. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Người dùng %u đã cho phép bạn thêm họ vào danh sách bạn bè của bạn."
 
-#: ../libpurple/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received a special message\n"
 "\n"
 "From: %s [%s]\n"
 "%s"
-msgstr "Bạn đã nhận một thông điệp đặc biệt\n"
+msgstr ""
+"Bạn đã nhận một thông điệp đặc biệt\n"
 "\n"
 "Từ : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
 "\n"
 "From: %s [%s]\n"
 "%s"
-msgstr "Bạn đã nhận một trang ICQ\n"
+msgstr ""
+"Bạn đã nhận một trang ICQ\n"
 "\n"
 "Từ : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2444
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
-msgstr "Bạn đã nhận một thư ICQ từ %s [%s]\n"
+msgstr ""
+"Bạn đã nhận một thư ICQ từ %s [%s]\n"
 "\n"
 "Thông điệp:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2465
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Người dùng ICQ %u gửi tới bạn một bạn thân: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Bạn muốn thêm người này vào danh sách bạn bè của bạn không?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
-#: ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "Thê_m"
 
 # Tôi đã kiểm tra đến (và gồm) chuỗi này.
-#: ../libpurple/protocols/oscar/oscar.c:2477
 msgid "_Decline"
 msgstr "_Từ chối"
 
-#: ../libpurple/protocols/oscar/oscar.c:2601
 #, 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] "Bạn không nhận được %hu tin nhẳn từ %s vì nó không hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:2610
 #, 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] "Bạn không nhận được %hu tin nhẳn từ %s vì nó quá lớn."
 
-#: ../libpurple/protocols/oscar/oscar.c:2619
 #, 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."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Bạn không nhận được %hu tin nhẳn từ %s vì đã vược quá mức giới hạn."
 
-#: ../libpurple/protocols/oscar/oscar.c:2628
 #, 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] "Bạn không nhận được %hu tin nhẳn từ %s vì họ quá bảo mật."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Bạn không nhận được %hu tin nhẳn từ %s vì họ có cấp cảnh báo quá cao."
 
-#: ../libpurple/protocols/oscar/oscar.c:2637
 #, 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] "Bạn không nhận được %hu tin nhẳn từ %s vì bạn quá bảo mật."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Bạn không nhận được %hu tin nhẳn từ %s vì bạn có cấp cảnh báo quá cao."
 
-#: ../libpurple/protocols/oscar/oscar.c:2646
 #, 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."
 msgstr[0] "Bạn không nhận được %hu tin nhẳn từ %s do lỗi chưa xác định."
 
-#.Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2801
+#. Data is assumed to be the destination sn
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Không thể gửi tin: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2806
-#: ../libpurple/protocols/oscar/oscar.c:2870
 msgid "Unknown reason."
 msgstr "Không biết sao."
 
-#: ../libpurple/protocols/oscar/oscar.c:2804
-#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Không thể gửi tin cho %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2870
 #, c-format
 msgid "User information not available: %s"
 msgstr "Không có sẵn thông tin về người dùng %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Online Since"
 msgstr "Đã kết nối từ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Là thành viên từ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2941
-msgid "Available Message"
-msgstr "Tin nhẳn có mặt"
-
-#: ../libpurple/protocols/oscar/oscar.c:3049
 msgid "Your AIM connection may be lost."
 msgstr "Bạn có thể đã bị ngắt kết nối với AIM"
 
-#.The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3237
+#. The conversion failed!
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
-msgstr "[Không thể hiển thị tin nhẳn từ người dùng này vì nó chứa ký tự hợp lệ hợp lệ.]"
+msgstr ""
+"[Không thể hiển thị tin nhẳn từ người dùng này vì nó chứa ký tự hợp lệ hợp "
+"lệ.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3401
 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 "Hành động lần cuối mà bạn thử không được thực hiện vì bạn đã vượt quá mức "
+msgstr ""
+"Hành động lần cuối mà bạn thử không được thực hiện vì bạn đã vượt quá mức "
 "giới hạn. Hãy chờ 10 giây rồi thử lại."
 
-#: ../libpurple/protocols/oscar/oscar.c:3486
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Bạn đã bị ngắt kết nối với phòng Chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Điện thoại đi động"
 
-#: ../libpurple/protocols/oscar/oscar.c:3740
 msgid "Personal Web Page"
 msgstr "Trang web cá nhân"
 
-#: ../libpurple/protocols/oscar/oscar.c:3764
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Thông tin thêm"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
 msgid "Zip Code"
 msgstr "Mã bưu điện"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+msgid "Work Information"
+msgstr "Thông tin về công việc"
+
 msgid "Division"
 msgstr "Bộ phận"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Position"
 msgstr "Chức vụ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Web Page"
 msgstr "Trang Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
-msgid "Work Information"
-msgstr "Thông tin về công việc"
-
-#: ../libpurple/protocols/oscar/oscar.c:3858
 msgid "Pop-Up Message"
 msgstr "Thông điệp tự mở"
 
-#: ../libpurple/protocols/oscar/oscar.c:3898
 #, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
-msgstr[0] "Tên hiển thị sau đây là liên quan đến %s"
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "Tên người dùng sau đây có liên quan đến %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3903
-msgid "Screen name"
-msgstr "Tên hiển thị"
-
-#: ../libpurple/protocols/oscar/oscar.c:3929
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Không tìm thấy người nào có điạ chỉ thư %s"
+msgstr "Không tìm thấy kết quả đối với điạ chỉ thư điện tử %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Bạn sẽ nhận được một thư yêu cầu xác nhận %s."
+msgstr "Bạn sẽ nhận được một thư điện tử yêu cầu xác nhận %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
 msgid "Account Confirmation Requested"
-msgstr "Yêu cầu xác nhận tài khoản"
-
-#: ../libpurple/protocols/oscar/oscar.c:3983
-msgid "Error Changing Account Info"
-msgstr "Có lỗi khi thay đổi thông tin tài khoản"
+msgstr "Yêu cầu Xác nhận Tài khoản"
 
-#: ../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 "Lỗi 0x%04x: không thể định dạng tên hiển thị vì nó khác với tên gốc."
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr "Lỗi 0x%04x: không thể định dạng tên người dùng vì nó khác với tên gốc."
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Lỗi 0x%04x: Không thể định dạng tên hiển thị bởi vì nó không hợp lệ."
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr "Lỗi 0x%04x: Không thể định dạng tên người dùng bởi vì nó không hợp lệ."
 
-#: ../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 "Lỗi 0x%04x: Không thể định dạng tên hiển thị bởi vì nó quá dài."
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr "Lỗi 0x%04x: Không thể định dạng tên người dùng bởi vì nó quá dài."
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
-msgstr "Lỗi 0x%04x: Không đổi được địa chỉ thư vì đã có một yêu cầu bị hoãn cho tên hiển thị này."
+"request pending for this username."
+msgstr ""
+"Lỗi 0x%04x: Không đổi được địa chỉ thư điện tử vì đã có một yêu cầu bị hoãn "
+"cho tên người dùng này."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
-msgstr "Lỗi 0x%04x: Không đổi được địa chỉ thư vì có quá nhiều tên hiển thị có liên quan với địa chỉ này."
+"too many usernames associated with it."
+msgstr ""
+"Lỗi 0x%04x: Không đổi được địa chỉ thư điện tử vì có quá nhiều tên người "
+"dùng có liên quan với địa chỉ này."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
-msgstr "Lỗi 0x%04x: Không thay đổi được địa chỉ thư vì địa chỉ đưa ra không hợp lệ."
+msgstr ""
+"Lỗi 0x%04x: Không thay đổi được địa chỉ thư vì địa chỉ đưa ra không hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Lỗi 0x%04x: lỗi không rõ."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+msgid "Error Changing Account Info"
+msgstr "Có lỗi khi thay đổi thông tin tài khoản"
+
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "Địa chỉ thư của %s là %s"
+msgstr "Địa chỉ thư điện tử cho %s là %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "Thông tin tài khoản"
 
-#: ../libpurple/protocols/oscar/oscar.c:4199
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "Không gửi được hình ảnh tin nhắn nhanh của bạn. Bạn phải Kết nối Trực tiếp để gửi Hình ảnh tin nhắn nhanh."
+msgstr ""
+"Không gửi được hình ảnh tin nhắn nhanh của bạn. Bạn phải Kết nối Trực tiếp "
+"để gửi Hình ảnh tin nhắn nhanh."
 
-#: ../libpurple/protocols/oscar/oscar.c:4470
 msgid "Unable to set AIM profile."
 msgstr "Không thể lập lý lịch AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4471
 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 "Bạn có thể đã yêu cầu lập lý lịch trước khi hoàn thành thủ tục đăng nhập. Vì vậy lý lịch của bạn vẫn chưa được lập; hãy thử lại sau khi bạn kết nối xong."
+msgstr ""
+"Bạn có thể đã yêu cầu lập lý lịch trước khi hoàn thành thủ tục đăng nhập. Vì "
+"vậy lý lịch của bạn vẫn chưa được lập; hãy thử lại sau khi bạn kết nối xong."
 
-#: ../libpurple/protocols/oscar/oscar.c:4485
 #, 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 "
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "Đã vượt quá độ dài lý lịch tối đa %d byte. Pidgin đã cắt ngắn nó giúp bạn."
+msgstr[0] ""
+"Đã vượt quá độ dài lý lịch tối đa %d byte. Pidgin đã cắt ngắn nó giúp bạn."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
 msgid "Profile too long."
 msgstr "Lý lịch quá dài."
 
-#: ../libpurple/protocols/oscar/oscar.c:4535
 #, 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 "
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "Đã vượt quá độ dài tối đa %d byte của thông báo vắng mặt  Pidgin đã cắt ngắn giúp bạn."
+msgstr[0] ""
+"Đã vượt quá độ dài tối đa %d byte của thông báo vắng mặt  Pidgin đã cắt ngắn "
+"giúp bạn."
 
-#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Away message too long."
 msgstr "Thông báo vắng mặt quá dài."
 
-#: ../libpurple/protocols/oscar/oscar.c:4613
 #, c-format
 msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr "Không thể thêm bạn chát %s vì tên người dùng này không hợp lệ. Tên này phải "
-"bắt đầu bằng một chữ cái và chỉ bao gồm chữ cái, chữ số, và khoảng trống, "
-"hay chỉ bao gồm chữ số."
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"Không thể thêm bạn chát %s vì tên người dùng này không hợp lệ. Tên người "
+"dùng phải là một địa chỉ thư điện tử hợp lệ, hoặc bắt đầu bằng một chữ cái "
+"và chỉ chứa chữ cái, chữ số, và khoảng trống, hoặc chỉ chứa chữ số."
 
-#: ../libpurple/protocols/oscar/oscar.c:4615
-#: ../libpurple/protocols/oscar/oscar.c:5068
-#: ../libpurple/protocols/oscar/oscar.c:5083
 msgid "Unable To Add"
 msgstr "Không thể thêm"
 
-#: ../libpurple/protocols/oscar/oscar.c:4734
 msgid "Unable To Retrieve Buddy List"
-msgstr "Không thể nhận danh sách Buddy"
+msgstr "Không thể nhận danh sách bạn bè"
 
-#: ../libpurple/protocols/oscar/oscar.c:4735
 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 minutes."
-msgstr "Các máy phục vụ AIM tạm thời không thể gửi danh sách bạn bè của bạn. Danh sách này không mất và có thể nhận được sau vài phút nữa."
+msgstr ""
+"Các máy phục vụ AIM tạm thời không thể gửi danh sách bạn bè của bạn. Danh "
+"sách này không mất và có thể nhận được sau vài phút nữa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4918
-#: ../libpurple/protocols/oscar/oscar.c:4920
-#: ../libpurple/protocols/oscar/oscar.c:5148
-#: ../libpurple/protocols/oscar/oscar.c:5149
-#: ../libpurple/protocols/oscar/oscar.c:5154
 msgid "Orphans"
 msgstr "Thừa"
 
-#: ../libpurple/protocols/oscar/oscar.c:5066
 #, 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 "Không thể thêm bạn chát %s vì danh sách của bạn có quá nhiều bạn chát. Hãy bỏ bớt một bạn chát và thử lại."
+msgstr ""
+"Không thể thêm bạn chát %s vì danh sách của bạn có quá nhiều bạn chát. Hãy "
+"bỏ bớt một bạn chát và thử lại."
 
-#: ../libpurple/protocols/oscar/oscar.c:5066
-#: ../libpurple/protocols/oscar/oscar.c:5081
 msgid "(no name)"
 msgstr "(không tên)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5080
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Không thể thêm bạn chát %s vì lý do không rõ."
 
-#: ../libpurple/protocols/oscar/oscar.c:5197
 #, c-format
 msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr "Người dùng %s đã cho phép bạn thêm họ vào danh sách bạn bè của bạn. Bạn có muốn thêm họ không?"
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+"Người dùng %s cho phép bạn thêm họ vào danh sách bạn bè của bạn. Bạn có muốn "
+"thêm họ không?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5205
 msgid "Authorization Given"
 msgstr "Cho phép"
 
-#.Granted
-#: ../libpurple/protocols/oscar/oscar.c:5278
+#. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Người dùng %s đã cho phép bạn thêm họ vào danh sách bạn bè của bạn."
 
-#: ../libpurple/protocols/oscar/oscar.c:5279
 msgid "Authorization Granted"
 msgstr "Cho phép"
 
-#.Denied
-#: ../libpurple/protocols/oscar/oscar.c:5282
+#. Denied
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
-msgstr "Người dùng %s đã từ chối yêu cầu của bạn thêm họ vào danh sách bạn bè của bạn với lý do sau :\n"
+msgstr ""
+"Người dùng %s đã từ chối yêu cầu của bạn thêm họ vào danh sách bạn bè của "
+"bạn với lý do sau :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5283
 msgid "Authorization Denied"
 msgstr "Không cho phép"
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Trao đổi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5432
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Hình ảnh tin nhắn nhanh của bạn không gửi được. Bạn không gửi hình ảnh tin nhắn nhanh trong AIM chát."
-
-#: ../libpurple/protocols/oscar/oscar.c:5594
-#: ../libpurple/protocols/oscar/oscar.c:5599
-msgid "Away Message"
-msgstr "Thông báo vắng mặt"
-
-#: ../libpurple/protocols/oscar/oscar.c:5599
-msgid "<i>(retrieving)</i>"
-msgstr "<i>(đang lấy)</i>"
+msgstr ""
+"Hình ảnh tin nhắn nhanh của bạn không gửi được. Bạn không gửi hình ảnh tin "
+"nhắn nhanh trong AIM chát."
 
-#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "iTunes Music Store Link"
 msgstr "Liên kết TIệm Nhạc iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5907
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Chú thích bạn chát về %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5908
 msgid "Buddy Comment:"
 msgstr "Chú thích bạn chát:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5955
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Bạn đã chọn mở kết nối Nhắn Tin Trực Tiếp với %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
-msgstr "Điều này cho phép người khác thấy được địa chỉ IP máy bạn, có thể bị hưởng đến sự riêng tư của bạn. Bạn có muốn tiếp tục không?"
+msgstr ""
+"Điều này cho phép người khác thấy được địa chỉ IP máy bạn, có thể bị hưởng "
+"đến sự riêng tư của bạn. Bạn có muốn tiếp tục không?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5965
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Kết nối"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
 msgid "Get AIM Info"
 msgstr "Lấy thông tin AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6006
 msgid "Edit Buddy Comment"
 msgstr "Sửa chú thích bạn chát"
 
-#: ../libpurple/protocols/oscar/oscar.c:6014
 msgid "Get Status Msg"
 msgstr "Lấy thông điệp trạng thái"
 
-#: ../libpurple/protocols/oscar/oscar.c:6027
 msgid "Direct IM"
 msgstr "Nhắn Tin Trực Tiếp"
 
-#: ../libpurple/protocols/oscar/oscar.c:6049
 msgid "Re-request Authorization"
 msgstr "Yêu cầu lại sự cho phép"
 
-#: ../libpurple/protocols/oscar/oscar.c:6108
 msgid "Require authorization"
 msgstr "Cần thiết sự cho phép"
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Kiến thức Web (hiệu lực tùy chọn này sẽ gây ra bạn nhận thư RÁC)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6116
 msgid "ICQ Privacy Options"
 msgstr "Tùy chọn riêng tư ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6135
 msgid "The new formatting is invalid."
 msgstr "Định dạng mới không hợp lệ."
 
-#: ../libpurple/protocols/oscar/oscar.c:6136
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "Định dạng cho tên hiển thị chỉ đổi chữ viết hoa và khoảng trống."
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "Định dạng cho tên người dùng chỉ đổi chữ viết hoa và khoảng trống."
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "Change Address To:"
 msgstr "Đổi địa chỉ thành:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6235
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>bạn không đang chờ sự cho phép</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6238
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Bạn đang chờ sự cho phép của các bạn chát sau đây"
 
-#: ../libpurple/protocols/oscar/oscar.c:6239
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
-msgstr "Bạn có thể gửi lại yêu cầu sự cho phép của những bạn chát này bằng cách nhấn chuột phải vào tên người đó và chọn « Yêu cầu lại sự cho phép »."
+msgstr ""
+"Bạn có thể gửi lại yêu cầu sự cho phép của những bạn chát này bằng cách nhấn "
+"chuột phải vào tên người đó và chọn « Yêu cầu lại sự cho phép »."
 
-#: ../libpurple/protocols/oscar/oscar.c:6256
 msgid "Find Buddy by Email"
 msgstr "Tìm bạn chát dựa theo địa chỉ thư"
 
-#: ../libpurple/protocols/oscar/oscar.c:6257
 msgid "Search for a buddy by email address"
-msgstr "Tìm kiếm bạn chát bằng địa chỉ thư điện tử"
+msgstr "Tìm kiếm bạn chát dựa theo địa chỉ thư điện tử"
 
-#: ../libpurple/protocols/oscar/oscar.c:6258
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Hãy nhập địa chỉ email của bạn chát mà bạn cần tìm."
+msgstr "Hãy nhập địa chỉ thư điện tử của bạn chát mà bạn cần tìm."
 
-#: ../libpurple/protocols/oscar/oscar.c:6261
 msgid "_Search"
 msgstr "_Tìm kiếm"
 
-#: ../libpurple/protocols/oscar/oscar.c:6419
-msgid "Set User Info (URL)..."
-msgstr "Lập thông tin người dùng (URL)..."
+msgid "Set User Info (web)..."
+msgstr "Đặt thông tin người dùng (Web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
-msgid "Change Password (URL)"
-msgstr "Đổi mật khẩu (URL)"
+msgid "Change Password (web)"
+msgstr "Đổi mật khẩu (Web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
-msgid "Configure IM Forwarding (URL)"
-msgstr "Cấu hình chuyển tiếp Nhắn Tin (URL)"
+msgid "Configure IM Forwarding (web)"
+msgstr "Cấu hình chuyển tiếp Nhắn Tin (Web)"
 
-#.ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6444
+#. ICQ actions
 msgid "Set Privacy Options..."
 msgstr "Đặt tùy chọn riêng tư..."
 
-#.AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6451
+#. AIM actions
 msgid "Confirm Account"
 msgstr "Xác nhận tài khoản"
 
-#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Display Currently Registered Email Address"
-msgstr "Hiển thị địa chỉ thư đăng ký hiện thời"
+msgstr "Hiển thị địa chỉ thư điện tử đăng ký hiện thời"
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Change Currently Registered Email Address..."
-msgstr "Đổi địa chỉ thư đăng ký hiện thời..."
+msgstr "Thay đổi địa chỉ thư điện tử đăng ký hiện thời..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6466
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Hiển thị các bạn chát chờ sự cho phép"
 
-#: ../libpurple/protocols/oscar/oscar.c:6472
 msgid "Search for Buddy by Email Address..."
 msgstr "Tìm kiếm bạn chát theo địa chỉ thư..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6477
 msgid "Search for Buddy by Information"
 msgstr "Tìm kiếm bạn chát theo thông tin"
 
-#: ../libpurple/protocols/oscar/oscar.c:6545
-msgid "Use recent buddies group"
-msgstr "Dùng nhóm bạn bè vừa gặp"
-
-#: ../libpurple/protocols/oscar/oscar.c:6548
-msgid "Show how long you have been idle"
-msgstr "Hiển thị thời gian nghỉ"
-
-#: ../libpurple/protocols/oscar/oscar.c:6703
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
-msgstr "Luôn luôn dùng máy phục vụ ủy nhiệm\n"
+msgstr ""
+"Luôn luôn dùng máy phục vụ ủy nhiệm\n"
 "AIM/ICQ để truyền tập tin và gửi/nhận\n"
 "tin nhắn trực tiếp (chặm hơn nhưng\n"
 "không cho người khác thấy địa chỉ IP của bạn)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
+msgid "Allow multiple simultaneous logins"
+msgstr "Cho phép đăng ký nhiều lần đồng thời"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Yêu cầu %s kết nối với chúng tôi tại %s:%hu để gửi tin nhắn trực tiếp."
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Đang thử kết nối đến %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Đang thử kết nối thông qua máy phục vụ ủy nhiệm."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s mới yêu cầu kết nối trực tiếp với %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1039
 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 "Điều này đòi hỏi một kết nối trực tiếp giữa hai máy tính và là cần thiết để dùng nhắn tin nhanh có hình ảnh. Tuy nhiên, người ta sẽ thấy địa chỉ IP của bạn, là nguy cơ ảnh hưởng đến quyền riêng tư."
+msgstr ""
+"Điều này đòi hỏi một kết nối trực tiếp giữa hai máy tính và là cần thiết để "
+"dùng nhắn tin nhanh có hình ảnh. Tuy nhiên, người ta sẽ thấy địa chỉ IP của "
+"bạn, là nguy cơ ảnh hưởng đến quyền riêng tư."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Thông tin chính"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Giới thiệu cá nhân"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Số QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Quốc gia/Vùng"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Tỉnh/Bang"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Ký hiệu tử vi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Ký hiệu hoàng đạo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Loại máu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Cao đẳng"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Mã bưu điện"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Điện thoại di động"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Điện thoại"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Bảo Bình"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Song Ngư"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Bạch Dương"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Kim Ngưu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Song Tử"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Cự Giải"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Sư Tử"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Xử Nữ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Thiên Bình"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Thần Nông"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Nhân Mã"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Ma Kết"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Tý"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Sừu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Đân"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Mão"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Thìn"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Ty"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Ngọ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Mùi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Thân"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Dậu"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Tuất"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Hợi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Khác"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Sửa đổi thông tin của tôi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Sửa đổi thông tin của tôi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Thông tin của bạn đã được cập nhật"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
-msgstr "Hiện thời không hỗ trợ tính năng đặt mặt tự chọn. Hãy chọn một ảnh từ %s."
+msgstr ""
+"Hiện thời không hỗ trợ tính năng đặt mặt tự chọn. Hãy chọn một ảnh từ %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Mặt QQ không hợp lệ"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Bạn đã từ chối yêu cầu của %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Gõ lý do :"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Từ chối yêu cầu"
 
-#.title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#. title
 msgid "Sorry, you are not my type..."
 msgstr "Tiếc là tôi quá bận..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Không thêm được bạn chát với yêu cầu sự cho phép"
 
-#.TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
+#. TODO: We don't really need to notify the user about this, do we?
 msgid "You have successfully removed a buddy"
 msgstr "Bạn đã gỡ bỏ thành công một bạn chát"
 
-#.TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
+#. TODO: Does the user really need to be notified about this?
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "Bạn đã loại bỏ thành công bạn thân ra khỏi danh sách bạn bè của người bạn"
+msgstr ""
+"Bạn đã loại bỏ thành công bạn thân ra khỏi danh sách bạn bè của người bạn"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Người dùng %d yêu cầu sự cho phép"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Gõ yêu cầu vào đây"
 
-#.TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
 msgid "Would you be my friend?"
 msgstr "Bạn có muốn nói chuyện phải không?"
 
-#.multiline
-#.masked
-#.hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#. multiline
+#. masked
+#. hint
 msgid "Send"
 msgstr "Gửi"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "Bạn đã thêm %d vào danh sách bạn bè"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Lỗi QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid không hợp lệ"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID nhóm"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Người tạo"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Mô tả nhóm"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Phép"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Hãy nhập ID nhóm bên ngoài"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Bạn chỉ có khả năng tìm kiếm nhóm QQ bên bỉ\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "Người dùng %d đã yêu cầu tham gia nhóm %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Lý do : %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "Thao tác QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Tán thành"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Quản trị %2$d đã từ chối yêu cầu tham gia nhóm %1$d của bạn"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Quản trị %2$d đã tán thành yêu cầu tham gia nhóm %1$d của bạn"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Bạn [%d] đã rời nhóm « %d »"
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Bạn [%d] đã được thêm vào nhóm « %d »"
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Nhóm này đã được thêm vào danh sách bạn bè của bạn"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Tôi không phải là thành viên"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Tôi là thành viên"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Tôi muốn tham gia"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Tôi là quản trị"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Trạng thái không rõ"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Nhóm này không cho phép người khác tham gia"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Bạn đã rời thành công nhóm này"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Phép nhóm QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Máy phục vụ QQ đã chấp nhận yêu cầu sự cho phép của bạn"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Bạn đã gõ một ID nhóm nằm bên ngoài phạm vi hợp lệ"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Bạn chắc chắn muốn rời Qun này không?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "Ghi chú : nếu bạn là người tạo, \n"
+msgstr ""
+"Ghi chú : nếu bạn là người tạo, \n"
 "cuối cùng thao tác này sẽ gỡ bỏ Qun này."
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Mã [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr "Lỗi thao tác nhóm"
-
-#.we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
+#. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Bạn có muốn tán thành yêu cầu không?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
 msgstr "Gõ lý do :"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
 msgstr "Bạn đã sửa đổi thành công thành viên Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modified Qun information"
 msgstr "Bạn đã sửa đổi thành công thông tin Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Bạn đã tạo thành công một Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Bạn có muốn thiết lập chi tiết Qun ngay bây giờ không?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Thiết lập"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Thông điệp hệ thống"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Không gửi được tin nhắn."
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
-msgid "Keep alive error"
-msgstr "Lỗi giữ cho kết nối hoạt động"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Không rõ %d"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
-msgstr "Lỗi yêu cầu hiệu bài đăng nhập"
+msgid "Level"
+msgstr "Cấp"
 
-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr "Không thể đăng nhập, hãy kiểm tra bản ghi gỡ lỗi"
+#, fuzzy
+msgid "Member"
+msgstr "Là thành viên từ"
 
-#.we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140
-#: ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:264
-#: ../libpurple/protocols/yahoo/ycht.c:550
-msgid "Unable to connect."
-msgstr "Không thể kết nối."
+msgid " VIP"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:187
-#, c-format
-msgid "Unknown-%d"
-msgstr "Không rõ %d"
+msgid " TCP"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:212
-msgid "TCP Address"
-msgstr "Địa chỉ TCP"
+#, fuzzy
+msgid " FromMobile"
+msgstr "Di động"
 
-#: ../libpurple/protocols/qq/qq.c:214
-msgid "UDP Address"
-msgstr "Địa chỉ UDP"
+#, fuzzy
+msgid " BindMobile"
+msgstr "Di động"
 
-#: ../libpurple/protocols/qq/qq.c:243
-msgid "Level"
-msgstr "Cấp"
+#, fuzzy
+msgid " Video"
+msgstr "Ảnh động trực tiếp"
+
+# Name: don't translate/Tên: đừng dịch
+#, fuzzy
+msgid " Space"
+msgstr "MySpace"
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Tên không hợp lệ"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Hiện thời trực tuyến</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Cập nhật cuối:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#, fuzzy, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>IP máy phục vụ </b>: %s: %d<br>\n"
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Chế độ kết nối:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
-#, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
+#, fuzzy, c-format
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
 msgstr "<b>IP máy phục vụ </b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>IP công của tôi:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Thời gian đăng nhập:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>IP đăng nhập cuối:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Thời gian đăng nhập cuối:</b> %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Thông tin đăng nhập"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Đặt thông tin của tôi"
 
-#: ../libpurple/protocols/qq/qq.c:537
-#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Đổi mật khẩu"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Hiện thông tin đăng nhập"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Để lại QQ Qun này"
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Chặn bạn chát này"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/qq/qq.c:726
-#: ../libpurple/protocols/qq/qq.c:728
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "QQ Protocol\tPlugin"
 msgstr "Phần bổ sung\tgiao thức QQ"
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Kết nối bằng TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
+msgid "resend interval(s)"
+msgstr ""
+
+#, fuzzy
+msgid "Keep alive interval(s)"
+msgstr "Lỗi giữ cho kết nối hoạt động"
+
+msgid "Update interval(s)"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "Tựa đề không hợp lệ"
+
+msgid "Keep alive error"
+msgstr "Lỗi giữ cho kết nối hoạt động"
+
+#, fuzzy
+msgid "Failed to connect server"
+msgstr "Không kết nối được với máy phục vụ."
+
 msgid "Socket error"
 msgstr "Lỗi ổ cắm"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
+#, fuzzy, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Mất kết nối với máy phục vụ :\n"
+"%s"
+
 msgid "Unable to read from socket"
 msgstr "Không thể đọc từ ổ cắm"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+msgid "Write Error"
+msgstr "Lỗi ghi"
+
+msgid "Connection lost"
+msgstr "Kết nối bị mất"
+
+msgid "Couldn't resolve host"
+msgstr "Không thể giải quyết máy"
+
+msgid "hostname is NULL or port is 0"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Connecting server %s, retries %d"
+msgstr ""
+"Lỗi kết nối từ máy phục vụ %s:\n"
+"%s"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Không thể kết nối."
+
+msgid "Could not resolve hostname"
+msgstr "Không thể giải quyết tên máy"
+
+msgid "Unable to login. Check debug log."
+msgstr "Không thể đăng nhập, hãy kiểm tra sổ theo dõi gỡ lỗi"
+
+msgid "Unable to login"
+msgstr "Không thể đăng nhập"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Không đăng nhập được, không có đáp ứng"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Bạn [%d] đã được thêm vào nhóm « %d »"
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d đã từ chối nhận tập tin %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Gửi tập tin"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d đã thôi truyền %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
-msgid "Connection lost"
-msgstr "Kết nối bị mất"
-
-#: ../libpurple/protocols/qq/sendqueue.c:133
-msgid "Login failed, no reply"
-msgstr "Không đăng nhập được, không có đáp ứng"
-
-#: ../libpurple/protocols/qq/sys_msg.c:110
 msgid "Do you want to add this buddy?"
 msgstr "Bạn có muốn thêm bạn chát này không?"
 
-#.only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#. only need to get value
 #, c-format
 msgid "You have been added by %s"
 msgstr "Bạn đã được %s thêm"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr "Bạn có muốn thêm họ không?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s đã thêm bạn [%s] vào danh sách bạn bè của họ"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Người dùng %s đã từ chối yêu cầu của bạn"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
 msgstr "Người dùng %s đã tán thành yêu cầu của bạn"
 
-#.TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
+#. TODO: this should go through purple_account_request_authorization()
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s muốn thêm bạn [%s] như người bạn"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Tin nhẳn: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s không có trong danh sách bạn bè của bạn"
 
-#: ../libpurple/protocols/sametime/sametime.c:419
+#, fuzzy, c-format
+msgid "Notice from: %s"
+msgstr "Thông báo từ %s"
+
+#, c-format
+msgid "%s"
+msgstr ""
+
 msgid "Connection closed (writing)"
 msgstr "Kết nối bị đóng (đang ghi)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Tên nhóm:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID nhóm ghi chú :</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Thông tin về nhóm %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Thông tin Sổ địa chỉ ghi chú"
 
-#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Mời nhóm vào hội thảo..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "Lấy thông tin Sổ địa chỉ ghi chú"
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Đang gửi tin hiệu Tay bắt tay"
 
-#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Đợi đợi xác nhận Tay bắt tay"
 
-#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Đã xác nhận Tay bắt tay, đang gửi Đang nhập"
 
-#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "Đang chờ xác nhận Đăng nhập"
 
-#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "Đăng nhập bị chuyển tiếp"
 
-#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Đang buộc đăng nhập"
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "Đăng nhập đã được xác nhận"
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Đang khởi chạy dịch vụ"
 
-#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Một quản trị Sametime đã thông báo như theo đây trên máy phục vụ %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Thông báo Quản trị Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "Kết nối bị đặt lại"
 
-#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Lỗi đọc từ ổ cắm: %s"
 
-#.this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
+#. this is a regular connect, error out
 msgid "Unable to connect to host"
 msgstr "Không thể kết nối đến máy"
 
-#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "Thông báo từ %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "Hội thảo bị đóng"
 
-#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "Không thể gửi tin: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Nơi bị đóng"
 
-#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "Máy vi âm"
 
-#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "Loa"
 
-#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "Máy ảnh động"
 
-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "Hỗ trợ"
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "Người dùng bên ngoài"
 
-#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "Tạo cuộc hội thảo với người dùng"
 
-#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "Hãy gõ chủ đề cho cuộc hội thảo mới, và lời mời cần gửi cho %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "Hội thảo mới"
 
-#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "Tạo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "Hội thảo công bố"
 
-#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "Tạo hội thảo mới..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "Mời người dùng vào hội thảo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
 #, 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 "Hãy chọn một cuộc hội thảo trong danh sách bên dưới, để gửi cho người dùng %s một lời mời. Chọn mục « Tạo hội thảo mới » nếu bạn muốn tạo một cuộc hội thảo mới vào đó cần mời người dùng này."
+msgstr ""
+"Hãy chọn một cuộc hội thảo trong danh sách bên dưới, để gửi cho người dùng %"
+"s một lời mời. Chọn mục « Tạo hội thảo mới » nếu bạn muốn tạo một cuộc hội "
+"thảo mới vào đó cần mời người dùng này."
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "Mời vào hội thảo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "Mời vào hội thảo..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "Gửi thông báo TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3628
-#: ../pidgin/gtkconv.c:4418
 msgid "Topic:"
 msgstr "Chủ đề:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "Chưa ghi rõ máy phục vụ công đồng Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3681
 #, 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 "Chưa cấu hình máy hay địa chỉ IP cho tài khoản Meanwhile %s. Hãy gõ nó bên dưới để tiếp tục đăng nhập."
+msgstr ""
+"Chưa cấu hình máy hay địa chỉ IP cho tài khoản Meanwhile %s. Hãy gõ nó bên "
+"dưới để tiếp tục đăng nhập."
 
-#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Thiết lập Kết nối Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "Chưa ghi rõ máy phục vụ công đồng Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "Kết nối"
 
-#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Không rõ (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "Trình khách biết cuối"
 
-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "Tên người dùng"
 
-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "Đã gõ một ID người dùng không rõ ràng"
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
 #, 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 "Bộ nhận diện « %s » có thể tham chiếu đến bất cứ người dùng nào trong những người dùng theo đây. Hãy chọn người dùng đúng trong danh sách bên dưới, để thêm họ vào danh sách bạn bè của bạn."
+msgstr ""
+"Bộ nhận diện « %s » có thể tham chiếu đến bất cứ người dùng nào trong những "
+"người dùng theo đây. Hãy chọn người dùng đúng trong danh sách bên dưới, để "
+"thêm họ vào danh sách bạn bè của bạn."
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "Chọn người dùng"
 
-#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "Không thể thêm người dùng: không tìm thấy"
 
-#: ../libpurple/protocols/sametime/sametime.c:4466
 #, 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 "Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công đồng Sametime. Mục này đã bị gỡ bỏ khỏi danh sách bạn bè của bạn."
+msgstr ""
+"Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công đồng "
+"Sametime. Mục này đã bị gỡ bỏ khỏi danh sách bạn bè của bạn."
 
-#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
-msgstr "Lỗi đọc tập tin %s: \n"
+msgstr ""
+"Lỗi đọc tập tin %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "Danh sách bạn bè đã lưu ở xa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "Chế độ cất giữ danh sách bạn bè"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "Chỉ danh sách bạn bè cục bộ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "Trộn danh sách từ máy phục vụ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "Trộn và lưu danh sách vào máy phục vụ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "Đồng bộ hoá danh sách với máy phục vụ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Nhập khẩu danh sách Sametime cho tài khoản %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Xuất khẩu danh sách Sametime cho tài khoản %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "Không thể thêm nhóm: nhóm đã có"
 
-#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Một nhóm tên « %s » đã có trong danh sách bạn bẻ của bạn."
 
-#: ../libpurple/protocols/sametime/sametime.c:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "Không thể thêm nhóm"
 
-#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "Kết quả có thể"
 
-#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Kết quả tìm kiếm Sổ địa chỉ ghi chú"
 
-#: ../libpurple/protocols/sametime/sametime.c:5435
 #, 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 "Bộ nhận diện « %s » có thể tham chiếu đến bất cứ nhóm Sổ địa chỉ ghi chú nào trong những nhóm theo đây. Hãy chọn nhóm đúng trong danh sách bên dưới, để thêm nó vào danh sách bạn bè của bạn."
+msgstr ""
+"Bộ nhận diện « %s » có thể tham chiếu đến bất cứ nhóm Sổ địa chỉ ghi chú nào "
+"trong những nhóm theo đây. Hãy chọn nhóm đúng trong danh sách bên dưới, để "
+"thêm nó vào danh sách bạn bè của bạn."
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "Chọn nhóm Sổ địa chỉ ghi chú"
 
-#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "Không thể thêm nhóm: không tìm thấy"
 
-#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr "Bộ nhận diện « %s » không tương ứng với bất cứ nhóm Sổ địa chỉ ghi chú nào trong công đồng Sametime."
+msgstr ""
+"Bộ nhận diện « %s » không tương ứng với bất cứ nhóm Sổ địa chỉ ghi chú nào "
+"trong công đồng Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Nhóm Sổ địa chỉ ghi chú"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527
 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 "Hãy gõ vào trường bên dưới tên của một nhóm Sổ địa chỉ ghi chú, để thêm vào danh sách bạn bè của bạn nhóm này và các thành viên của nó."
+msgstr ""
+"Hãy gõ vào trường bên dưới tên của một nhóm Sổ địa chỉ ghi chú, để thêm vào "
+"danh sách bạn bè của bạn nhóm này và các thành viên của nó."
 
-#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Kết quả tìm kiếm « %s »"
 
-#: ../libpurple/protocols/sametime/sametime.c:5577
 #, 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 "Bộ nhận diện « %s » có thể tham chiếu đến bất cứ người dùng nào trong những người theo đây. Bạn có thể thêm những người dùng này vào danh sách bạn bè của bạn, hoặc gửi cho họ tin nhẳn với cái nút hành động bên dưới."
+msgstr ""
+"Bộ nhận diện « %s » có thể tham chiếu đến bất cứ người dùng nào trong những "
+"người theo đây. Bạn có thể thêm những người dùng này vào danh sách bạn bè "
+"của bạn, hoặc gửi cho họ tin nhẳn với cái nút hành động bên dưới."
 
-#: ../libpurple/protocols/sametime/sametime.c:5584
-#: ../pidgin/gtknotify.c:767
 msgid "Search Results"
 msgstr "Kết quả tìm kiếm"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "Không tìm thấy"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công đồng Sametime."
+msgstr ""
+"Bộ nhận diện « %s » không tương ứng với bất cứ người dùng nào trong công đồng "
+"Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "Không tìm thấy"
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "Tìm người dùng"
 
-#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
-msgstr "Hãy gõ vào trường bên dưới một tên hay ID bộ phận, để tìm kiếm người dùng tương ứng trong công đồng Sametime."
+msgstr ""
+"Hãy gõ vào trường bên dưới một tên hay ID bộ phận, để tìm kiếm người dùng "
+"tương ứng trong công đồng Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "Tìm người dùng"
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "Nhập danh sách Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "Xuất danh sách Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "Thêm nhóm Sổ địa chỉ ghi chú..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "Tìm người dùng..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "Buộc đăng nhập (bỏ qua khi máy phục vụ chuyển tiếp)"
 
-#.pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
+#. pretend to be Sametime Connect
 msgid "Hide client identity"
 msgstr "Ẩn tên trình khách"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Người dùng %s hiện không có mặt trong mạng"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Kiểm tra mã khoá"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Không thể thực hiện kiểm tra mã khoá"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Có lỗi trong quá trình kiểm tra mã khoá"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Kiểm tra mã khoá không thực hiện được"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Quá hạn chờ trong lúc kiểm tra mã khoá"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Kiểm tra mã khoá bị huỷ"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Kiểm tra mã khoá đã bắt đầu."
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Không thể bắt đầu kiểm tra mã khoá với chính bạn."
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Người dùng ở xa không còn hiện diện lại trong mạng"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "Nhận được yêu cầu kiểm tra mã khoá từ %s. Bạn có muốn kiểm tra mã khoá hông?"
+msgstr ""
+"Nhận được yêu cầu kiểm tra mã khoá từ %s. Bạn có muốn kiểm tra mã khoá hông?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
-msgstr "Người dùng ở xa đang chờ kiểm tra mã khoá trên:\n"
+msgstr ""
+"Người dùng ở xa đang chờ kiểm tra mã khoá trên:\n"
 "Máy ở xa: %s\n"
 "Cổng ở xa: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Yêu cầu kiểm tra mã khoá"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM bằng mật khẩu"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Không thể đặt khoá tin nhắn"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Đặt mật khẩu tin nhắn"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Lấy khoá công"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Không thể lấy khoá công"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Hiện khoá công"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Không thể nạp khoá công"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Thông tin người dùng"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Không thể lấy thông tin người dùng"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Bạn chát %s không đáng tin."
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/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 "Bạn không thể nhận thông báo về bạn chát nếu bạn không nhập khẩu mã khoá công cộng của người đó. Bạn có thể dùng lệnh « Lấy khoá công »."
+msgstr ""
+"Bạn không thể nhận thông báo về bạn chát nếu bạn không nhập khẩu mã khoá "
+"công cộng của người đó. Bạn có thể dùng lệnh « Lấy khoá công »."
 
-#.Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
+#. Open file selector to select the public key.
 msgid "Open..."
 msgstr "Mở..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Bạn chát %s không hiện diện trên mạng"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
-msgstr "Để thêm vào bạn chát, bạn phải nhập khẩu khoá công cộng của người đó. Nhấn nút « Nhập » để nhập khẩu một mã khoá công cộng."
+msgstr ""
+"Để thêm vào bạn chát, bạn phải nhập khẩu khoá công cộng của người đó. Nhấn "
+"nút « Nhập » để nhập khẩu một mã khoá công cộng."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Chọn người dùng đúng"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
 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ìm thấy nhiều hơn một người dùng với cùng một mã khoá công cộng. Hãy chọn người bạn muốn và thêm vào danh sách bạn bè."
+msgstr ""
+"Tìm thấy nhiều hơn một người dùng với cùng một mã khoá công cộng. Hãy chọn "
+"người bạn muốn và thêm vào danh sách bạn bè."
 
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
 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ìm thấy nhiều người dùng có cùng tên gọi. Hãy chọn tên bạn muốn để thêm vào danh sách bạn bè. "
+msgstr ""
+"Tìm thấy nhiều người dùng có cùng tên gọi. Hãy chọn tên bạn muốn để thêm vào "
+"danh sách bạn bè. "
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Tách rời"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Bệnh"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Đánh thức tôi"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiếu động thái quá"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Ro-bốt"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Vui"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Buồn"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Giận dữ"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Ghen tị"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Xấu hổ"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Vô địch"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Yêu"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Buồn ngủ"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Buồn tẻ"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Hào hứng"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Lo âu"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Chế độ người dùng"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Liên lạc đã thích"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Ngôn ngữ đã thích"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Thiết bị"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Nơi ở địa cầu"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Đặt lại khóa tin nhắn"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "Tin nhắn trao đổi khóa"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "Tin nhắn có mật khẩu"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Lấy khóa công..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Giết người dùng"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Vẽ trên bảng trắng"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Mật khẩu :"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kênh %s không tồn tại trên mạng"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Thông tin kệnh"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Không thể lấy thông tin kênh"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Tên kênh:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Đếm người dùng:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Người lập kênh:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Mật mã kênh:</b> %s"
 
-#.Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kênh HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Chủ đề kênh:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Chế độ kênh:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Vân tay khoá người lập kênh:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Mẫu bi bô khoá người lập kênh:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Thêm khóa công kênh"
 
-#.Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
-#: ../libpurple/protocols/silc10/chat.c:291
+#. Add new public key
 msgid "Open Public Key..."
 msgstr "Mở khóa công..."
 
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Mật khẩu kênh"
 
-#: ../libpurple/protocols/silc/chat.c:432
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Danh sách khóa công kênh"
 
-#: ../libpurple/protocols/silc/chat.c:437
-#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 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 "Việc xác minh khi truy cập kênh được dùng để đảm bảo an ninh cho kênh khi có "
+msgstr ""
+"Việc xác minh khi truy cập kênh được dùng để đảm bảo an ninh cho kênh khi có "
 "truy cập không xác định. Việc xác minh có thể dựa cho mật khẩu và chữ ký "
 "điện tử. Nếu mật khẩu được thiết lập, cần phải có mật khẩu để tham gia. Nếu "
 "mã khóa công cộng của kênh được lập, thì chỉ có người dùng có mã khóa công "
 "cộng nẳm trong danh sách mới  được phép tham gia."
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Xác thực kênh"
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Thêm / Bỏ"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Tên nhóm"
 
-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
-#: ../libpurple/protocols/silc/silc.c:1163
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Mật khẩu"
 
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Hãy nhập tên nhóm riêng và mật khẩu cho kênh %s."
 
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Thêm nhóm riêng kênh"
 
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Giới hạn người dùng"
 
-#: ../libpurple/protocols/silc/chat.c:747
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "Đặt giới hạn người dùng trên kênh. Trả về không để đặt lại giới hạn người dùng."
+msgstr ""
+"Đặt giới hạn người dùng trên kênh. Trả về không để đặt lại giới hạn người "
+"dùng."
 
-#: ../libpurple/protocols/silc/chat.c:911
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Danh sách mời"
 
-#: ../libpurple/protocols/silc/chat.c:916
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Danh sách cấm"
 
-#: ../libpurple/protocols/silc/chat.c:924
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Thêm nhóm riêng"
 
-#: ../libpurple/protocols/silc/chat.c:937
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Đặt lại thường xuyên"
 
-#: ../libpurple/protocols/silc/chat.c:942
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Đặt thường xuyên"
 
-#: ../libpurple/protocols/silc/chat.c:950
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Đặt giới hạn người dùng"
 
-#: ../libpurple/protocols/silc/chat.c:956
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Đặt lại giới hạn chủ đề"
 
-#: ../libpurple/protocols/silc/chat.c:961
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Đặt giới hạn chủ đề"
 
-#: ../libpurple/protocols/silc/chat.c:968
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Đặt lại kênh riêng"
 
-#: ../libpurple/protocols/silc/chat.c:973
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Đặt kênh riêng"
 
-#: ../libpurple/protocols/silc/chat.c:980
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Đặt lại kênh bí mật"
 
-#: ../libpurple/protocols/silc/chat.c:985
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Đặt kênh bí mật"
 
-#: ../libpurple/protocols/silc/chat.c:1046
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Bạn phải gia nhập kênh %s trước khi có thể gia nhập nhóm riêng."
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Tham gia nhóm riêng"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Không thể tham gia nhóm riêng"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1360
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Gọi lệnh"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1361
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Không thể gọi lệnh"
 
-#: ../libpurple/protocols/silc/chat.c:1246
-#: ../libpurple/protocols/silc/silc.c:1362
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Lệnh không rõ"
 
-#: ../libpurple/protocols/silc/ft.c:85
-#: ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104
-#: ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112
-#: ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120
-#: ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277
-#: ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288
-#: ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89
-#: ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Truyền tập tin bảo mật"
 
-#: ../libpurple/protocols/silc/ft.c:86
-#: ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105
-#: ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113
-#: ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121
-#: ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93
-#: ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Lỗi trong khi truyền tập tin"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Máy ở xa đã ngắt kết nối"
 
-#: ../libpurple/protocols/silc/ft.c:106
-#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Từ chối cấp phép"
 
-#: ../libpurple/protocols/silc/ft.c:110
-#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Trao đổi mã khóa thất bại"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Quá hạn tạo kết nối"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Không tạo được kết nối"
 
-#: ../libpurple/protocols/silc/ft.c:122
-#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Phiên truyền tập tin không tồn tại"
 
-#: ../libpurple/protocols/silc/ft.c:273
-#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Không có phiên truyền tập tin đang chạy"
 
-#: ../libpurple/protocols/silc/ft.c:278
-#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Tiến trình truyền tập tin đã bắt đầu"
 
-#: ../libpurple/protocols/silc/ft.c:283
-#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Không thể kiểm tra mã khoá để truyền tập tin"
 
-#: ../libpurple/protocols/silc/ft.c:289
-#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Không thể bắt đầu tiến trình truyền tập tin"
 
-#: ../libpurple/protocols/silc/ft.c:426
-#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Không thể gửi tập tin"
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Gặp lỗi"
 
-#: ../libpurple/protocols/silc/ops.c:533
-#: ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s đã đổi chủ đề của <I>%s</I> thành: %s"
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> đã đặt các chế độ của kênh <I>%s</I> thành: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> đã gở bỏ tất cả các chế độ của kênh <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> đã đặt các chế độ của <I>%s's</I> thành: %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> đã gỡ  bỏ tất cả các chế độ của <I>%s's</I>"
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Bạn đã bị <I>%2$s</I> đã khỏi <I>%1$s</I> (%3$s)"
 
-#: ../libpurple/protocols/silc/ops.c:718
-#: ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Bạn đã bị %s giết (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749
-#: ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Bị %s giết (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Máy phục vụ đã ngắt kết nối"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Thông tin cá nhân"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Ngày sinh"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Nhiệm vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1156
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Đơn vị"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Ghi chú"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Tham gia chát"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Bạn là người lập kênh trên <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Người lập kênh trên <I>%s</I> là <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Tên thật"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Chuỗi trạng thái"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Vân tay khóa công"
 
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Mẫu bi bô khoá công"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Nữa.."
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc/silc.c:1220
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Tách rời khỏi máy phục vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Không thể tách rời"
 
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Không thể đặt chủ đề"
 
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Không đổi được tên hiệu"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Danh sách phòng"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Không thể lấy danh sách phòng"
 
-#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Mạng rỗng"
 
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Chưa nhận khoá công"
 
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Thông tin máy phục vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Không thể lấy thông tin về máy phục vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1552
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Thống kê máy phục vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1553
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Không thể lấy thống kê về máy phục vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11860,2186 +8466,1695 @@ msgid ""
 "Total routers: %d\n"
 "Total server operators: %d\n"
 "Total router operators: %d\n"
-msgstr "Máy phục vụ cục bộ :\n"
-" • giờ khởi chạy		%s\n"
-" • thời gian chạy		%s\n"
-" • số trình khách		%d\n"
-" • số kênh 			%d\n"
-" • số người điều hành	%d\n"
+msgstr ""
+"Máy phục vụ cục bộ :\n"
+" • giờ khởi chạy\t\t%s\n"
+" • thời gian chạy\t\t%s\n"
+" • số trình khách\t\t%d\n"
+" • số kênh \t\t\t%d\n"
+" • số người điều hành\t%d\n"
 "\n"
 "Bộ định tuyến cục bộ :\n"
-" • số người điều hành	%d\n"
+" • số người điều hành\t%d\n"
 "\n"
 "Ô cục bộ :\n"
-" • số trình khách	%d\n"
-" • số kênh		%d\n"
-" • số máy phục vụ	%d\n"
+" • số trình khách\t%d\n"
+" • số kênh\t\t%d\n"
+" • số máy phục vụ\t%d\n"
 "\n"
 "Tổng số :\n"
-" • trình khách		%d\n"
-" • kênh			%d\n"
-" • máy phục vụ	%d\n"
-" • bộ định tuyến	%d\n"
-" • người điều hành máy phục vụ		%d\n"
-" • người điều hành bộ định tuyến		%d\n"
-
-#: ../libpurple/protocols/silc/ops.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1604
+" • trình khách\t\t%d\n"
+" • kênh\t\t\t%d\n"
+" • máy phục vụ\t%d\n"
+" • bộ định tuyến\t%d\n"
+" • người điều hành máy phục vụ\t\t%d\n"
+" • người điều hành bộ định tuyến\t\t%d\n"
+
 msgid "Network Statistics"
 msgstr "Thống kê mạng"
 
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping thất bại"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Nhận được đáp ứng ping từ máy phục vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Không thể giết người dùng"
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "THEO DÕI"
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Không thể theo dõi người dùng"
 
-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
-#: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Đang tiếp tục lại phiên chạy"
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Đang xác thực kết nối"
 
-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Đang thẩm tra khoá công máy phục vụ"
 
-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Yêu cầu mật khẩu"
 
-#: ../libpurple/protocols/silc/pk.c:98
-#: ../libpurple/protocols/silc10/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 "Đã nhận mã khoá công cộng của %s. Bản sao cục bộ của bạn không phù hợp với mã khoá này. Bạn vẫn muốn chấp nhận mã khoá này?"
+msgstr ""
+"Đã nhận mã khoá công cộng của %s. Bản sao cục bộ của bạn không phù hợp với "
+"mã khoá này. Bạn vẫn muốn chấp nhận mã khoá này?"
 
-#: ../libpurple/protocols/silc/pk.c:103
-#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Đã nhận mã khoá công cộng của %s. Bạn có chấp nhận mã khoá này?"
 
-#: ../libpurple/protocols/silc/pk.c:107
-#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
 "\n"
 "%s\n"
 "%s\n"
-msgstr "Vân tay và mẫu bi bô cho %s là: \n"
+msgstr ""
+"Vân tay và mẫu bi bô cho %s là: \n"
 "\n"
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110
-#: ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Thẩm tra khoá công"
 
-#: ../libpurple/protocols/silc/pk.c:115
-#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Xem..."
 
-#: ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Kiểu khoá công không được hỗ trợ"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Bị máy phục vụ ngắt kết nối"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Gặp lỗi trong khi kết nối tới máy phục vụ SILC"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Trao đổi mã khoá thất bại"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Phục hồi phiên chạy tách rời đã thất bại. Nhấn « Tái kết nối » để tạo kết nối mới."
+msgstr ""
+"Phục hồi phiên chạy tách rời đã thất bại. Nhấn « Tái kết nối » để tạo kết nối "
+"mới."
 
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Kết nối bị lỗi"
 
-#: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Đang thực hiện trao đổi mã khoá"
 
-#.Progress
-#: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
-msgid "Connecting to SILC Server"
-msgstr "Đang kết nối tới máy phục vụ SILC"
+msgid "Unable to create connection"
+msgstr "Không thể tạo kết nối"
 
-#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
 msgstr "Không thể nạp cặp khoá SILC"
 
-#: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
-msgid "Unable to create connection"
-msgstr "Không thể tạo kết nối"
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "Đang kết nối tới máy phục vụ SILC"
 
-#: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Tràn bộ nhớ"
 
-#: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Không thể khởi tạo giao thức SILC"
 
-#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "Lỗi nạp cặp khoá SILC"
 
-#: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:650
+#, fuzzy, c-format
+msgid "Download %s: %s"
+msgstr "Người dùng trên %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Tâm trạng hiện thời của bạn"
 
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1741
+#, c-format
 msgid "Normal"
 msgstr "Bình thường"
 
-#: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Yêu"
 
-#: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
-msgstr "\n"
+msgstr ""
+"\n"
 "Phương pháp liên lạc bạn đề nghị"
 
-#: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Hội thảo ảnh động"
 
-#: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Trạng thái hiện tại của bạn"
 
-#: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Dịch vụ trực tuyến"
 
-#: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Cho phép người khác xem các dịch vụ bạn đang sử dụng"
 
-#: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Cho phép người khác xem máy tính bạn đang sử dụng"
 
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Tập tin VCard của bạn"
 
-#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Múi giờ (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Thuộc tính trạng thái trực tuyến của người dùng"
 
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
 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 "Bạn có thể cho phép người khác xem thông tin về trạng thái trực tuyến và thông tin cá nhân đều của mình. Hãy điền vào những thông tin mà bạn cho phép người khác xem."
-
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+msgstr ""
+"Bạn có thể cho phép người khác xem thông tin về trạng thái trực tuyến và "
+"thông tin cá nhân đều của mình. Hãy điền vào những thông tin mà bạn cho phép "
+"người khác xem."
+
 msgid "Message of the Day"
 msgstr "Thông điệp của Hôm nay"
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Không có sẵn Thông điệp của Hôm nay"
 
-#: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Không có sẵn Thông điệp của Hôm nay liên quan đến kết nối này"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1171
-#: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Tạo cặp khoá SILC mới"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Hai mật khẩu không trùng"
 
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Không tạo ra được cặp khoá"
 
-#: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Độ dài khoá"
 
-#: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Tập tin khoá công"
 
-#: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Tập tin khoá riêng"
 
-#: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Mật khẩu (gõ lại)"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Tạo ra cặp khoá"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Trạng thái trực tuyến"
 
-#: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Xem Thông điệp của Hôm nay"
 
-#: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Tạo cặp khoá SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Người dùng <I>%s</I> không có trên mạng"
 
-#: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Chủ đề quá dài"
 
-#: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Phải ghi rõ tên hiệu"
 
-#: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "không tìm thấy kênh %s"
 
-#: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "chế độ kênh cho %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "chưa đặt chế độ kênh trên %s"
 
-#: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Không đặt được chế độ kênh cho %s"
 
-#: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Không rõ lệnh %s (có thể trình khách bị lỗi)"
 
 # Trong các chuỗi kiểu này, phần nằm trước dấu ngoặc vuông thì có nghĩa chữ, nó là lệnh cần gõ vào (đừng dịch) Có thể dịch [tên biến] nằm bên trong dấu ngoặc vuông. Phần sau thì giải thích lệnh này: dịch nhé.
-#: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kênh]:  Rời chát"
 
-#: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kênh]:  Rời chát"
 
-#: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;chủ đề mới&gt;]:  Xem hoặc đổi chủ đề"
 
-#: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kênh&gt; [&lt;mật khẩu&gt;]:  Tham gia chat trên mạng này"
 
-#: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list: Liệt kê các kênh trên mạng này"
 
-#: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;tên hiệu&gt;:  Xem thông tin về người có tên hiệu này"
 
-#: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;tên hiệu&gt; &lt;thông điệp&gt;:  Gửi một thông điệp riêng cho người dùng"
+msgstr ""
+"msg &lt;tên hiệu&gt; &lt;thông điệp&gt;:  Gửi một thông điệp riêng cho người "
+"dùng"
 
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;tên hiệu&gt; [&lt;thông điệp&gt;]: Gửi một thông điệp riêng cho người dùng"
+msgstr ""
+"query &lt;tên hiệu&gt; [&lt;thông điệp&gt;]: Gửi một thông điệp riêng cho "
+"người dùng"
 
-#: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Xem Thông điệp của Hôm nay của máy phục vụ"
 
-#: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Tách phiên chạy này ra"
 
-#: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [thông điệp]: Ngưng kết nối với máy phục vụ, kèm theo tin thông điệp tùy ý"
+msgstr ""
+"quit [thông điệp]: Ngưng kết nối với máy phục vụ, kèm theo tin thông điệp "
+"tùy ý"
 
-#: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;lệnh&gt;:  Gọi bất kỳ câu lệnh trình khách silc"
 
-#: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;tên hiệu&gt; [-pubkey|&lt;lý do&gt;]:  Giết tên hiệu này"
 
-#: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;tên hiệu mới&gt;:  Đổi tên hiệu của bạn"
 
-#: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;tên hiệu&gt;:  Xem thông tin về người có tên hiệu này"
 
-#: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
-msgstr "cmode &lt;kênh&gt; [+|-&lt;các chế độ&gt;] [các đối số]:  Thay đổi hay hiển thị các chế độ kênh"
+msgstr ""
+"cmode &lt;kênh&gt; [+|-&lt;các chế độ&gt;] [các đối số]:  Thay đổi hay hiển "
+"thị các chế độ kênh"
 
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
-msgstr "cumode &lt;kênh&gt; +|-&lt;các chế độ&gt; &lt;tên hiệu&gt;:  Thay đổi các chế độ của tên hiệu trên kênh"
+msgstr ""
+"cumode &lt;kênh&gt; +|-&lt;các chế độ&gt; &lt;tên hiệu&gt;:  Thay đổi các "
+"chế độ của tên hiệu trên kênh"
 
-#: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;các chế độ người dùng&gt;:  Đặt các chế độ cho bạn trên mạng"
 
-#: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;tên hiệu&gt; [-pubkey]: Nhận đặc quyền của người điều hành máy phục vụ"
+msgstr ""
+"oper &lt;tên hiệu&gt; [-pubkey]: Nhận đặc quyền của người điều hành máy phục "
+"vụ"
 
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
-msgstr "invite &lt;kênh&gt; [-|+]&lt;tên hiệu&gt;:  mời tên hiệu, hoặc thêm/bỏ ra khỏi danh sách mời vào kênh"
+msgstr ""
+"invite &lt;kênh&gt; [-|+]&lt;tên hiệu&gt;:  mời tên hiệu, hoặc thêm/bỏ ra "
+"khỏi danh sách mời vào kênh"
 
-#: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kênh&gt; &lt;tên hiệu&gt; [chú thích]:  Đá khách ra khỏi kênh"
 
-#: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [máy phục vụ]:  Xem thông tin về chi tiết quản trị máy phục vụ"
 
-#: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kênh&gt; +|-&lt;tên hiệu&gt;]:  Cấm khách vào kênh"
 
-#: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;tên hiệu|máy phục vụ&gt;:  Lấy mã khoá công cộng của máy khách hoặc máy phục vụ"
+msgstr ""
+"getkey &lt;tên hiệu|máy phục vụ&gt;:  Lấy mã khoá công cộng của máy khách "
+"hoặc máy phục vụ"
 
-#: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats: Xem thống kê về máy phục vụ và mạng"
 
-#: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: Gửi tín hiệu PING đến máy phục vụ đã kết nối"
 
-#: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kênh&gt;:  Liệt kê các người dùng trên kênh"
 
-#: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1694
 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;kênh(s)&gt;:  Liệt kê các người dùng cụ thể trong (các) kênh\n"
-" • count		đếm\n"
-" • ops		(viết tắt) người điều hành\n"
-" • halfops	(viết tắt) người nửa điều hành\n"
-" • voices		người có quyền thoại\n"
-" • normal		bình thường"
-
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1819
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kênh(s)&gt;:  Liệt kê các "
+"người dùng cụ thể trong (các) kênh\n"
+" • count\t\tđếm\n"
+" • ops\t\t(viết tắt) người điều hành\n"
+" • halfops\t(viết tắt) người nửa điều hành\n"
+" • voices\t\tngười có quyền thoại\n"
+" • normal\t\tbình thường"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
 msgid "SILC Protocol Plugin"
 msgstr "Phần bổ sung giao thức SILC"
 
-#.*  description
-#: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1821
+#. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Giao thức Hội thoại Internet Lúc xảy ra Bảo mật (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Mạng"
 
-#: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Tập tin khoá công"
 
-#: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Tập tin khoá riêng"
 
-#: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Mật mã"
 
-#: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "Dùng sự bí mật tiếp hoàn toàn (PFS)"
 
-#: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Xác thực khoá công"
 
-#: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Chặn các tin nhắn không trao đổi mã khoá"
 
-#: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Chặn các thông điệp gửi đến bảng trắng"
 
-#: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Tự động mở bảng trắng"
 
-#: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Ký điện và thẩm tra mọi thông điệp"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Đang tạo cặp khoá SILC..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Không thể tạo cặp khoá SILC\n"
 
-#.Hint for translators: Please check the tabulator width here and in
-#.the next strings (short strings: 2 tabs, longer strings 1 tab,
-#.sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:355
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Tên thật: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Tên người dùng: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "Địa chỉ thư : \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Tên máy: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Tổ chức: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Quốc gia: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Thuật toán: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:376
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Độ dài khoá: \t%d bit\n"
 
-#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Phiên bản: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
 "%s\n"
 "\n"
-msgstr "Vân tay khoá công:\n"
+msgstr ""
+"Vân tay khoá công:\n"
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:381
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
-msgstr "Mẫu bi bô khoá công:\n"
+msgstr ""
+"Mẫu bi bô khoá công:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Thông tin khoá công"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Nhắn tin"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Hội thảo ảnh động"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Máy tính"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Thiết bị cuối"
 
-#: ../libpurple/protocols/silc/wb.c:288
-#: ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s đã gửi thông điệp cho bảng trắng. Bạn có muốn mở bảng trắng không?"
 
-#: ../libpurple/protocols/silc/wb.c:292
-#: ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr "%s đã gửi thông điệp cho bảng trắng trên kênh %s. Bạn có muốn mở bảng trắng không?"
+msgstr ""
+"%s đã gửi thông điệp cho bảng trắng trên kênh %s. Bạn có muốn mở bảng trắng "
+"không?"
 
-#: ../libpurple/protocols/silc/wb.c:306
-#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Bảng trắng"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Không có sẵn thống kê máy phục vụ"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Thất bại: Phiên bản không tương thích, nên nâng cấp trình khách"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Thất bại: Máy ở xa không tin tưởng/hỗ trợ mã khoá công cộng của bạn"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Thất bại: Máy ở xa không hỗ trợ nhóm KE đề nghị"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Thất bại: Máy ở xa không hỗ trợ mật mã đề nghị"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Thất bại: Máy ở xa không hỗ trợ PKCS đề nghị"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Thất bại: Máy ở xa không hỗ trợ chức năng đổi mã một chiều"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Thất bại: Máy ở xa không hỗ trợ HMAC đề nghị"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Thất bại: Chữ ký sai"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Thất bại: Cookie không hợp lệ"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Thất bại: Không xác thực được"
 
-#: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr "Không thể khởi tạo kết nối Khách SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr "Tham gia Không_tên"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Không tìm thấy / truy cập được thư mục « ~/.silc »"
-
-#: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Không thể nạp cặp khoá SILC: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Không thể ghi"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "Không thể kết nối"
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Không rõ đáp ứng từ máy phục vụ"
 
-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "Không thể tạo ổ cắm lắng nghe"
 
-#: ../libpurple/protocols/simple/simple.c:1752
-msgid "Couldn't resolve host"
-msgstr "Không thể giải quyết máy"
-
-#: ../libpurple/protocols/simple/simple.c:1853
-msgid "Could not resolve hostname"
-msgstr "Không thể giải quyết tên máy"
-
-#: ../libpurple/protocols/simple/simple.c:1871
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "Tên hiển thị SIP không được chứa dấu cách hay ký hiệu @"
-
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#: ../libpurple/protocols/simple/simple.c:2057
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "Tên người dùng SIP không được chứa dấu cách hay ký hiệu @"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Phần bổ sung giao thức SIP/SIMPLE"
 
-#.*  summary
-#: ../libpurple/protocols/simple/simple.c:2058
+#. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Phần bổ sung cho giao thức SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Công bố trạng thái (chú ý: mọi người có thể thấy bạn)"
 
-#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "Dùng UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "Dùng ủy nhiệm"
 
-#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "Ủy nhiệm"
 
-#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "Xác thực người dùng"
 
-#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "Xác thực miền"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Đang tra tìm %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Kết nối đến %s không được"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Đăng nhập: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Không thể ghi tập tin %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Không thể đọc tập tin %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Tin nhắn quá dài, %s byte cuối bị cắt ngắn."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s chưa đăng nhập."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Không cho phép cảnh báo cho %s."
 
-#: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Một tin nhẳn không gửi đi được, bạn đang vượt quá tốc độ cho phép của máy phục vụ."
+msgstr ""
+"Một tin nhẳn không gửi đi được, bạn đang vượt quá tốc độ cho phép của máy "
+"phục vụ."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Không có sẵn chát trong %s."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Bạn đang gửi tin nhẳn quá nhanh đến %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Bạn không nhận được tin nhắn từ %s vì nó quá lớn."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Bạn không nhận được tin nhắn từ %s vì nó được gửi quá nhanh."
 
-#: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Lỗi."
 
-#: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Quá nhiều kết quả trùng khớp."
 
-#: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Cần thêm từ hạn định"
 
-#: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Tạm thời không có dịch vụ danh bạ."
 
-#: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "Email lookup restricted."
 msgstr "Khả năng tra tìm địa chỉ thư điện tử bị hạn chế."
 
-#: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Từ khóa bị lờ đi."
 
-#: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Không có từ khóa."
 
-#: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Người dùng không có thông tin danh bạ."
 
-#: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Quốc gia chưa được hỗ trợ."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Lỗi không rõ : %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
-msgid "Incorrect screen name or password."
-msgstr "Tên hiển thị hay mật khẩu không đúng."
+#, c-format
+msgid "Incorrect username or password."
+msgstr "Tên người dùng hay mật khẩu không đúng."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Tạm thời không có dịch vụ."
 
-#: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Mức cảnh báo của bạn hiện thời quá cao nên không đăng nhập được."
 
-#: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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 "Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Hẵy đợi 10 phút và kết nối lại. Nếu bạn vẫn cố kết nối, bạn sẽ phải chờ lâu hơn."
+msgstr ""
+"Bạn đã liên tục kết nối và ngắt kết nối quá nhiều. Hẵy đợi 10 phút và kết "
+"nối lại. Nếu bạn vẫn cố kết nối, bạn sẽ phải chờ lâu hơn."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Lỗi đăng nhập không rõ : %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Lỗi không rõ : %d.\n"
+msgstr ""
+"Lỗi không rõ : %d.\n"
 "Thông tin: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Tên nhóm không hợp lệ"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Kết nối bị đóng"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Đợi hồi âm..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC thôi trạng thái tạm ngừng. Bây giờ bạn có thể gửi tin nhẳn trở lại."
+msgstr ""
+"TOC thôi trạng thái tạm ngừng. Bây giờ bạn có thể gửi tin nhẳn trở lại."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Đổi mật khẩu thành công"
 
-#: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:6261
-#: ../pidgin/gtkblist.c:6632
 msgid "_Group:"
 msgstr "_Nhóm:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Lấy thông tin danh bạ"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Lập thông tin danh bạ"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Không thể mở %s để ghi !"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "Không truyền được tập tin; bên khác có thể đã hủy bỏ."
 
-#: ../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 "Không thể kết nối để truyền đi."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Không thể ghi phần đầu tập tin. Tập tin sẽ không được truyền."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Lưu dạng..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s yêu cầu %s chấp nhận %d tập tin: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s yêu cầu bạn gửi tập tin"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "TOC Protocol Plugin"
 msgstr "Phần bổ sung giao thức TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:785
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "%s mời bạn xem máy ảnh Web, mà chưa được hỗ trợ."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:841
 msgid "Your Yahoo! message did not get sent."
 msgstr "Tin nhẳn Yahoo! của bạn đã không được gửi."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:956
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Thông điệp hệ thống Yahoo! cho %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1025
 msgid "Authorization denied message:"
 msgstr "Thông điệp từ chối cho phép:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1043
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr "%s đã từ chối (có hiệu lực trở về trước) yêu cầu của bạn để thêm họ vào danh sách của bạn với lý do sau : %s."
+msgstr ""
+"%s đã từ chối (có hiệu lực trở về trước) yêu cầu của bạn để thêm họ vào danh "
+"sách của bạn với lý do sau : %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1046
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s đã từ chối (có hiệu lực trở về trước) yêu cầu của bạn để thêm họ vào danh sách của bạn."
+msgstr ""
+"%s đã từ chối (có hiệu lực trở về trước) yêu cầu của bạn để thêm họ vào danh "
+"sách của bạn."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Thêm bạn chát bị từ chối"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1990
 #, 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 "Máy phục vụ Yahoo yêu cầu dùng phương thức xác thực không nhận ra. Rất có thể là bạn sẽ có thể không đăng nhập vào Yahoo được. Hãy xem %s để cập nhật."
+msgstr ""
+"Máy phục vụ Yahoo yêu cầu dùng phương thức xác thực không nhận ra. Rất có "
+"thể là bạn sẽ có thể không đăng nhập vào Yahoo được. Hãy xem %s để cập nhật."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1993
 msgid "Failed Yahoo! Authentication"
 msgstr "Lỗi xác thực Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2059
 #, 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 "Bạn đang cố lờ bỏ %s nhưng người đó có trong danh sách bạn bè của bạn. Nhấn cái nút « Có » sẽ gỡ bỏ và lờ đi bạn chát này."
+msgstr ""
+"Bạn đang cố lờ bỏ %s nhưng người đó có trong danh sách bạn bè của bạn. Nhấn "
+"cái nút « Có » sẽ gỡ bỏ và lờ đi bạn chát này."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2062
 msgid "Ignore buddy?"
 msgstr "Lờ bỏ bạn chát?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2127
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Tài khoản của bạn đã bị khóa, hãy đăng nhập vào địa chỉ Web của Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2130
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Mã lỗi không rõ %d. Đăng nhập vào địa chỉ Web của Yahoo có thể giúp khắc phục."
+msgstr ""
+"Mã lỗi không rõ %d. Đăng nhập vào địa chỉ Web của Yahoo có thể giúp khắc "
+"phục."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Không thể thêm bạn chát %s vào nhóm %s trong danh sach máy phục vụ của tài khoản %s."
+msgstr ""
+"Không thể thêm bạn chát %s vào nhóm %s trong danh sach máy phục vụ của tài "
+"khoản %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "Không thể thêm bạn chát vào danh sách máy phục vụ"
 
 # Audible là nhà cung cấp thông tin bằng âm thanh: tên, đừng dịch.
-#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "Nhận được đáp ứng HTTP bất thường từ máy phục vụ."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2682
-#: ../libpurple/protocols/yahoo/yahoo.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Kết nối có vấn đề"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2708
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
-msgstr "Mất kết nối với %s:\n"
+msgstr ""
+"Mất kết nối với %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
-msgstr "Không thể thiết lập kết nối với %s:\n"
+msgstr ""
+"Không thể thiết lập kết nối với %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Not at Home"
 msgstr "Không có ở nhà"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Not at Desk"
 msgstr "Không có tại bàn làm việc"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Not in Office"
 msgstr "Không có ở văn phòng"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3101
-#: ../libpurple/protocols/yahoo/yahoo.c:3791
 msgid "On Vacation"
 msgstr "Nghỉ phép"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
-#: ../libpurple/protocols/yahoo/yahoo.c:3797
 msgid "Stepped Out"
 msgstr "Đi ra ngoài"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3198
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Not on server list"
 msgstr "Không có trong danh sách máy phục vụ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Appear Online"
 msgstr "Hình như trực tuyến"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3324
 msgid "Appear Permanently Offline"
 msgstr "Hình như ngoại tuyến bền bỉ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3266
 msgid "Presence"
 msgstr "Có mặt"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Offline"
 msgstr "Hình như ngoại tuyến"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3318
 msgid "Don't Appear Permanently Offline"
 msgstr "Không hình như ngoại tuyến bên bỉ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
 msgid "Join in Chat"
 msgstr "Tham gia chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3372
 msgid "Initiate Conference"
 msgstr "Khởi tạo hội thảo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3400
 msgid "Presence Settings"
 msgstr "Thiết lập có mặt"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3406
 msgid "Start Doodling"
 msgstr "Bắt đầu vẽ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Activate which ID?"
 msgstr "Kích hoạt ID nào ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Join whom in chat?"
 msgstr "Tham gia với ai trong chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3530
 msgid "Activate ID..."
 msgstr "Kích hoạt ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3534
 msgid "Join User in Chat..."
 msgstr "Tham gia với người dùng trong chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3539
 msgid "Open Inbox"
 msgstr "Mở hộp thư đến"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4148
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;phòng&gt;: Tham gia một phòng chát trên mạng Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4153
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Liệt kê các phòng trên mạng Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Yêu cầu người dùng bắt đầu vẽ hình"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4370
-#: ../libpurple/protocols/yahoo/yahoo.c:4372
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Yahoo Protocol Plugin"
 msgstr "Phần bổ sung giao thức Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Yahoo Japan"
 msgstr "Yahoo Nhật bản"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Pager server"
 msgstr "Máy phục vụ nhắn tin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Japan Pager server"
 msgstr "Máy phục vụ nhắn tin Nhật bản"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager port"
 msgstr "Cổng nhắn tin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "File transfer server"
 msgstr "Máy phục vụ truyền tập tin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Japan file transfer server"
 msgstr "Máy phục vụ truyền tập tin Nhật bản"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer port"
 msgstr "Cổng truyền tập tin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Chat room locale"
 msgstr "Miền địa phương phòng chát"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "Ignore conference and chatroom invitations"
 msgstr "Lời đi các lời mời vào hội thảo hay phòng chát"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4427
 msgid "Chat room list URL"
 msgstr "URL đến danh sách phòng chát"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4430
 msgid "Yahoo Chat server"
 msgstr "Máy phục vụ chát Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Yahoo Chat port"
 msgstr "Cổng chát Yahoo"
 
-#.Write a local message to this conversation showing that a request for a
-#.* Doodle session has been made
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Đã gửi yêu cầu vẽ hình."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:354
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:366
 msgid "Unable to establish file descriptor."
 msgstr "Không thể thiết lập bộ mô tả tập tin."
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Lỗi ghi"
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s đang thử gửi cho bạn một tập hợp %d tập tin.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Lý lịch Yahoo Nhật bản"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Lý lịch Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Lý lịch được đánh dấu có nội dung ảnh trái phép chưa được hỗ trợ vào thời điểm này."
+msgstr ""
+"Lý lịch được đánh dấu có nội dung ảnh trái phép chưa được hỗ trợ vào thời "
+"điểm này."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
-msgstr "Nếu bạn muốn xem lý lịch này, bạn cần thăm liên kết này bằng trình duyệt web:"
+msgstr ""
+"Nếu bạn muốn xem lý lịch này, bạn cần thăm liên kết này bằng trình duyệt web:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "ID Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Sở thích"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Tin tức"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Trang chủ"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Liên kết ưa thích 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Liên kết ưa thích 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Liên kết ưa thích 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Cập nhật lần cuối"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Hiện không có thông tin người dùng về %s"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
-msgstr "Tiếc là hình như lý lịch này được viết bằng ngôn ngữ hay định dạng chưa được hỗ trợ."
+msgstr ""
+"Tiếc là hình như lý lịch này được viết bằng ngôn ngữ hay định dạng chưa được "
+"hỗ trợ."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
-msgstr "Không thể lấy lý lịch của người dùng. Có lẽ nguyên nhân là do vấn đề tạm thời bên máy phục vụ. Hãy thử lại sau."
+msgstr ""
+"Không thể lấy lý lịch của người dùng. Có lẽ nguyên nhân là do vấn đề tạm "
+"thời bên máy phục vụ. Hãy thử lại sau."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 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 "Không thể lấy lý lịch của người dùng. Có lẽ nguyên nhân là do người dùng "
-"không tồn tại, tuy nhiên, thỉnh thoảng Yahoo không tìm thấy lý lịch của người "
-"dùng. Nếu bạn biết chắc người dùng này tồn tại, vui lòng thử lại sau."
+msgstr ""
+"Không thể lấy lý lịch của người dùng. Có lẽ nguyên nhân là do người dùng "
+"không tồn tại, tuy nhiên, thỉnh thoảng Yahoo không tìm thấy lý lịch của "
+"người dùng. Nếu bạn biết chắc người dùng này tồn tại, vui lòng thử lại sau."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Lý lịch người dùng này trống."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s đã từ chối lời mời hội thảo ở phòng « %s » bởi vì « %s »."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Lời mời không được chấp nhận"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Không tham gia chát được"
 
-#.-6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#. -6
 msgid "Unknown room"
 msgstr "Lỗi không rõ"
 
-#.-15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#. -15
 msgid "Maybe the room is full"
 msgstr "Có thể phòng chat hết chỗ ?"
 
-#.-35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#. -35
 msgid "Not available"
 msgstr "Không sẵn sàng"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
-msgstr "Lỗi không rõ. Có lẽ bạn cần phải đăng xuất rồi đợi năm phút trước khi có khả năng tham gia lại trong phòng chát."
+msgstr ""
+"Lỗi không rõ. Có lẽ bạn cần phải đăng xuất rồi đợi năm phút trước khi có khả "
+"năng tham gia lại trong phòng chát."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Bạn bây giờ trò chuyện trong %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Không tham gia được với bạn chát"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Có thể họ không có trong phòng chát?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Không lấy được danh sách phòng"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Thoại"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Máy ảnh Web"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Không thể lấy danh sách phòng."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Phòng người dùng"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Kết nối có vấn đề với máy phục vụ YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
 "%s"
-msgstr "Mất kết nối với máy phục vụ\n"
+msgstr ""
+"Mất kết nối với máy phục vụ\n"
 "%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 "(Có lỗi khi chuyển đổi thông điệp này.\t Đánh dấu vào tùy chọn « Bảng mã » trong Bộ Sửa Tài Khoản)"
+msgstr ""
+"(Có lỗi khi chuyển đổi thông điệp này.\t Đánh dấu vào tùy chọn « Bảng mã » "
+"trong Bộ Sửa Tài Khoản)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Không thể gửi cho chát %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Ẩn mặt hoặc chưa đăng nhập"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Tại %s từ lúc %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Bất kỳ ai"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Hạng:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "Thể h_iện:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Người nhận:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Lỗi khi thử đăng ký với %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;tên hiệu&gt;: Định vị người dùng"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;tên hiệu&gt;: (viết tắt) Định vị người dùng"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;thể hiện&gt;: Đặt thể hiện cần dùng với hạng này"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;thể hiện&gt;: (viết tắt) Đặt thể hiện cần dùng với hạng này"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;thể hiện&gt;: Đặt thể hiện cần dùng với hạng này"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;hạng&gt; &lt;thể hiện&gt; &lt;người nhận&gt;: Tham gia một chát mới"
+msgstr ""
+"sub &lt;hạng&gt; &lt;thể hiện&gt; &lt;người nhận&gt;: Tham gia một chát mới"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;thể hiện&gt;: Gửi một thông điệp cho &lt;thông điệp,<i>thể hiện</i>,*&gt;"
+msgstr ""
+"zi &lt;thể hiện&gt;: Gửi một thông điệp cho &lt;thông điệp,<i>thể hiện</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;hạng&gt; &lt;thể hiện&gt;: Gửi một thông điệp cho &lt;<i>hạng</i>,<i>thể hiện</i>,*&gt;"
+msgstr ""
+"zci &lt;hạng&gt; &lt;thể hiện&gt;: Gửi một thông điệp cho &lt;<i>hạng</i>,"
+"<i>thể hiện</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;hạng&gt; &lt;thể hiện&gt; &lt;người nhận&gt;: Gửi một thông điệp cho &lt;<i>hạng</i>,<i>thể hiện</i>,<i>người nhận</i>&gt;"
+msgstr ""
+"zcir &lt;hạng&gt; &lt;thể hiện&gt; &lt;người nhận&gt;: Gửi một thông điệp "
+"cho &lt;<i>hạng</i>,<i>thể hiện</i>,<i>người nhận</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;thể hiện&gt; &lt;người nhận&gt;: Gửi một thông điệp cho &lt;THÔNG ĐIỆP,<i>thể hiện</i>,<i>người nhận</i>&gt;"
+msgstr ""
+"zir &lt;thể hiện&gt; &lt;người nhận&gt;: Gửi một thông điệp cho &lt;THÔNG "
+"ĐIỆP,<i>thể hiện</i>,<i>người nhận</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;hạng&gt;: Gửi một thông điệp cho &lt;<i>hạng</i>,CÁ NHÂN,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Đăng ký lại"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Lấy các sự đăng ký từ máy phục vụ"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Zephyr Protocol Plugin"
 msgstr "Phần bổ sung giao thức Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Dùng tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "Lệnh tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Xuất đến .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Xuất đến .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Nhập từ .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Nhập từ .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Địa hạt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Phơi sáng"
 
-#: ../libpurple/proxy.c:461
-#: ../libpurple/proxy.c:902
-#: ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
-msgstr "Không thể tạo ổ cắm\n"
+msgstr ""
+"Không thể tạo ổ cắm\n"
 "%s"
 
-#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Không thể phân tích đáp ứng từ ủy nhiệm HTTP: %s\n"
 
-#: ../libpurple/proxy.c:702
-#: ../libpurple/proxy.c:750
-#: ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Lỗi kết nối ủy nhiệm HTTP %d"
 
-#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Truy cập bị từ chối: máy phục vụ ủy nhiệm HTTP cấm đào đường hầm xuyên qua cổng %d."
+msgstr ""
+"Truy cập bị từ chối: máy phục vụ ủy nhiệm HTTP cấm đào đường hầm xuyên qua "
+"cổng %d."
 
-#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Lỗi giải quyết %s"
 
-#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Không thể giải quyết tên máy."
 
-#.*
-#.* A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Đang yêu cầu sự chú ý của %s..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s đã yêu cầu sự chú ý của bạn !"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1444
 msgid "_Yes"
 msgstr "_Có"
 
-#: ../libpurple/request.h:1444
 msgid "_No"
 msgstr "_Không"
 
-#.*
-#.* A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1464
 msgid "_Accept"
 msgstr "_Chấp nhận"
 
-#.*
-#.* The default message to use when the user becomes auto-away.
+#. *
+#. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Hiện tôi không ở đây"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "trạng thái đã lưu"
 
-#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s bây giờ đổi là %s.\n"
 
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr "Đang yêu cầu sự chú ý của %s..."
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s đã yêu cầu sự chú ý của bạn !"
-
-#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s đã mời %s vào phòng chát « %s »:\n"
+msgstr ""
+"%s đã mời %s vào phòng chát « %s »:\n"
 "%s"
 
-#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s đã mời %s vào phòng chát %s\n"
 
-#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Chấp nhận lời mời chát không?"
 
-#: ../libpurple/sslconn.c:164
+#. Shortcut
+msgid "Shortcut"
+msgstr "Lối tắt"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Lối tắt chữ cái cho hình cười"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Ảnh đã lưu"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Ảnh đã lưu (hiện thời là tất cả)"
+
 msgid "SSL Connection Failed"
 msgstr "Lỗi kết nối SSL"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Lỗi thiết lập quan hệ SSL"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "Đồng đẳng SSL đã cung cấp chứng nhận không hợp lệ"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Lỗi SSL không rõ"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Bỏ đặt"
 
-#: ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Xin đừng quấy rầy"
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Vắng mặt mở rộng"
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Di động"
 
-#: ../libpurple/status.c:161
 msgid "Listening to music"
 msgstr "Nghe nhạc"
 
-#: ../libpurple/status.c:610
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) đã đổi trạng thái từ %s thành %s"
 
-#: ../libpurple/status.c:621
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) bây giờ đổi là %s"
 
-#: ../libpurple/status.c:627
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) thôi %s"
 
-#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s đã rơi vào trạng thái nghỉ"
 
-#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s đã thôi trạng thái nghỉ"
 
-#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s đã rơi vào trạng thái nghỉ"
 
-#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s đã thôi trạng thái nghỉ"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2800
 #, c-format
 msgid "Error Reading %s"
 msgstr "Lỗi đọc %s"
 
-#: ../libpurple/util.c:2801
 #, 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 "Gặp lỗi khi đọc %s của bạn nên chưa nạp và tên tập tin cũ đã bị thay đổi thành « %s~ »."
+msgstr ""
+"Gặp lỗi khi đọc %s của bạn nên chưa nạp và tên tập tin cũ đã bị thay đổi "
+"thành « %s~ »."
 
-#: ../libpurple/util.c:3300
 msgid "Calculating..."
 msgstr "Đang tính toán..."
 
-#: ../libpurple/util.c:3303
 msgid "Unknown."
 msgstr "Không rõ."
 
-#: ../libpurple/util.c:3329
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d giây"
 
-#: ../libpurple/util.c:3341
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ngày"
 
-#: ../libpurple/util.c:3349
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d giờ"
 
-#: ../libpurple/util.c:3355
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d giờ"
 
-#: ../libpurple/util.c:3363
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d phút"
 
-#: ../libpurple/util.c:3369
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d phút"
 
-#: ../libpurple/util.c:3629
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Không thể mở %s: chuyển hướng quá nhiều lần"
 
-#: ../libpurple/util.c:3666
-#: ../libpurple/util.c:3962
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Không thể kết nối tới %s"
 
-#: ../libpurple/util.c:3789
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
-msgstr "Không thể cấp phát đủ bộ nhớ để chứa nội dung từ %s. Có lẽ máy phục vụ Web đang thử làm gì hiểm độc."
+msgstr ""
+"Không thể cấp phát đủ bộ nhớ để chứa nội dung từ %s. Có lẽ máy phục vụ Web "
+"đang thử làm gì hiểm độc."
 
-#: ../libpurple/util.c:3824
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Lỗi đọc từ %s: %s"
 
-#: ../libpurple/util.c:3855
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Lỗi ghi từ %s: %s"
 
-#: ../libpurple/util.c:3880
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Không thể kết nối tới %s: %s"
 
-#.10053
-#: ../libpurple/win32/libc_interface.c:322
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Kết nối bị ngắt bởi phần mềm khác trên máy tính này."
 
-#.10054
-#: ../libpurple/win32/libc_interface.c:324
+#. 10054
 #, c-format
 msgid "Remote host closed connection."
 msgstr "Máy ở xa đã đóng kết nối."
 
-#.10060
-#: ../libpurple/win32/libc_interface.c:326
+#. 10060
 #, c-format
 msgid "Connection timed out."
 msgstr "Quá hạn tạo kết nối"
 
-#.10061
-#: ../libpurple/win32/libc_interface.c:328
+#. 10061
 #, c-format
 msgid "Connection refused."
 msgstr "Kết nối bị từ chối."
 
-#: ../pidgin.desktop.in.h:1
+#. 10048
+#, fuzzy, c-format
+msgid "Address already in use."
+msgstr "Tên chát này đang được dùng"
+
 msgid "Internet Messenger"
 msgstr "Tin Nhắn"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Tin Nhắn Pidgin"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Gửi tin nhắn qua nhiều giao thức khác nhau"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Hướng"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Hướng của khay."
 
-#.Build the login options frame.
-#: ../pidgin/gtkaccount.c:397
+#. Build the login options frame.
 msgid "Login Options"
 msgstr "Tùy chọn đăng nhập"
 
-#: ../pidgin/gtkaccount.c:418
 msgid "Pro_tocol:"
 msgstr "Giao _thức:"
 
-#: ../pidgin/gtkaccount.c:429
-msgid "Screen _name:"
-msgstr "Tê_n hiển thị:"
-
-#: ../pidgin/gtkaccount.c:519
-msgid "_Local alias:"
-msgstr "_Bí danh cục bộ :"
+msgid "_Username:"
+msgstr "_Tên người dùng:"
 
-#: ../pidgin/gtkaccount.c:523
 msgid "Remember pass_word"
 msgstr "Ghi nhớ _mật khẩu"
 
-#.Build the user options frame.
-#: ../pidgin/gtkaccount.c:581
+#. Build the user options frame.
 msgid "User Options"
 msgstr "Tùy chọn người dùng"
 
-#: ../pidgin/gtkaccount.c:594
+msgid "_Local alias:"
+msgstr "_Bí danh cục bộ :"
+
 msgid "New _mail notifications"
 msgstr "Thông báo thư _mới"
 
-#.Buddy icon
-#: ../pidgin/gtkaccount.c:599
+#. Buddy icon
 msgid "Use this buddy _icon for this account:"
 msgstr "Dùng biểu tượng bạn chát cho tài khoản này:"
 
-#.Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:721
+#. Build the protocol options frame.
 #, c-format
 msgid "%s Options"
 msgstr "%s Tùy chọn"
 
-#: ../pidgin/gtkaccount.c:926
 msgid "Use GNOME Proxy Settings"
 msgstr "Dùng thiết lập ủy nhiệm GNOME"
 
-#: ../pidgin/gtkaccount.c:927
 msgid "Use Global Proxy Settings"
 msgstr "Dùng thiết lập ủy nhiệm toàn cục"
 
-#: ../pidgin/gtkaccount.c:933
 msgid "No Proxy"
 msgstr "Không ủy nhiệm"
 
-#: ../pidgin/gtkaccount.c:939
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:945
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:951
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:957
-#: ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Dùng thiết lập môi trường"
 
-#.This is an easter egg.
-#.It means one of two things, both intended as humourus:
-#.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:996
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. 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.
 msgid "If you look real closely"
 msgstr "Nếu bạn thấy đúng là gần"
 
-#.This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:999
+#. This is an easter egg. See the comment on the previous line in the source.
 msgid "you can see the butterflies mating"
 msgstr "bạn có thể nhìn thấy con bướm kết đôi"
 
-#: ../pidgin/gtkaccount.c:1020
 msgid "Proxy Options"
 msgstr "Tùy chọn ủy nhiệm"
 
-#: ../pidgin/gtkaccount.c:1034
-#: ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "Kiểu ủ_y nhiệm:"
 
-#: ../pidgin/gtkaccount.c:1043
-#: ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "_Máy:"
 
-#: ../pidgin/gtkaccount.c:1047
-#: ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_Cổng:"
 
-#: ../pidgin/gtkaccount.c:1055
-msgid "_Username:"
-msgstr "_Tên người dùng:"
-
-#: ../pidgin/gtkaccount.c:1062
-#: ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "_Mật khẩu :"
 
-#: ../pidgin/gtkaccount.c:1186
 msgid "Unable to save new account"
 msgstr "Không thể lưu tài khoản mới"
 
-#: ../pidgin/gtkaccount.c:1187
 msgid "An account already exists with the specified criteria."
 msgstr "Một tài khoản đã có với tiêu chuẩn đã ghi rõ."
 
-#: ../pidgin/gtkaccount.c:1464
 msgid "Add Account"
 msgstr "Thêm tài khoản"
 
-#: ../pidgin/gtkaccount.c:1481
 msgid "_Basic"
 msgstr "Cơ _bản"
 
-#: ../pidgin/gtkaccount.c:1488
-msgid "Create this new account on the server"
-msgstr "Tạo tài khoản mới này trên máy phục vụ"
+msgid "Create _this new account on the server"
+msgstr "_Tạo tài khoản mới này trên máy phục vụ"
 
-#: ../pidgin/gtkaccount.c:1502
 msgid "_Advanced"
 msgstr "Cấp c_ao"
 
-#: ../pidgin/gtkaccount.c:1924
-#: ../pidgin/gtkplugin.c:586
-#: ../pidgin/plugins/convcolors.c:322
 msgid "Enabled"
 msgstr "Đã bật"
 
-#: ../pidgin/gtkaccount.c:1952
 msgid "Protocol"
 msgstr "Giao thức"
 
-#: ../pidgin/gtkaccount.c:2153
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14051,1457 +10166,1060 @@ msgid ""
 "\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"
-msgstr "<span size='larger' weight='bold'>Chào mừng đến %s!</span>\n"
+msgstr ""
+"<span size='larger' weight='bold'>Chào mừng đến %s!</span>\n"
 "\n"
-"Bạn chưa cấu hình tài khoản tin nhắn. Để bắt đầu kết nối với %s, bấm cái nút <b>Thêm</b> bên dưới và cấu hình tài khoản thứ nhất của bạn. Muốn %s kết nối đến nhiều tài khoản thì bấm <b>Thêm</b> lần nữa để cấu hình mỗi điều.\n"
+"Bạn chưa cấu hình tài khoản tin nhắn. Để bắt đầu kết nối với %s, bấm cái nút "
+"<b>Thêm</b> bên dưới và cấu hình tài khoản thứ nhất của bạn. Muốn %s kết nối "
+"đến nhiều tài khoản thì bấm <b>Thêm</b> lần nữa để cấu hình mỗi điều.\n"
 "\n"
-"Bạn vẫn có thể trở về cửa sổ này để thêm, chỉnh sửa hay gỡ bỏ tài khoản, bằng cách chọn mục <b>Tài khoản > Thêm/Sửa</b> trong cửa sổ Danh sách bạn bè."
+"Bạn vẫn có thể trở về cửa sổ này để thêm, chỉnh sửa hay gỡ bỏ tài khoản, "
+"bằng cách chọn mục <b>Tài khoản > Thêm/Sửa</b> trong cửa sổ Danh sách bạn bè."
 
-#: ../pidgin/gtkblist.c:545
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Bạn có %d liên lạc tên %s. Muốn trộn với nhau không?"
 
-#: ../pidgin/gtkblist.c:546
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
-msgstr "Trộn những liên lạc này sẽ gây ra chúng dùng chung cùng một mục nhập trên danh sách bạn bè, và dùng cùng một cửa sổ thoại. Bạn vẫn có thể chia lại bằng cách chọn lệnh « Mở rộng » trong trình đơn ngữ cảnh của liên lạc."
+msgstr ""
+"Trộn những liên lạc này sẽ gây ra chúng dùng chung cùng một mục nhập trên "
+"danh sách bạn bè, và dùng cùng một cửa sổ thoại. Bạn vẫn có thể chia lại "
+"bằng cách chọn lệnh « Mở rộng » trong trình đơn ngữ cảnh của liên lạc."
 
-#: ../pidgin/gtkblist.c:548
-msgid "_Merge"
-msgstr "T_rộn"
+msgid "Please update the necessary fields."
+msgstr "Hãy cập nhật các trường cần thiết."
 
-#: ../pidgin/gtkblist.c:962
-#: ../pidgin/gtkblist.c:6558
 msgid "Room _List"
 msgstr "Danh sách _phòng"
 
-#: ../pidgin/gtkblist.c:982
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Hãy nhập thông tin thích hợp về cuộc chat mà bạn muốn tham gia.\n"
 
-#: ../pidgin/gtkblist.c:993
-#: ../pidgin/gtkblist.c:6593
-#: ../pidgin/gtkpounce.c:546
-#: ../pidgin/gtkroomlist.c:553
 msgid "_Account:"
 msgstr "Tài _khoản:"
 
-#: ../pidgin/gtkblist.c:1282
-#: ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:593
 msgid "_Block"
 msgstr "_Chặn"
 
-#: ../pidgin/gtkblist.c:1282
 msgid "Un_block"
 msgstr "Bỏ _chặn"
 
-#: ../pidgin/gtkblist.c:1325
 msgid "Move to"
 msgstr "Di chuyển sang"
 
-#: ../pidgin/gtkblist.c:1365
 msgid "Get _Info"
 msgstr "Lấy thông t_in"
 
-#: ../pidgin/gtkblist.c:1368
-#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Tin nhắn"
 
-#: ../pidgin/gtkblist.c:1374
 msgid "_Send File..."
 msgstr "_Gửi tập tin..."
 
-#: ../pidgin/gtkblist.c:1381
 msgid "Add Buddy _Pounce..."
 msgstr "Thêm thông _báo bạn chát..."
 
-#: ../pidgin/gtkblist.c:1386
-#: ../pidgin/gtkblist.c:1390
-#: ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:1528
 msgid "View _Log"
 msgstr "_Xem bản ghi"
 
-#: ../pidgin/gtkblist.c:1396
 msgid "Hide when offline"
 msgstr "Ẩn khi ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:1396
 msgid "Show when offline"
 msgstr "Hiện khi ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:1410
-#: ../pidgin/gtkblist.c:1419
-#: ../pidgin/gtkblist.c:1513
-#: ../pidgin/gtkblist.c:1534
 msgid "_Alias..."
 msgstr "_Bí danh..."
 
-#: ../pidgin/gtkblist.c:1413
-#: ../pidgin/gtkblist.c:1421
-#: ../pidgin/gtkblist.c:1515
-#: ../pidgin/gtkblist.c:1536
 msgid "_Remove"
 msgstr "_Bỏ"
 
-#: ../pidgin/gtkblist.c:1471
+msgid "Set Custom Icon"
+msgstr "Đặt biểu tượng riêng"
+
+msgid "Remove Custom Icon"
+msgstr "Gỡ bỏ biểu tượng riêng"
+
 msgid "Add _Buddy..."
 msgstr "Thêm _bạn chát..."
 
-#: ../pidgin/gtkblist.c:1474
 msgid "Add C_hat..."
 msgstr "Thêm C_hat..."
 
-#: ../pidgin/gtkblist.c:1477
 msgid "_Delete Group"
 msgstr "_Xoá nhóm"
 
-#: ../pidgin/gtkblist.c:1479
 msgid "_Rename"
 msgstr "Đổ_i tên"
 
-#.join button
-#: ../pidgin/gtkblist.c:1499
-#: ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:612
-#: ../pidgin/pidginstock.c:88
+#. join button
 msgid "_Join"
 msgstr "Tham gi_a"
 
-#: ../pidgin/gtkblist.c:1501
 msgid "Auto-Join"
 msgstr "Tự động tham gia"
 
-#: ../pidgin/gtkblist.c:1503
 msgid "Persistent"
 msgstr "Bền bỉ"
 
-#: ../pidgin/gtkblist.c:1541
-#: ../pidgin/gtkblist.c:1564
+msgid "_Edit Settings..."
+msgstr "_Sửa thiết lập..."
+
 msgid "_Collapse"
 msgstr "_Co lại"
 
-#: ../pidgin/gtkblist.c:1569
 msgid "_Expand"
-msgstr "Dãn _ra"
+msgstr "Giãn _ra"
 
-#: ../pidgin/gtkblist.c:1820
-#: ../pidgin/gtkblist.c:1832
-#: ../pidgin/gtkblist.c:5227
-#: ../pidgin/gtkblist.c:5240
 msgid "/Tools/Mute Sounds"
 msgstr "/Công cụ/Câm âm thanh"
 
-#: ../pidgin/gtkblist.c:2292
-#: ../pidgin/gtkconv.c:4894
-#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "Hiện thời bạn chưa kết nối bằng một tài khoản nào có khả năng thêm được bạn chát đó."
+msgstr ""
+"Hiện thời bạn chưa kết nối bằng một tài khoản nào có khả năng thêm được bạn "
+"chát đó."
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr "Mã nút thông tin không rõ"
 
-#.Buddies menu
-#: ../pidgin/gtkblist.c:3007
+#. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Bạn chát"
 
-#: ../pidgin/gtkblist.c:3008
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Bạn chát/Tin nhắn _mới..."
 
-#: ../pidgin/gtkblist.c:3009
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Bạn chát/Tham gia _Chat..."
 
-#: ../pidgin/gtkblist.c:3010
 msgid "/Buddies/Get User _Info..."
 msgstr "/Bạn chát/Lấy thông t_in người dùng..."
 
-#: ../pidgin/gtkblist.c:3011
 msgid "/Buddies/View User _Log..."
 msgstr "/Bạn chát/_Xem bản ghi người dùng..."
 
-#: ../pidgin/gtkblist.c:3013
 msgid "/Buddies/Sh_ow"
 msgstr "/Bạn chát/_Hiện"
 
-#: ../pidgin/gtkblist.c:3014
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Bạn chát/Hiện/Bạn chát ng_oại tuyến"
 
-#: ../pidgin/gtkblist.c:3015
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Bạn chát/HIện/Nhóm _rỗng"
 
-#: ../pidgin/gtkblist.c:3016
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Bạn chát/Hiện/_Chi tiết bạn chát"
 
-#: ../pidgin/gtkblist.c:3017
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Bạn chát/HIện/_Thời gian nghỉ"
 
-#: ../pidgin/gtkblist.c:3018
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Bạn chát/Hiện/Biểu tượng _giao thức"
 
-#: ../pidgin/gtkblist.c:3019
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Bạn chát/_Sắp xếp bạn bè"
 
-#: ../pidgin/gtkblist.c:3021
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Bạn chát/_Thêm bạn chat..."
 
-#: ../pidgin/gtkblist.c:3022
 msgid "/Buddies/Add C_hat..."
 msgstr "/Bạn chát/Thêm ch_at..."
 
-#: ../pidgin/gtkblist.c:3023
 msgid "/Buddies/Add _Group..."
 msgstr "/Bạn chát/Thêm _nhóm..."
 
-#: ../pidgin/gtkblist.c:3025
 msgid "/Buddies/_Quit"
 msgstr "/Bạn chát/Th_oát"
 
-#.Accounts menu
-#: ../pidgin/gtkblist.c:3028
+#. Accounts menu
 msgid "/_Accounts"
 msgstr "/Tài _khoản"
 
-#: ../pidgin/gtkblist.c:3029
-#: ../pidgin/gtkblist.c:7299
-msgid "/Accounts/Manage"
-msgstr "/Tài khoản/Quản lý"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Tài khoản/Quản lý tài khoản"
 
-#.Tools
-#: ../pidgin/gtkblist.c:3032
+#. Tools
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: ../pidgin/gtkblist.c:3033
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Công cụ/Thông _báo bạn chát"
 
-#: ../pidgin/gtkblist.c:3034
 msgid "/Tools/_Certificates"
 msgstr "/Công cụ/_Chứng nhận"
 
-#: ../pidgin/gtkblist.c:3035
 msgid "/Tools/Plu_gins"
 msgstr "/Công cụ/_Phần bổ sung"
 
-#: ../pidgin/gtkblist.c:3036
 msgid "/Tools/Pr_eferences"
 msgstr "/Công cụ/Tù_y chỉnh"
 
-#: ../pidgin/gtkblist.c:3037
 msgid "/Tools/Pr_ivacy"
-msgstr "/Công cụ/R_iêng tư"
+msgstr "/Công cụ/_Riêng tư"
+
+msgid "/Tools/Smile_y"
+msgstr "/Công cụ/Hình cườ_i"
 
-#: ../pidgin/gtkblist.c:3039
 msgid "/Tools/_File Transfers"
 msgstr "/Công cụ/_Truyền tập tin"
 
-#: ../pidgin/gtkblist.c:3040
 msgid "/Tools/R_oom List"
 msgstr "/Công cụ/Danh sách _phòng"
 
-#: ../pidgin/gtkblist.c:3041
 msgid "/Tools/System _Log"
 msgstr "/Công cụ/Bản ghi _hệ thống"
 
-#: ../pidgin/gtkblist.c:3043
 msgid "/Tools/Mute _Sounds"
 msgstr "/Công cụ/Câm â_m thanh"
 
-#.Help
-#: ../pidgin/gtkblist.c:3045
+#. Help
 msgid "/_Help"
 msgstr "/Trợ g_iúp"
 
-#: ../pidgin/gtkblist.c:3046
 msgid "/Help/Online _Help"
 msgstr "/Trợ giúp/Trợ giúp trực tu_yến"
 
-#: ../pidgin/gtkblist.c:3047
 msgid "/Help/_Debug Window"
 msgstr "/Trợ giúp/Cửa sổ gỡ _rối"
 
-#: ../pidgin/gtkblist.c:3049
-#: ../pidgin/gtkblist.c:3051
 msgid "/Help/_About"
 msgstr "/Trợ giúp/G_iới thiệu"
 
-#: ../pidgin/gtkblist.c:3081
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Tài khoản:</b> %s"
+
 #, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
-msgstr "\n"
-"<b>Tài khoản:</b> %s"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>Người ở :</b> %d"
 
-#: ../pidgin/gtkblist.c:3089
 #, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
-msgstr "\n"
+msgstr ""
+"\n"
 "<b>Chủ đề:</b> %s"
 
-#: ../pidgin/gtkblist.c:3089
 msgid "(no topic set)"
 msgstr "(chưa đặt chủ đề)"
 
-#: ../pidgin/gtkblist.c:3166
 msgid "Buddy Alias"
 msgstr "Bí danh bạn chát"
 
-#: ../pidgin/gtkblist.c:3195
 msgid "Logged In"
 msgstr "Đã đăng xuất"
 
-#: ../pidgin/gtkblist.c:3241
 msgid "Last Seen"
 msgstr "Thấy lần cuối"
 
-#: ../pidgin/gtkblist.c:3262
 msgid "Spooky"
 msgstr "Lạ"
 
-#: ../pidgin/gtkblist.c:3264
 msgid "Awesome"
 msgstr "Hay quá"
 
-#: ../pidgin/gtkblist.c:3266
 msgid "Rockin'"
 msgstr "Tuyệt vời"
 
-#: ../pidgin/gtkblist.c:3624
+msgid "Total Buddies"
+msgstr "Tổng bạn bè"
+
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Nghỉ %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3626
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nghỉ %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3628
 #, c-format
 msgid "Idle %dm"
 msgstr "Nghỉ %dm"
 
-#: ../pidgin/gtkblist.c:3782
 msgid "/Buddies/New Instant Message..."
 msgstr "/Bạn chát/Tin nhắn mới..."
 
-#: ../pidgin/gtkblist.c:3783
-#: ../pidgin/gtkblist.c:3816
 msgid "/Buddies/Join a Chat..."
 msgstr "/Bạn chát/Tham gia chat..."
 
-#: ../pidgin/gtkblist.c:3784
 msgid "/Buddies/Get User Info..."
 msgstr "/Bạn chát/Lấy thông tin người dùng..."
 
-#: ../pidgin/gtkblist.c:3785
 msgid "/Buddies/Add Buddy..."
 msgstr "/Bạn chát/Thêm bạn chát..."
 
-#: ../pidgin/gtkblist.c:3786
-#: ../pidgin/gtkblist.c:3819
 msgid "/Buddies/Add Chat..."
 msgstr "/Bạn chát/Thêm chat..."
 
-#: ../pidgin/gtkblist.c:3787
 msgid "/Buddies/Add Group..."
 msgstr "/Bạn chát/Thêm nhóm..."
 
-#: ../pidgin/gtkblist.c:3822
 msgid "/Tools/Privacy"
 msgstr "/Công cụ/Riêng tư"
 
-#: ../pidgin/gtkblist.c:3825
 msgid "/Tools/Room List"
 msgstr "/Công cụ/Danh sách phòng"
 
-#: ../pidgin/gtkblist.c:3957
-#: ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d tin nhẳn chưa đọc từ %s\n"
 
-#: ../pidgin/gtkblist.c:4121
 msgid "Manually"
 msgstr "Bằng tay"
 
-#: ../pidgin/gtkblist.c:4124
 msgid "By status"
 msgstr "Theo trạng thái"
 
-#: ../pidgin/gtkblist.c:4125
 msgid "By log size"
 msgstr "Theo kích cỡ bản ghi"
 
-#: ../pidgin/gtkblist.c:4451
 #, c-format
 msgid "%s disconnected"
 msgstr "%s đã ngắt kết nối."
 
-#: ../pidgin/gtkblist.c:4453
 #, c-format
 msgid "%s disabled"
 msgstr "%s bị tắt"
 
-#: ../pidgin/gtkblist.c:4457
 msgid "Reconnect"
 msgstr "Tái kết nối"
 
-#: ../pidgin/gtkblist.c:4457
-#: ../pidgin/gtkblist.c:4563
 msgid "Re-enable"
 msgstr "Bật lại"
 
-#: ../pidgin/gtkblist.c:4561
 msgid "Welcome back!"
 msgstr "Chào mừng lại !"
 
-#: ../pidgin/gtkblist.c:4597
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural "%d accounts were disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
 msgstr[0] "%d tài khoản đã bị tắt vì bạn cũng đăng nhập từ chỗ khác."
 
-#: ../pidgin/gtkblist.c:4835
 msgid "<b>Username:</b>"
 msgstr "<b>Tên người dùng:</b>"
 
-#: ../pidgin/gtkblist.c:4842
 msgid "<b>Password:</b>"
 msgstr "<b>Mật khẩu :</b>"
 
-#: ../pidgin/gtkblist.c:4853
 msgid "_Login"
 msgstr "Đăn_g nhập"
 
-#: ../pidgin/gtkblist.c:4937
 msgid "/Accounts"
 msgstr "/Tài khoản"
 
-#.Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4951
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr "<span weight='bold' size='larger'>Chào mừng đến %s!</span>\n"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>Chào mừng đến %s!</span>\n"
 "\n"
-"Bạn chưa hiệu lực tài khoản. Hãy hiệu lực tài khoản Tin Nhắn trong cửa sổ <b>Tài khoản</"
-"b> bằng cách chọn mục <b>Tài khoản > Quản lý</b>. Một khi hiệu lực tài khoản thì bạn có thể đăng nhập, đặt trạng thái và nói chuyện với bạn bè."
+"Bạn chưa hiệu lực tài khoản. Hãy hiệu lực tài khoản Tin Nhắn trong cửa sổ "
+"<b>Tài khoản</b> bằng cách chọn mục <b>Tài khoản->Quản lý tài khoản</b>. Một "
+"khi hiệu lực tài khoản thì bạn có thể đăng nhập, đặt trạng thái và nói "
+"chuyện với bạn bè."
 
-#.set the Show Offline Buddies option. must be done
-#.* after the treeview or faceprint gets mad. -Robot101
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5221
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Bạn chát/Hiện bạn chát ngoại tuyến"
 
-#: ../pidgin/gtkblist.c:5224
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Bạn chát/Hiện nhóm rỗng"
 
-#: ../pidgin/gtkblist.c:5230
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Bạn chát/Hiện chi tiết bạn chát"
 
-#: ../pidgin/gtkblist.c:5233
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Bạn chát/Hiện thời gian nghỉ"
 
-#: ../pidgin/gtkblist.c:5236
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Bạn chát/Hiện biểu tượng giao thức"
 
-#: ../pidgin/gtkblist.c:6186
-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 "Hãy nhập tên hiển thị của người mà bạn muốn thêm vào danh sách bạn bè. Bạn cũng có "
-"thể nhập bí danh hoặc tên hiệu cho mỗi bạn chát. Bí danh này sẽ hiện lên thay cho tên hiển thị bất kỳ khi nào có thể.\n"
+msgid "Add a buddy.\n"
+msgstr "Thêm bạn chát.\n"
 
-#.Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6209
-msgid "A_ccount:"
-msgstr "Tài _khoản:"
+msgid "Buddy's _username:"
+msgstr "Tên người _dùng bạn chát:"
 
-#.End of account box
-#: ../pidgin/gtkblist.c:6221
-msgid "_Screen name:"
-msgstr "Tên _hiển thị:"
+msgid "(Optional) A_lias:"
+msgstr "(Tùy chọn) Bí d_anh:"
 
-#: ../pidgin/gtkblist.c:6243
-#: ../pidgin/gtkblist.c:6614
-msgid "A_lias:"
-msgstr "_Bí danh:"
+msgid "Add buddy to _group:"
+msgstr "Thêm bạn chát _vào nhóm:"
 
-#: ../pidgin/gtkblist.c:6523
 msgid "This protocol does not support chat rooms."
 msgstr "Giao thức này không hỗ trợ phòng chát."
 
-#: ../pidgin/gtkblist.c:6539
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "Hiện thời bạn không kết nối bằng bất kỳ giao thức nào để có khả năng chat."
+msgstr ""
+"Hiện thời bạn không kết nối bằng bất kỳ giao thức nào để có khả năng chat."
 
-#: ../pidgin/gtkblist.c:6583
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
-msgstr "Hãy nhập bí danh và thông tin thích hợp cho cuộc chat mà bạn muốn thêm vào danh sách bạn bè.\n"
+msgstr ""
+"Hãy nhập bí danh và thông tin thích hợp cho cuộc chat mà bạn muốn thêm vào "
+"danh sách bạn bè.\n"
+
+msgid "A_lias:"
+msgstr "_Bí danh:"
 
-#: ../pidgin/gtkblist.c:6642
 msgid "Auto_join when account becomes online."
 msgstr "Tự động tham _gia một khi tài khoản kết nối."
 
-#: ../pidgin/gtkblist.c:6643
 msgid "_Hide chat when the window is closed."
 msgstr "Ẩn c_hát khi cửa sổ bị đóng."
 
-#: ../pidgin/gtkblist.c:6669
 msgid "Please enter the name of the group to be added."
 msgstr "Hãy nhập tên của nhóm cần thêm vào."
 
-#: ../pidgin/gtkblist.c:7319
+msgid "Enable Account"
+msgstr "Bật tài khoản"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Tài khoản/Bật tài khoản"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Tài khoản/"
 
-#: ../pidgin/gtkblist.c:7343
 msgid "_Edit Account"
 msgstr "_Sửa tài khoản"
 
-#: ../pidgin/gtkblist.c:7356
-#: ../pidgin/gtkconv.c:3099
 msgid "No actions available"
 msgstr "Hiện không có hành động nào"
 
-#: ../pidgin/gtkblist.c:7364
 msgid "_Disable"
 msgstr "_Tắt"
 
-#: ../pidgin/gtkblist.c:7376
-msgid "Enable Account"
-msgstr "Bật tài khoản"
-
-#: ../pidgin/gtkblist.c:7382
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Tài khoản/Bật tài khoản"
-
-#: ../pidgin/gtkblist.c:7431
 msgid "/Tools"
 msgstr "/Công cụ"
 
-#: ../pidgin/gtkblist.c:7501
 msgid "/Buddies/Sort Buddies"
 msgstr "/Bạn chát/Sắp xếp bạn chát"
 
-#.Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
+#. Widget creation function
 msgid "SSL Servers"
 msgstr "Máy phục vụ SSL"
 
-#: ../pidgin/gtkconv.c:475
 msgid "Unknown command."
 msgstr "Lệnh không rõ."
 
-#: ../pidgin/gtkconv.c:745
-#: ../pidgin/gtkconv.c:771
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Bạn chát đó không cùng giao thức như cuộc chát này"
 
-#: ../pidgin/gtkconv.c:765
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr "Hiện thời bạn chưa kết nối bằng một tài khoản nào có khả năng thêm được bạn chát đó."
+msgstr ""
+"Hiện thời bạn chưa kết nối bằng một tài khoản nào có khả năng thêm được bạn "
+"chát đó."
 
-#: ../pidgin/gtkconv.c:818
 msgid "Invite Buddy Into Chat Room"
 msgstr "Mời bạn chát vào phòng chát"
 
-#.Put our happy label in it.
-#: ../pidgin/gtkconv.c:848
+#. Put our happy label in it.
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Hãy nhập tên người dùng mà bạn muốn mời, kèm theo lời mời tùy ý."
 
-#: ../pidgin/gtkconv.c:869
 msgid "_Buddy:"
 msgstr "_Bạn chát:"
 
-#: ../pidgin/gtkconv.c:880
-#: ../pidgin/gtksavedstatuses.c:1182
-#: ../pidgin/gtksavedstatuses.c:1506
 msgid "_Message:"
 msgstr "_Thông điệp:"
 
-#: ../pidgin/gtkconv.c:944
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Hội thoại với %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:982
 msgid "Save Conversation"
 msgstr "Lưu cuộc thoại"
 
-#: ../pidgin/gtkconv.c:1128
-#: ../pidgin/gtkdebug.c:167
-#: ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Tìm"
 
-#: ../pidgin/gtkconv.c:1154
-#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "Tìm _kiếm:"
 
-#: ../pidgin/gtkconv.c:1631
 msgid "Un-Ignore"
 msgstr "Thôi lờ"
 
-#: ../pidgin/gtkconv.c:1634
 msgid "Ignore"
 msgstr "Lờ"
 
-#: ../pidgin/gtkconv.c:1654
 msgid "Get Away Message"
 msgstr "Lấy thông điệp vắng mặt"
 
-#: ../pidgin/gtkconv.c:1677
 msgid "Last said"
 msgstr "Nói lần cuối"
 
-#: ../pidgin/gtkconv.c:2626
 msgid "Unable to save icon file to disk."
 msgstr "Không thể lưu tập tin biểu tượng vào đĩa."
 
-#: ../pidgin/gtkconv.c:2677
 msgid "Save Icon"
 msgstr "Lưu biểu tượng"
 
-#: ../pidgin/gtkconv.c:2729
 msgid "Animate"
 msgstr "Hoạt cảnh"
 
-#: ../pidgin/gtkconv.c:2734
 msgid "Hide Icon"
 msgstr "Ẩn biểu tượng"
 
-#: ../pidgin/gtkconv.c:2737
 msgid "Save Icon As..."
 msgstr "Lưu biểu tượng dạng..."
 
-#: ../pidgin/gtkconv.c:2741
 msgid "Set Custom Icon..."
 msgstr "Đặt biểu tượng riêng..."
 
-#: ../pidgin/gtkconv.c:2754
-msgid "Remove Custom Icon"
-msgstr "Gỡ bỏ biểu tượng riêng"
+msgid "Change Size"
+msgstr "Đổi kích cỡ"
 
-#: ../pidgin/gtkconv.c:2884
 msgid "Show All"
 msgstr "Hiện tất cả"
 
-#.Conversation menu
-#: ../pidgin/gtkconv.c:2903
+#. Conversation menu
 msgid "/_Conversation"
 msgstr "/_Cuộc thoại"
 
-#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Cuộc thoại/Tin nhắn _mới..."
 
-#: ../pidgin/gtkconv.c:2910
 msgid "/Conversation/_Find..."
 msgstr "/Cuộc thoại/_Tìm..."
 
-#: ../pidgin/gtkconv.c:2912
 msgid "/Conversation/View _Log"
 msgstr "/Cuộc thoại/_Xem bản ghi"
 
-#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Save As..."
 msgstr "/Cuộc thoại/_Lưu dạng..."
 
-#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Cuộc thoại/Gột _vùng cuộn ngược"
 
-#: ../pidgin/gtkconv.c:2919
 msgid "/Conversation/Se_nd File..."
 msgstr "/Cuộc thoại/_Gửi tập tin..."
 
-#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Cuộc thoại/Thêm thông bá_o bạn chát..."
 
-#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/_Get Info"
 msgstr "/Cuộc thoại/Lấ_y thông tin"
 
-#: ../pidgin/gtkconv.c:2924
 msgid "/Conversation/In_vite..."
 msgstr "/Cuộc thoại/Mờ_i..."
 
-#: ../pidgin/gtkconv.c:2926
 msgid "/Conversation/M_ore"
 msgstr "/Cuộc thoại/Nữ_a"
 
-#: ../pidgin/gtkconv.c:2930
 msgid "/Conversation/Al_ias..."
 msgstr "/Cuộc thoại/Bí _danh..."
 
-#: ../pidgin/gtkconv.c:2932
 msgid "/Conversation/_Block..."
 msgstr "/Cuộc thoại/_Chặn..."
 
-#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/_Unblock..."
 msgstr "/Cuộc thoại/Bỏ _chặn..."
 
-#: ../pidgin/gtkconv.c:2936
 msgid "/Conversation/_Add..."
 msgstr "/Cuộc thoại/_Thêm..."
 
-#: ../pidgin/gtkconv.c:2938
 msgid "/Conversation/_Remove..."
 msgstr "/Cuộc thoại/_Bỏ..."
 
-#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Cuộc thoại/Chèn liên _kết..."
 
-#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Cuộc thoại/Chèn ả_nh..."
 
-#: ../pidgin/gtkconv.c:2951
 msgid "/Conversation/_Close"
 msgstr "/Cuộc thoại/Đón_g"
 
-#.Options
-#: ../pidgin/gtkconv.c:2955
+#. Options
 msgid "/_Options"
 msgstr "/Tù_y chọn"
 
-#: ../pidgin/gtkconv.c:2956
 msgid "/Options/Enable _Logging"
 msgstr "/Tùy chọn/Cho phép _ghi lưu"
 
-#: ../pidgin/gtkconv.c:2957
 msgid "/Options/Enable _Sounds"
 msgstr "/Tùy chọn/Bật âm th_anh"
 
-#: ../pidgin/gtkconv.c:2959
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Tùy chọn/Hiện thanh định _dạng"
 
-#: ../pidgin/gtkconv.c:2960
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Tùy chọn/Hiện nhãn thờ_i gian"
 
-#: ../pidgin/gtkconv.c:3087
 msgid "/Conversation/More"
 msgstr "/Cuộc thoại/_Nữa"
 
-#: ../pidgin/gtkconv.c:3143
 msgid "/Options"
 msgstr "/Tùy chọn"
 
-#.The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#.* the 'Conversation' menu pops up.
-#.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:3178
-#: ../pidgin/gtkconv.c:3210
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
 msgid "/Conversation"
 msgstr "/Cuộc thoại"
 
-#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/View Log"
 msgstr "/Cuộc thoại/Xem bản ghi"
 
-#: ../pidgin/gtkconv.c:3224
 msgid "/Conversation/Send File..."
 msgstr "/Cuộc thoại/Gửi tập tin..."
 
-#: ../pidgin/gtkconv.c:3228
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Cuộc thoại/Thêm thông báo bạn chát..."
 
-#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Get Info"
 msgstr "/Cuộc thoại/Lấy thông tin"
 
-#: ../pidgin/gtkconv.c:3238
 msgid "/Conversation/Invite..."
 msgstr "/Cuộc thoại/Mời..."
 
-#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Alias..."
 msgstr "/Cuộc thoại/Bí danh..."
 
-#: ../pidgin/gtkconv.c:3248
 msgid "/Conversation/Block..."
 msgstr "/Cuộc thoại/Chặn..."
 
-#: ../pidgin/gtkconv.c:3252
 msgid "/Conversation/Unblock..."
 msgstr "/Cuộc thoại/Bỏ chặn..."
 
-#: ../pidgin/gtkconv.c:3256
 msgid "/Conversation/Add..."
 msgstr "/Cuộc thoại/Thêm..."
 
-#: ../pidgin/gtkconv.c:3260
 msgid "/Conversation/Remove..."
 msgstr "/Cuộc thoại/Bỏ..."
 
-#: ../pidgin/gtkconv.c:3266
 msgid "/Conversation/Insert Link..."
 msgstr "/Cuộc thoại/Chèn liên kết..."
 
-#: ../pidgin/gtkconv.c:3270
 msgid "/Conversation/Insert Image..."
 msgstr "/Cuộc thoại/Chèn ảnh..."
 
-#: ../pidgin/gtkconv.c:3276
 msgid "/Options/Enable Logging"
 msgstr "/Tùy chọn/Cho phép ghi lưu"
 
-#: ../pidgin/gtkconv.c:3279
 msgid "/Options/Enable Sounds"
 msgstr "/Tùy chọn/Bật âm thanh"
 
-#: ../pidgin/gtkconv.c:3292
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Tùy chọn/Hiện thanh định dạng"
 
-#: ../pidgin/gtkconv.c:3295
 msgid "/Options/Show Timestamps"
 msgstr "/Tùy chọn/Hiện nhãn thời gian"
 
-#: ../pidgin/gtkconv.c:3372
-#: ../pidgin/gtkconv.c:3443
 msgid "User is typing..."
 msgstr "Người dùng đang gõ phím..."
 
-#: ../pidgin/gtkconv.c:3447
-msgid "User has typed something and stopped"
-msgstr "Người dùng đã gõ cái gì đó và dừng"
-
-#: ../pidgin/gtkconv.c:3448
 #, c-format
 msgid ""
 "\n"
-"%s has typed something and stopped"
-msgstr "\n"
-"%s đã gõ cái gì đó và dừng"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s đã ngừng gõ phím"
 
-#.Build the Send To menu
-#: ../pidgin/gtkconv.c:3634
-#: ../pidgin/gtkconv.c:8366
+#. Build the Send To menu
 msgid "S_end To"
 msgstr "Gửi ch_o"
 
-#: ../pidgin/gtkconv.c:4346
 msgid "_Send"
 msgstr "_Gửi"
 
-#.Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4454
+#. Setup the label telling how many people are in the room.
 msgid "0 people in room"
 msgstr "0 người trong phòng"
 
-#: ../pidgin/gtkconv.c:5864
-#: ../pidgin/gtkconv.c:5985
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d người trong phòng"
 
-#: ../pidgin/gtkconv.c:6612
-#: ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Đang gõ phím"
 
-#: ../pidgin/gtkconv.c:6616
 msgid "Stopped Typing"
 msgstr "Dừng gõ phím"
 
-#: ../pidgin/gtkconv.c:6619
 msgid "Nick Said"
 msgstr "Tên hiệu nói"
 
-#: ../pidgin/gtkconv.c:6622
-#: ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Tin nhẳn chưa đọc"
 
-#: ../pidgin/gtkconv.c:6628
 msgid "New Event"
 msgstr "Dữ kiện mới"
 
-#: ../pidgin/gtkconv.c:7847
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Gột mọi vùng cuộn ngược của cuộc thoại"
 
-#: ../pidgin/gtkconv.c:8048
 msgid "Confirm close"
 msgstr "Xác nhận đóng"
 
-#: ../pidgin/gtkconv.c:8080
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Có tin nhẳn chưa đọc. Bạn có chắc muốn đóng cửa sổ này không?"
 
-#: ../pidgin/gtkconv.c:8699
 msgid "Close other tabs"
 msgstr "Đóng các thẻ khác"
 
-#: ../pidgin/gtkconv.c:8705
 msgid "Close all tabs"
 msgstr "Đong mọi thẻ"
 
-#: ../pidgin/gtkconv.c:8713
 msgid "Detach this tab"
 msgstr "Tách thẻ này ra"
 
-#: ../pidgin/gtkconv.c:8719
 msgid "Close this tab"
 msgstr "Đóng thẻ này"
 
-#: ../pidgin/gtkconv.c:9233
 msgid "Close conversation"
 msgstr "Đóng cuộc thoại"
 
-#: ../pidgin/gtkconv.c:9836
 msgid "Last created window"
 msgstr "Cửa sổ tạo lần cuối"
 
-#: ../pidgin/gtkconv.c:9838
 msgid "Separate IM and Chat windows"
 msgstr "Cửa sổ Tin Nhắn và Chát riêng"
 
-#: ../pidgin/gtkconv.c:9840
-#: ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "Cửa sổ mới"
 
-#: ../pidgin/gtkconv.c:9842
 msgid "By group"
 msgstr "Theo nhóm"
 
-#: ../pidgin/gtkconv.c:9844
 msgid "By account"
 msgstr "Theo tài khoản"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Lưu Báo cáo Gỡ lỗi"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Đảo"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Tô sáng kết quả"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Chỉ _hình"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Chỉ _nhãn"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Cả hai hình và nhãn"
 
-#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Lọc"
 
-#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Nhấn-phải để xem thêm tùy chọn"
 
-#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "Cấp "
 
-#: ../pidgin/gtkdebug.c:825
-#: ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Chọn cáp lọc thông điệp gỡ lỗi"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "Tất cả"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "Linh tinh"
 
-#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr "Lỗi "
 
-#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "Lỗi nghiêm trọng"
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:118
-msgid "lead developer"
-msgstr "nhà phát triển lãnh đạo"
-
-#: ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77
-#: ../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:85
-#: ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87
-#: ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92
-#: ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "nhà phát triển"
 
-#: ../pidgin/gtkdialogs.c:88
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
 msgid "support"
 msgstr "hỗ trợ"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "hỗ trợ / tin chắc chất lượng"
 
-#: ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:113
 msgid "developer & webmaster"
 msgstr "nhà phát triển và chủ Web"
 
-#: ../pidgin/gtkdialogs.c:100
 msgid "Senior Contributor/QA"
 msgstr "Người đóng góp cấp cao/ tin chắc chất lượng"
 
-#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "bản cho win32"
 
-#: ../pidgin/gtkdialogs.c:110
-#: ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "nhà duy trì"
 
-#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "nhà duy trì thư viện libfaim"
 
-#.If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:115
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 msgid "hacker and designated driver [lazy bum]"
 msgstr "người tài giỏi lập trình [làm biếng]"
 
-#: ../pidgin/gtkdialogs.c:116
 msgid "XMPP developer"
 msgstr "Nhà phát triển XMPP"
 
-#: ../pidgin/gtkdialogs.c:117
 msgid "original author"
 msgstr "tác giả đầu tiên"
 
-#: ../pidgin/gtkdialogs.c:134
+msgid "lead developer"
+msgstr "nhà phát triển lãnh đạo"
+
 msgid "Afrikaans"
 msgstr "Tiếng Hoà Nam Phi"
 
-#: ../pidgin/gtkdialogs.c:135
-#: ../pidgin/gtkdialogs.c:229
 msgid "Arabic"
 msgstr "Tiếng A Rập"
 
-#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr "Tiếng Be-la-ru La-tinh"
 
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:230
 msgid "Bulgarian"
 msgstr "Tiếng Bun-ga-ri"
 
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "Tiếng Ben-ga-li"
 
-#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "Tiếng Bo-x-ni-a"
 
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
 msgid "Catalan"
 msgstr "Tiếng Ca-ta-lan"
 
-#: ../pidgin/gtkdialogs.c:145
-#: ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "Tiếng Ca-ta-lan của Va-len-xi-a"
 
-#: ../pidgin/gtkdialogs.c:147
-#: ../pidgin/gtkdialogs.c:233
 msgid "Czech"
 msgstr "Tiếng Séc"
 
-#: ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "Tiếng Đan Mạch"
 
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:234
 msgid "German"
 msgstr "Tiếng Đức"
 
-#: ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "Tiếng Đ-xông-kha"
 
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "Tiếng Hy Lạp"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "Tiếng Anh (Úc)"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "Tiếng Anh (Ca-na-đa)"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "Tiếng Anh (Quốc Anh)"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "Tiếng Ét-pe-ran-tô"
 
-#: ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
 msgid "Spanish"
 msgstr "Tiếng Tây Ban Nha"
 
-#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "Tiếng E-x-tô-ni"
 
-#: ../pidgin/gtkdialogs.c:163
-#: ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "Tiếng Ba-x-quợ"
 
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "Tiếng Ba Tư"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
 msgid "Finnish"
 msgstr "Tiếng Phần Lan"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
 msgid "French"
 msgstr "Tiếng Pháp"
 
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:245
 msgid "Galician"
 msgstr "Tiếng Ga-li-xi"
 
-#: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "Tiếng Gu-gia-ra-ti"
 
-#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "Nhóm Ngôn Ngữ Gu-gia-ra-ti"
 
-#: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:246
 msgid "Hebrew"
 msgstr "Tiếng Do Thái"
 
-#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "Tiếng Hin-đi"
 
-#: ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:247
 msgid "Hungarian"
 msgstr "Tiếng Hung-ga-ri"
 
-#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "Tiếng Nam Dương"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:248
 msgid "Italian"
 msgstr "Tiếng Ý"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
 msgid "Japanese"
 msgstr "Tiếng Nhật"
 
-#: ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:252
 msgid "Georgian"
 msgstr "Tiếng Gi-oa-gi-a"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "Nhóm Dịch Giả Gi-oa-gi-a Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "Tiếng Kan-na-đa"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "Nhóm Dịch Kan-na-đa"
 
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
 msgid "Korean"
 msgstr "Tiếng Hàn"
 
-#: ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "Tiếng Kuổ-đít"
 
-#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "Tiếng Lào"
 
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Lithuanian"
 msgstr "Tiếng Li-tu-a-ni"
 
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:257
 msgid "Macedonian"
 msgstr "Tiếng Ma-xê-đô-ni"
 
-#: ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Bokmål Norwegian"
 msgstr "Tiếng Na-uy (Bóc-măn)"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "Tiếng Ne-pa-li"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "Tiếng Hoà (Flemish)"
 
-#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "Tiếng Na-uy (Ny-noa-x-kh)"
 
-#: ../pidgin/gtkdialogs.c:195
+msgid "Occitan"
+msgstr "Tiếng Óc-xi-tan"
+
 msgid "Punjabi"
 msgstr "Tiếng Pun-gia-bi"
 
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:260
 msgid "Polish"
 msgstr "Tiếng Ba Lan"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "Tiếng Bồ Đào Nha"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "Tiếng Bồ Đào Nha (Bra-xin)"
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Pashto"
 msgstr "Tiếng Pa-s-tô"
 
-#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "Tiếng Ru-ma-ni"
 
-#: ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Russian"
 msgstr "Tiếng Nga"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Slovak"
 msgstr "Tiếng Xlô-vác"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:266
 msgid "Slovenian"
 msgstr "Tiếng Xlô-ven"
 
-#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "Tiếng An-ba-ni"
 
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:267
-#: ../pidgin/gtkdialogs.c:268
 msgid "Serbian"
 msgstr "Tiếng Séc-bi"
 
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:269
-#: ../pidgin/gtkdialogs.c:270
+msgid "Sinhala"
+msgstr "Tiếng Xin-ha-la"
+
 msgid "Swedish"
 msgstr "Tiếng Thụy Điển"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Tamil"
 msgstr "Tiếng Ta-min"
 
-#: ../pidgin/gtkdialogs.c:212
 msgid "Telugu"
 msgstr "Tiếng Te-lu-gu"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Thai"
 msgstr "Tiếng Thái"
 
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:271
 msgid "Turkish"
 msgstr "TIếng Thổ Nhĩ Kỳ"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "Urdu"
 msgstr "Tiếng Ổ-đu"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "Vietnamese"
 msgstr "Tiếng Việt"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "Nhóm Việt hoá Phần mềm Tự do"
 
-#: ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:272
 msgid "Simplified Chinese"
 msgstr "Tiếng Trung (phổ thông)"
 
-#: ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
 msgid "Hong Kong Chinese"
 msgstr "Tiếng Trung (Hồng Kông)"
 
-#: ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:273
 msgid "Traditional Chinese"
 msgstr "Tiếng Trung (truyền thống)"
 
-#: ../pidgin/gtkdialogs.c:228
 msgid "Amharic"
 msgstr "Tiếng Am-ha-ríc"
 
-#: ../pidgin/gtkdialogs.c:361
 #, c-format
 msgid "About %s"
 msgstr "Giới thiệu %s"
 
-#: ../pidgin/gtkdialogs.c:404
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15513,687 +11231,569 @@ msgid ""
 "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 là một ứng dụng khách gửi tin nhắn kiểu mô-đun đồ họa dựa vào thư viện livpurple mà có khả năng kết nối cùng lúc tới tất cả các mạng AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, và "
-"QQ ! Nó được ghi dùng khuôn khổ mã nguồn GTK+.<BR><BR>Bạn có quyền sửa đổi và phát hành lại chương trình này với điều kiện của Giấy phép Công cộng GNU (GPL), phiên bản 2 hay sau. Có một bản sao của GPL trong tập tin « COPYING » có sẵn với %s. Các người đóng góp cùng %s thì có bản quyền. Xem tập tin « COPYRIGHT » để tìm danh sách các người đóng góp. Chương trình này không bảo hành gì cả."
-"<BR><BR>"
+msgstr ""
+"%s là một ứng dụng khách gửi tin nhắn kiểu mô-đun đồ họa dựa vào thư viện "
+"livpurple mà có khả năng kết nối cùng lúc tới tất cả các mạng AIM, MSN, "
+"Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, và QQ ! Nó được ghi dùng khuôn khổ mã "
+"nguồn GTK+.<BR><BR>Bạn có quyền sửa đổi và phát hành lại chương trình này "
+"với điều kiện của Giấy phép Công cộng GNU (GPL), phiên bản 2 hay sau. Có một "
+"bản sao của GPL trong tập tin « COPYING » có sẵn với %s. Các người đóng góp "
+"cùng %s thì có bản quyền. Xem tập tin « COPYRIGHT » để tìm danh sách các "
+"người đóng góp. Chương trình này không bảo hành gì cả.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:422
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #pidgin trên irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:427
 msgid "Current Developers"
 msgstr "Nhà phát triển hiện thời"
 
-#: ../pidgin/gtkdialogs.c:442
 msgid "Crazy Patch Writers"
 msgstr "Người tạo đắp vá"
 
-#: ../pidgin/gtkdialogs.c:457
 msgid "Retired Developers"
 msgstr "Nhà phát triển cũ"
 
-#: ../pidgin/gtkdialogs.c:472
 msgid "Retired Crazy Patch Writers"
 msgstr "Người tạo đắp vá cũ"
 
-#: ../pidgin/gtkdialogs.c:487
 msgid "Artists"
 msgstr "Nghệ sĩ"
 
-#: ../pidgin/gtkdialogs.c:502
 msgid "Current Translators"
 msgstr "Người dịch hiện thời"
 
-#: ../pidgin/gtkdialogs.c:522
 msgid "Past Translators"
 msgstr "Dịch giả trước đây"
 
-#: ../pidgin/gtkdialogs.c:540
 msgid "Debugging Information"
 msgstr "Thông tin gỡ lỗi"
 
-#: ../pidgin/gtkdialogs.c:762
-#: ../pidgin/gtkdialogs.c:901
-#: ../pidgin/gtkdialogs.c:982
 msgid "_Name"
 msgstr "Tê_n"
 
-#: ../pidgin/gtkdialogs.c:767
-#: ../pidgin/gtkdialogs.c:906
-#: ../pidgin/gtkdialogs.c:987
 msgid "_Account"
 msgstr "Tài _khoản"
 
-#: ../pidgin/gtkdialogs.c:914
 msgid "Get User Info"
 msgstr "Lấy thông tin người dùng"
 
-#: ../pidgin/gtkdialogs.c:916
 msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "Hãy nhập tên hiển thị hay bí danh của người mà bạn muốn xem thông tin về họ."
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+"Hãy nhập tên người dùng hay bí danh của người về họ bạn muốn xem thông tin."
 
-#: ../pidgin/gtkdialogs.c:1006
 msgid "View User Log"
 msgstr "Xem bản ghi người dùng"
 
-#: ../pidgin/gtkdialogs.c:1008
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "Hãy nhập tên hiển thị hay bí danh của người mà bạn muốn xem bản ghi về họ."
-
-#: ../pidgin/gtkdialogs.c:1028
 msgid "Alias Contact"
 msgstr "Liên lạc bí danh"
 
-#: ../pidgin/gtkdialogs.c:1029
 msgid "Enter an alias for this contact."
 msgstr "Hãy nhập bí danh cho liên lạc này."
 
-#: ../pidgin/gtkdialogs.c:1051
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Nhập bí danh cho %s."
 
-#: ../pidgin/gtkdialogs.c:1053
 msgid "Alias Buddy"
 msgstr "Bạn chát bí danh"
 
-#: ../pidgin/gtkdialogs.c:1074
 msgid "Alias Chat"
 msgstr "Bí danh chát"
 
-#: ../pidgin/gtkdialogs.c:1075
 msgid "Enter an alias for this chat."
 msgstr "Nhập bí danh cho cuộc chát này."
 
-#: ../pidgin/gtkdialogs.c:1114
 #, 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 "
+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] "Bạn sắp gỡ bỏ liên lạc có chứa %s và %d các bạn chát khác ra khỏi danh sách bạn bè của bạn. Bạn muốn thực hiện không?"
+msgstr[0] ""
+"Bạn sắp gỡ bỏ liên lạc có chứa %s và %d các bạn chát khác ra khỏi danh sách "
+"bạn bè của bạn. Bạn muốn thực hiện không?"
 
-#: ../pidgin/gtkdialogs.c:1122
 msgid "Remove Contact"
 msgstr "Bỏ liên lạc"
 
-#: ../pidgin/gtkdialogs.c:1125
 msgid "_Remove Contact"
 msgstr "_Bỏ liên lạc"
 
-#: ../pidgin/gtkdialogs.c:1156
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Bạn sắp trộn nhóm tên %s vào nhóm tên %s. Bạn muốn thực hiện không?"
 
-#: ../pidgin/gtkdialogs.c:1163
 msgid "Merge Groups"
 msgstr "Trộn nhóm"
 
-#: ../pidgin/gtkdialogs.c:1166
 msgid "_Merge Groups"
 msgstr "T_rộn nhóm"
 
-#: ../pidgin/gtkdialogs.c:1216
 #, 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 "Bạn sắp gỡ bỏ nhóm %s và mọi thành viên ra khỏi danh sách bạn bè của bạn. Bạn muốn thực hiện không?"
+msgstr ""
+"Bạn sắp gỡ bỏ nhóm %s và mọi thành viên ra khỏi danh sách bạn bè của bạn. "
+"Bạn muốn thực hiện không?"
 
-#: ../pidgin/gtkdialogs.c:1219
 msgid "Remove Group"
 msgstr "Bỏ nhóm"
 
-#: ../pidgin/gtkdialogs.c:1222
 msgid "_Remove Group"
 msgstr "_Bỏ nhóm"
 
-#: ../pidgin/gtkdialogs.c:1255
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Bạn sắp gỡ bỏ %s khỏi danh sách bạn bè của bạn. Bạn muốn thực hiện không?"
+msgstr ""
+"Bạn sắp gỡ bỏ %s khỏi danh sách bạn bè của bạn. Bạn muốn thực hiện không?"
 
-#: ../pidgin/gtkdialogs.c:1258
 msgid "Remove Buddy"
 msgstr "Bỏ bạn chát"
 
-#: ../pidgin/gtkdialogs.c:1261
 msgid "_Remove Buddy"
 msgstr "_Bỏ bạn chát"
 
-#: ../pidgin/gtkdialogs.c:1282
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "Bạn sắp gỡ bỏ cuộn chát %s khỏi danh sách bạn bè. Bạn muốn thực hiện không?"
+msgstr ""
+"Bạn sắp gỡ bỏ cuộn chát %s khỏi danh sách bạn bè. Bạn muốn thực hiện không?"
 
-#: ../pidgin/gtkdialogs.c:1285
 msgid "Remove Chat"
 msgstr "Bỏ chát"
 
-#: ../pidgin/gtkdialogs.c:1288
 msgid "_Remove Chat"
 msgstr "_Bỏ chát"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Nhấn-phải để xem thêm tin nhẳn chưa đọc ...\n"
 
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr "Đổi trạng thái"
+msgid "_Change Status"
+msgstr "Đổi t_rạng thái"
 
-#: ../pidgin/gtkdocklet.c:680
-msgid "Show Buddy List"
-msgstr "Hiện danh sách bạn bè"
+msgid "Show Buddy _List"
+msgstr "Hiện danh sách _bạn bè"
 
-#: ../pidgin/gtkdocklet.c:706
-msgid "New Message..."
-msgstr "Tin nhẳn mới..."
+msgid "_Unread Messages"
+msgstr "Tin nhẳn _chưa đọc"
 
-#: ../pidgin/gtkdocklet.c:721
-msgid "Mute Sounds"
-msgstr "Câm âm thanh"
+msgid "New _Message..."
+msgstr "Tin nhẳn _mới..."
+
+msgid "_Accounts"
+msgstr "Tài _khoản"
 
-#: ../pidgin/gtkdocklet.c:728
-msgid "Blink on New Message"
-msgstr "Nhấp nháy khi nhận tin nhẳn mới"
+msgid "Plu_gins"
+msgstr "Phần bổ sun_g"
 
-#: ../pidgin/gtkdocklet.c:738
-msgid "Quit"
-msgstr "Thoát"
+msgid "Pr_eferences"
+msgstr "T_uỳ thích"
+
+msgid "Mute _Sounds"
+msgstr "Câm âm _thanh"
+
+msgid "_Blink on New Message"
+msgstr "Nhấp nhá_y khi nhận tin nhẳn mới"
+
+msgid "_Quit"
+msgstr "T_hoát"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Chưa bắt đầu"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Nhận dạng:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Nhận từ :</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Gửi đến:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Gửi dạng:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "Không có ứng dụng nào được thiết lập để mở tập tin loại này."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Gặp lỗi trong khi mở tập tin."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Lỗi khởi chạy %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Lỗi chạy %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Tiến trình trả lại mã lỗi %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Tên tập tin:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Tập tin cục bộ :"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Tốc độ :"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Thời gian đã qua:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Thời gian còn lại:"
 
-#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Đóng cửa sổ này một khi truyền _xong tất cả"
 
-#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Gột việc truyền hoàn tất"
 
-#."Download Details" arrow
-#: ../pidgin/gtkft.c:800
+#. "Download Details" arrow
 msgid "File transfer _details"
 msgstr "Ch_i tiết truyền tập tin"
 
-#.Pause button
-#: ../pidgin/gtkft.c:818
-#: ../pidgin/pidginstock.c:95
+#. Pause button
 msgid "_Pause"
 msgstr "Tạm _dừng"
 
-#.Resume button
-#: ../pidgin/gtkft.c:823
+#. Resume button
 msgid "_Resume"
 msgstr "Tiếp tụ_c"
 
-#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "Dán dưới dạng nhập _thô"
 
-#: ../pidgin/gtkimhtml.c:834
-#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "_Reset formatting"
 msgstr "Đặt _lại định dạng"
 
-#: ../pidgin/gtkimhtml.c:1392
+msgid "Disable _smileys in selected text"
+msgstr "Tắt hình _cười trong đoạn văn đã chọn"
+
 msgid "Hyperlink color"
 msgstr "Màu siêu liên kết"
 
-#: ../pidgin/gtkimhtml.c:1393
 msgid "Color to draw hyperlinks."
 msgstr "Màu để vẽ siêu liên kết."
 
-#: ../pidgin/gtkimhtml.c:1396
 msgid "Hyperlink prelight color"
 msgstr "Màu siêu liên kết tô sáng"
 
-#: ../pidgin/gtkimhtml.c:1397
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Màu siêu liên kết nổi bật khi rê chuột qua"
 
-#: ../pidgin/gtkimhtml.c:1400
-#: ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Màu tên tin nhẳn đã gửi"
 
-#: ../pidgin/gtkimhtml.c:1401
 msgid "Color to draw the name of a message you sent."
 msgstr "Màu để vẽ tên của tin nhẳn bạn đã gửi."
 
-#: ../pidgin/gtkimhtml.c:1404
-#: ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Màu tên tin nhẳn đã nhận"
 
-#: ../pidgin/gtkimhtml.c:1405
 msgid "Color to draw the name of a message you received."
 msgstr "Màu để vẽ tên của tin nhẳn bạn đã nhận."
 
-#: ../pidgin/gtkimhtml.c:1408
 msgid "\"Attention\" Name Color"
 msgstr "Màu tên « Chú ý »"
 
-#: ../pidgin/gtkimhtml.c:1409
 msgid "Color to draw the name of a message you received containing your name."
 msgstr "Màu để vẽ tên của tin nhẳn bạn đã nhận mà chứa tên của bạn."
 
-#: ../pidgin/gtkimhtml.c:1412
-#: ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr "Màu tên tin nhẳn hành động"
 
-#: ../pidgin/gtkimhtml.c:1413
 msgid "Color to draw the name of an action message."
 msgstr "Màu để vẽ tên của tin nhẳn hành động."
 
-#: ../pidgin/gtkimhtml.c:1630
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Màu tên tin nhẳn hành động cho tin nhẳn thì thầm"
+
+msgid "Whisper Message Name Color"
+msgstr "Màu tên tin nhẳn thì thầm"
+
+msgid "Typing notification color"
+msgstr "Màu thông báo đang gõ"
+
+msgid "The color to use for the typing notification font"
+msgstr "Màu cần dùng cho phông chữ thông báo đang gõ"
+
+msgid "Typing notification font"
+msgstr "Phông chữ thông báo đang gõ"
+
+msgid "The font to use for the typing notification"
+msgstr "Phông chữ cần dùng cho thông báo đang gõ"
+
+msgid "Enable typing notification"
+msgstr "Bật thông báo đang gõ"
+
 msgid "_Copy Email Address"
 msgstr "_Chép địa chỉ thư"
 
-#: ../pidgin/gtkimhtml.c:1642
 msgid "_Open Link in Browser"
 msgstr "_Mở liên kết trong trình duyệt"
 
-#: ../pidgin/gtkimhtml.c:1652
 msgid "_Copy Link Location"
 msgstr "_Chép địa chỉ liên kết"
 
-#: ../pidgin/gtkimhtml.c:3408
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
-msgstr "<span size='larger' weight='bold'>Không nhận ra kiểu tập tin</span>\n"
+msgstr ""
+"<span size='larger' weight='bold'>Không nhận ra kiểu tập tin</span>\n"
 "\n"
 "Nên dùng định dạng mặc định: PNG."
 
-#: ../pidgin/gtkimhtml.c:3411
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
-msgstr "Không nhận ra kiểu tập tin\n"
+msgstr ""
+"Không nhận ra kiểu tập tin\n"
 "\n"
 "Nên dùng định dạng mặc định: PNG."
 
-#: ../pidgin/gtkimhtml.c:3440
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
-msgstr "<span size='larger' weight='bold'>Lỗi lưu ảnh</span>\n"
+msgstr ""
+"<span size='larger' weight='bold'>Lỗi lưu ảnh</span>\n"
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3443
 #, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "Lỗi lưu ảnh\n"
+msgstr ""
+"Lỗi lưu ảnh\n"
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3524
-#: ../pidgin/gtkimhtml.c:3536
 msgid "Save Image"
 msgstr "Lưu ảnh"
 
-#: ../pidgin/gtkimhtml.c:3564
+#, c-format
 msgid "_Save Image..."
 msgstr "_Lưu ảnh..."
 
-#: ../pidgin/gtkimhtml.c:4290
-#: ../pidgin/gtkimhtmltoolbar.c:849
-#: ../pidgin/gtkimhtmltoolbar.c:1223
-msgid "_Font"
-msgstr "_Phông"
-
-#: ../pidgin/gtkimhtml.c:4296
-#: ../pidgin/gtkimhtmltoolbar.c:434
-#: ../pidgin/gtkimhtmltoolbar.c:1266
-msgid "_Insert"
-msgstr "C_hèn"
-
-#: ../pidgin/gtkimhtml.c:4302
-msgid "S_mile!"
-msgstr "_Cười !"
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "Thê_m hình cười tự chọn..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "Chọn phông"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Chọn màu văn bản"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Chọn màu nền"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Mô tả"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
-msgstr "Hãy nhập địa chỉ URL và mô tả của liên kết mà bạn muốn chèn. Mô tả là tùy chọn thêm."
+msgstr ""
+"Hãy nhập địa chỉ URL và mô tả của liên kết mà bạn muốn chèn. Mô tả là tùy "
+"chọn thêm."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Hãy nhập địa chỉ URL của liên kết mà bạn muốn chèn."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430
-#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert Link"
 msgstr "Chèn liên kết"
 
-#: ../pidgin/gtkimhtmltoolbar.c:515
+msgid "_Insert"
+msgstr "C_hèn"
+
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Không lưu được ảnh: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:541
-#: ../pidgin/gtkimhtmltoolbar.c:551
 msgid "Insert Image"
 msgstr "Chèn ảnh"
 
-#: ../pidgin/gtkimhtmltoolbar.c:762
-msgid "This theme has no available smileys."
-msgstr "Sắc thái này không có hình cười."
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Hình cười này bị tắt vì đã có một hình cười tự chọn cho lối tắt này.\n"
+" %s"
 
-#.show everything
-#: ../pidgin/gtkimhtmltoolbar.c:779
 msgid "Smile!"
 msgstr "Cười !"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1057
+msgid "_Manage custom smileys"
+msgstr "_Quản lý các hình cười tự chọn"
+
+msgid "This theme has no available smileys."
+msgstr "Sắc thái này không có hình cười."
+
+msgid "_Font"
+msgstr "_Phông"
+
 msgid "Group Items"
 msgstr "Nhóm lại mục"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1057
 msgid "Ungroup Items"
 msgstr "Rã nhóm mục"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-#: ../pidgin/plugins/convcolors.c:337
 msgid "Bold"
 msgstr "Đậm"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
-#: ../pidgin/plugins/convcolors.c:346
 msgid "Italic"
 msgstr "Nghiêng"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-#: ../pidgin/plugins/convcolors.c:355
 msgid "Underline"
 msgstr "Gạch chân"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Strikethrough"
 msgstr "Gạch đè"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Increase Font Size"
 msgstr "Tăng kích cỡ phông"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Decrease Font Size"
 msgstr "Giảm kích cỡ phông"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Font Face"
 msgstr "Mặt chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Background Color"
 msgstr "Màu nền"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Foreground Color"
 msgstr "Màu cảnh gần"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Reset Formatting"
 msgstr "Đặt lại định dạng"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert IM Image"
 msgstr "Chèn ảnh Tin Nhắn"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1107
 msgid "Insert Smiley"
 msgstr "Chèn hình cười"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<b>_Bold</b>"
 msgstr "<b>Đậ_m</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<i>_Italic</i>"
 msgstr "<i>Ngh_iêng</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<u>_Underline</u>"
 msgstr "<u>Gạch _dưới</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Gạch đè</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Lớn hơn</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "_Normal"
 msgstr "Bì_nh thường"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Nhỏ hơn</span>"
 
-#.If we want to show the formatting for the following items, we would
-#.* need to update them when formatting changes. The above items don't need
-#.* no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1195
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
 msgid "_Font face"
 msgstr "_Mặt chữ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Foreground _color"
 msgstr "Màu _cảnh gần"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Bac_kground color"
 msgstr "Màu _nền"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1274
 msgid "_Image"
 msgstr "Ả_nh"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1280
 msgid "_Link"
 msgstr "_Liên kết"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1286
 msgid "_Horizontal rule"
 msgstr "T_hước năm ngang"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1308
 msgid "_Smile!"
 msgstr "_Cười !"
 
-#: ../pidgin/gtklog.c:293
+msgid "Log Deletion Failed"
+msgstr "Lỗi xoá sổ theo dõi"
+
+msgid "Check permissions and try again."
+msgstr "Hãy kiểm tra quyền hạn, rồi thử lại."
+
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "Bạn có chắc muốn xoá hoàn toàn bản ghi của cuộc thoại với %s mà bắt đầu vào lúc %s không?"
+msgstr ""
+"Bạn có chắc muốn xoá hoàn toàn bản ghi của cuộc thoại với %s mà bắt đầu vào "
+"lúc %s không?"
 
-#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "Bạn có chắc muốn xoá hoàn toàn bản ghi của cuộc thoại trong %s mà bắt đầu vào lúc %s không?"
+msgstr ""
+"Bạn có chắc muốn xoá hoàn toàn bản ghi của cuộc thoại trong %s mà bắt đầu "
+"vào lúc %s không?"
 
-#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr "Bạn có chắc muốn xoá hoàn toàn bản ghi hệ thống mà bắt đầu vào lúc %s không"
+msgstr ""
+"Bạn có chắc muốn xoá hoàn toàn bản ghi hệ thống mà bắt đầu vào lúc %s không"
+
+msgid "Delete Log?"
+msgstr "Xoá sổ theo dõi ?"
+
+msgid "Delete Log..."
+msgstr "Xoá sổ theo dõi..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Cuộc thoại trong %s trên %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Cuộc thoại với %s trên %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr "Các dữ kiện của hệ thống sẽ chỉ được ghi lại nếu mục « Ghi lại mọi thay đổi trong trạng thái vào bản ghi của hệ thống » đã bật."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr "Tin nhắn sẽ chỉ được ghi lại nếu mục « Ghi lại tất cả tin nhắn » đã bật."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Các cuộc trò chuyện sẽ chỉ được ghi lại nếu mục « Ghi lại tất cả các cuộc trò chuyện » đã bật."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "Không tìm thấy bản ghi"
-
-#.Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
 msgstr "Duyệt qua thư mục _bản ghi"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Tổng kích cỡ bản ghi:"
-
-#: ../pidgin/gtklog.c:710
-#, c-format
-msgid "Conversations in %s"
-msgstr "Cuộc thoại trong %s"
-
-#: ../pidgin/gtklog.c:718
-#: ../pidgin/gtklog.c:785
-#, c-format
-msgid "Conversations with %s"
-msgstr "Cuộc thoại với %s"
-
-#: ../pidgin/gtklog.c:810
-msgid "System Log"
-msgstr "Bản ghi hệ thống"
-
-#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Chạy « %s -h » để biết thêm thông tin.\n"
 
-#: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16204,24 +11804,26 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
-msgstr "%s %s\n"
+msgstr ""
+"%s %s\n"
 "Sử dụng: %s [TÙY_CHỌN]...\n"
 "\n"
 "  -c, --config=THƯ_MỤC    giữ các tập tin cấu hình trong thư mục này\n"
-"  -d, --debug         	in các thông điệp gỡ lỗi ra đầu ra tiêu chuẩn\n"
-"  -h, --help          		hiển thị trợ giúp này rồi thoát\n"
-"  -m, --multiple      	không đảm bảo chỉ một thể hiện\n"
-"  -n, --nologin       	đừng tự động đăng nhập\n"
-"  -l, --login[=TÊN]  	tự động đăng nhập (đối số tùy chọn TÊN\n"
-"		cũng ghi õ [các] tài khoản cần dùng, định giới bằng dấu phẩy)\n"
-"  --display=BỘ_TRÌNH_BÀY		bộ trình bày X cần dùng\n"
-"  -v, --version       		hiển thị phiên bản hiện thời rồi thoát\n"
+"  -d, --debug         \tin các thông điệp gỡ lỗi ra đầu ra tiêu chuẩn\n"
+"  -h, --help          \t\thiển thị trợ giúp này rồi thoát\n"
+"  -m, --multiple      \tkhông đảm bảo chỉ một thể hiện\n"
+"  -n, --nologin       \tđừng tự động đăng nhập\n"
+"  -l, --login[=TÊN]  \tbật (những) tài khoản đã ghi rõ (đối số tùy chọn TÊN\n"
+"\t\tcũng ghi rõ (những) tài khoản cần dùng, định giới bằng dấu phẩy.\n"
+"\t\tKhông đưa ra thì chỉ bật tài khoản thứ nhất.)\n"
+"  --display=BỘ_TRÌNH_BÀY\t\tbộ trình bày X cần dùng\n"
+"  -v, --version       \t\thiển thị phiên bản hiện thời rồi thoát\n"
 
-#: ../pidgin/gtkmain.c:413
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16232,22 +11834,24 @@ msgid ""
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
-msgstr "%s %s\n"
+msgstr ""
+"%s %s\n"
 "Sử dụng: %s [TÙY_CHỌN]...\n"
 "\n"
 "  -c, --config=THƯ_MỤC    giữ các tập tin cấu hình trong thư mục này\n"
-"  -d, --debug         	in các thông điệp gỡ lỗi ra đầu ra tiêu chuẩn\n"
-"  -h, --help          		hiển thị trợ giúp này rồi thoát\n"
-"  -m, --multiple      	không đảm bảo chỉ một thể hiện\n"
-"  -n, --nologin       	đừng tự động đăng nhập\n"
-"  -l, --login[=TÊN]  	tự động đăng nhập (đối số tùy chọn TÊN\n"
-"		cũng ghi õ [các] tài khoản cần dùng, định giới bằng dấu phẩy)\n"
-"  -v, --version       		hiển thị phiên bản hiện thời rồi thoát\n"
+"  -d, --debug         \tin các thông điệp gỡ lỗi ra đầu ra tiêu chuẩn\n"
+"  -h, --help          \t\thiển thị trợ giúp này rồi thoát\n"
+"  -m, --multiple      \tkhông đảm bảo chỉ một thể hiện\n"
+"  -n, --nologin       \tđừng tự động đăng nhập\n"
+" -l, --login[=TÊN]  \tbật (những) tài khoản đã ghi rõ (đối số tùy chọn TÊN\n"
+"\t\tcũng ghi rõ (những) tài khoản cần dùng, định giới bằng dấu phẩy.\n"
+"\t\tKhông đưa ra thì chỉ bật tài khoản thứ nhất.)\n"
+"  -v, --version       \t\thiển thị phiên bản hiện thời rồi thoát\n"
 
-#: ../pidgin/gtkmain.c:539
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16267,7 +11871,8 @@ msgid ""
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
-msgstr "%s %s bị lỗi đoạn (segfault) và cố đổ một tập tin lõi.\n"
+msgstr ""
+"%s %s bị lỗi đoạn (segfault) và cố đổ một tập tin lõi.\n"
 "Đây là một lỗi trong phần mềm, không phải do bạn.\n"
 "\n"
 "Nếu bạn có thể tạo lại trường hợp sụp đổ này,\n"
@@ -16285,2264 +11890,1851 @@ msgstr "%s %s bị lỗi đoạn (segfault) và cố đổ một tập tin lõi.
 "với hai nhà phát triển này qua giao thức khác nằm ở :\n"
 "%swiki/DeveloperPages\n"
 
-#.Translators may want to transliterate the name.
-#.It is not to be translated.
-#: ../pidgin/gtkmain.c:729
-#: ../pidgin/pidgin.h:51
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:352
 msgid "Open All Messages"
 msgstr "Mở mọi tin nhẳn"
 
-#: ../pidgin/gtknotify.c:405
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Có thư mới !</span>"
 
-#: ../pidgin/gtknotify.c:548
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s có %d tin nhẳn mới."
 
-#: ../pidgin/gtknotify.c:572
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d thư mới.</b>"
 
-#: ../pidgin/gtknotify.c:1004
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Lệnh trình duyệt « %s » không hợp lệ."
 
-#: ../pidgin/gtknotify.c:1006
-#: ../pidgin/gtknotify.c:1018
-#: ../pidgin/gtknotify.c:1031
-#: ../pidgin/gtknotify.c:1159
 msgid "Unable to open URL"
 msgstr "Không thể mở địa chỉ URL"
 
-#: ../pidgin/gtknotify.c:1016
-#: ../pidgin/gtknotify.c:1029
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Lỗi khởi chạy « %s »: %s"
 
-#: ../pidgin/gtknotify.c:1160
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Đã chọn lệnh chạy trình duyệt « Bằng tay », nhưng không cung cấp lệnh nào."
+msgstr ""
+"Đã chọn lệnh chạy trình duyệt « Bằng tay », nhưng không cung cấp lệnh nào."
 
-#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "Những phần bổ sung theo đây sẽ được bỏ nạp."
 
-#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Nhiều phần bổ sung sẽ được bỏ nạp."
 
-#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Bỏ nạp phần bổ sung"
 
-#: ../pidgin/gtkplugin.c:308
 msgid "Could not unload plugin"
 msgstr "Không thể bỏ nạp phần bổ sung"
 
-#: ../pidgin/gtkplugin.c:309
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr "Không thể bỏ nạp phần bổ sung ngay bây giờ, nhưng nó sẽ bị tắt vào lúc khởi chạy kế tiếp."
-
-#: ../pidgin/gtkplugin.c:417
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr "%s%s\n"
-"<span weight=\"bold\">Tác giả:</span>\t%s\n"
-"<span weight=\"bold\">Trang chủ:</span>\t\t%s\n"
-"<span weight=\"bold\">Tên tập tin:</span>\t%s"
+msgstr ""
+"Không thể bỏ nạp phần bổ sung ngay bây giờ, nhưng nó sẽ bị tắt vào lúc khởi "
+"chạy kế tiếp."
 
-#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
-msgstr "%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Lỗi: %s\n"
+msgstr ""
+"<span foreground=\"red\" weight=\"bold\">Lỗi: %s\n"
 "Hãy kiểm tra địa chỉ Web của phần bổ sung để tìm bản cập nhật.</span>"
 
-#: ../pidgin/gtkplugin.c:553
+msgid "Author"
+msgstr "Tác giả"
+
+msgid "<b>Written by:</b>"
+msgstr "<b>Tạo bởi:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>Địa chỉ Web:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Tên tập tin:</b>"
+
 msgid "Configure Pl_ugin"
 msgstr "Cấ_u hình phần bổ sung"
 
-#: ../pidgin/gtkplugin.c:616
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Chi tiết về phần bổ sung</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#.Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
+#. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Thông báo cho ai"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Tên _bạn chát:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "Đăn_g nhập"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "Đăng _xuất"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Đi _vắng"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "Có mặt t_rở lại"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Rơ_i vào trạng thái nghỉ"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "%s h_oạt động trở lại."
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "_Bắt đầu gõ phím"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Tạm _dừng khi gõ phím"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Ngừng gõ _phím"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Gửi tin _nhẳn"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Mở cửa sổ Nhắn Tin"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Thông _báo tự mở"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Gửi tin _nhẳn"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "Thực thi _lệnh"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Chơi âm th_anh"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "Du_yệt..."
 
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "_Duyệt..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Xem thử"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "Thông báo chỉ khi trạng thái của tôi không phải « Có mặt »"
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Lặp lại"
 
-#: ../pidgin/gtkpounce.c:1258
 msgid "Pounce Target"
 msgstr "Đích thông báo"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Mặc định"
-
-#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "Sắc thái hình cười không giải nén được."
 
-#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "Cài đặt sắc thái"
 
-#: ../pidgin/gtkprefs.c:697
 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 "Chọn một sắc thái hình cười mà bạn muốn dùng từ danh sách bên dưới. Cài đặt sắc thái mới "
-"bằng cách kéo và thả chúng vào danh sách sắc thái."
+msgstr ""
+"Chọn một sắc thái hình cười mà bạn muốn dùng từ danh sách bên dưới. Cài đặt "
+"sắc thái mới bằng cách kéo và thả chúng vào danh sách sắc thái."
 
-#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "Biểu tượng"
 
-#: ../pidgin/gtkprefs.c:894
+msgid "Keyboard Shortcuts"
+msgstr "Phím tắt"
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Đóng cuộc th_oại dùng phím Esc"
+
 msgid "System Tray Icon"
 msgstr "Biểu tượng trên khay"
 
-#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "_Hiện biểu tượng trên khay:"
 
-#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Khi có tin nhẳn chưa đọc"
 
-#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "Ẩn cửa sổ cuộc thoại"
 
-#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "Ẩn cuộc t_hoại Tin Nhắn mới:"
 
-#: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "Khi vắng mặt"
 
-#.All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#. All the tab options!
 msgid "Tabs"
 msgstr "Thẻ"
 
-#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Hiển thị Tin Nhắn và Chát trong cửa sổ có _thẻ"
 
-#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "Hiện _cái nút đóng trên thẻ"
 
-#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Vị trí:"
 
-#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "bên Trên"
 
-#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
-msgstr "bên Dưới"
+msgstr "Bên dưới"
 
-#: ../pidgin/gtkprefs.c:939
 msgid "Left"
-msgstr "bên Trái"
+msgstr "Bên trái"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "Right"
-msgstr "bên Phải"
+msgstr "Bên phải"
 
-#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Bên trái thẳng đứng"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Bên phải thẳng đứng"
 
-#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "C_uộc thoại mới"
 
-#: ../pidgin/gtkprefs.c:996
 msgid "Show _formatting on incoming messages"
 msgstr "Hiện định _dạng trên tin nhẳn gửi đến"
 
-#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Đóng Tin Nhắn ngay khi thẻ bị đóng"
+
 msgid "Show _detailed information"
 msgstr "Hiện thông t_in chi tiết"
 
-#: ../pidgin/gtkprefs.c:1001
 msgid "Enable buddy ic_on animation"
 msgstr "Bật h_oạt cảnh biểu tượng bạn chát"
 
-#: ../pidgin/gtkprefs.c:1008
 msgid "_Notify buddies that you are typing to them"
 msgstr "Thô_ng báo bạn chát mà bạn đang _gõ tin cho họ"
 
-#: ../pidgin/gtkprefs.c:1011
 msgid "Highlight _misspelled words"
 msgstr "Tô _sáng từ sai chính tả"
 
-#: ../pidgin/gtkprefs.c:1015
 msgid "Use smooth-scrolling"
 msgstr "Cuộn mịn"
 
-#: ../pidgin/gtkprefs.c:1018
 msgid "F_lash window when IMs are received"
 msgstr "Nhấp nhá_y cửa sổ khi nhận tin nhắn"
 
-#: ../pidgin/gtkprefs.c:1020
 msgid "Minimi_ze new conversation windows"
 msgstr "Th_u nhỏ cửa sổ cuộc thoại mới"
 
-#: ../pidgin/gtkprefs.c:1024
+msgid "Minimum input area height in lines:"
+msgstr "Bề cao vùng nhập tối thiểu theo dòng:"
+
 msgid "Font"
 msgstr "Phông"
 
-#: ../pidgin/gtkprefs.c:1026
 msgid "Use document font from _theme"
 msgstr "Dùng phông tài liệu từ sắc _thái"
 
-#: ../pidgin/gtkprefs.c:1028
 msgid "Use font from _theme"
 msgstr "Dùng phông từ sắc _thái"
 
-#: ../pidgin/gtkprefs.c:1030
 msgid "Conversation _font:"
 msgstr "_Phông cuộc thoại:"
 
-#: ../pidgin/gtkprefs.c:1044
 msgid "Default Formatting"
 msgstr "Định dạng mặc định"
 
-#: ../pidgin/gtkprefs.c:1063
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
-msgstr "Văn bản trong tin nhẳn gửi đi của bạn sẽ hiển thị như dưới đây khi bạn dùng giao thức hỗ trợ định dạng văn bản. :)"
+msgstr ""
+"Văn bản trong tin nhẳn gửi đi của bạn sẽ hiển thị như dưới đây khi bạn dùng "
+"giao thức hỗ trợ định dạng văn bản. :)"
 
-#: ../pidgin/gtkprefs.c:1123
 msgid "Cannot start proxy configuration program."
 msgstr "Không thể khởi chạy chương trình cấu hình máy phục vụ ủy nhiệm."
 
-#: ../pidgin/gtkprefs.c:1135
 msgid "Cannot start browser configuration program."
 msgstr "Không thể khởi chạy chương trình cấu hình trình duyệt."
 
-#: ../pidgin/gtkprefs.c:1155
 msgid "ST_UN server:"
 msgstr "Máy phục vụ ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1167
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Thí dụ : stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1171
 msgid "_Autodetect IP address"
 msgstr "Tự động tìm r_a địa chỉ IP"
 
-#: ../pidgin/gtkprefs.c:1180
 msgid "Public _IP:"
 msgstr "_IP công:"
 
-#: ../pidgin/gtkprefs.c:1211
 msgid "Ports"
 msgstr "Cổng"
 
-#: ../pidgin/gtkprefs.c:1214
 msgid "_Enable automatic router port forwarding"
 msgstr "_Bật tự động chuyển tiếp cổng từ bộ định tuyến"
 
-#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "Xác định bằng tay phạ_m vi các cổng trên chúng cần lắng nghe"
 
-#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "Cổng đầ_u :"
 
-#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "Cổng cuố_i:"
 
-#: ../pidgin/gtkprefs.c:1235
 msgid "Proxy Server &amp; Browser"
 msgstr "Máy phục vụ ủy nhiệm và Trình duyệt"
 
-#: ../pidgin/gtkprefs.c:1243
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Không tìm thấy chương trình cấu hình máy phục vụ ủy nhiệm.</b>"
 
-#: ../pidgin/gtkprefs.c:1251
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Không tìm thấy chương trình cấu hình trình duyệt.</b>"
 
-#: ../pidgin/gtkprefs.c:1256
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
-msgstr "Thiết lập máy phục vụ ủy nhiệm và trình duyệt\n"
+msgstr ""
+"Thiết lập máy phục vụ ủy nhiệm và trình duyệt\n"
 "trong Tùy thích GNOME"
 
-#: ../pidgin/gtkprefs.c:1263
 msgid "Configure _Proxy"
 msgstr "Cấu hình ủ_y nhiệm"
 
-#: ../pidgin/gtkprefs.c:1268
 msgid "Configure _Browser"
 msgstr "Cấu hình trình _duyệt"
 
-#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "Máy phục vụ ủy nhiệm"
 
-#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "Không ủy nhiệm"
 
-#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_Người dùng:"
 
 # Tên trình duyệt Web.
-#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1428
+msgid "Desktop Default"
+msgstr "Màn hình nền mặc định"
+
 msgid "GNOME Default"
 msgstr "GNOME mặc định"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
 # Tên trình duyệt Web
-#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Bằng tay"
 
-#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "Chọn trình duyệt"
 
-#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "Trình _duyệt:"
 
-#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Mở liên kết trong:"
 
-#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "Trình duyệt mặc định"
 
-#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Cửa sổ đang mở"
 
-#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Thẻ mới"
 
-#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
-msgstr "_Bằng tay:\n"
+msgstr ""
+"_Bằng tay:\n"
 "(%s cho URL)"
 
-#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "Định _dạng bản ghi:"
 
-#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "Gh_i lại mọi tin nhắn"
 
-#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Ghi lại mọi cuộc c_hát"
 
-#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "Ghi lại mọi thay đổi t_rạng thái vào bản ghi hệ thống"
 
-#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "Chọn âm thanh"
 
-#: ../pidgin/gtkprefs.c:1735
+#, c-format
 msgid "Quietest"
 msgstr "Im nhất"
 
-#: ../pidgin/gtkprefs.c:1737
+#, c-format
 msgid "Quieter"
 msgstr "Im hơn"
 
-#: ../pidgin/gtkprefs.c:1739
+#, c-format
 msgid "Quiet"
 msgstr "Im"
 
-#: ../pidgin/gtkprefs.c:1743
+#, c-format
 msgid "Loud"
 msgstr "To"
 
-#: ../pidgin/gtkprefs.c:1745
+#, c-format
 msgid "Louder"
 msgstr "To hơn"
 
-#: ../pidgin/gtkprefs.c:1747
+#, c-format
 msgid "Loudest"
 msgstr "To nhất"
 
-#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_Phương pháp:"
 
-#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "Tiếng bíp bàn giao tiếp"
 
-#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Không âm thanh"
 
-#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
-msgstr "_Lệnh âm thanh:\n"
+msgstr ""
+"_Lệnh âm thanh:\n"
 "(%s cho tên tập tin)"
 
-#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "Âm thanh khi cuộc thoại có tiê_u điểm"
 
-#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Bật âm thanh:"
 
-#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Âm lượng:"
 
-#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Chơi"
 
-#: ../pidgin/gtkprefs.c:2028
+msgid "_Browse..."
+msgstr "Du_yệt..."
+
+msgid "_Reset"
+msgstr "Đặt _lại"
+
 msgid "_Report idle time:"
 msgstr "Thông _báo thời gian nghỉ:"
 
-#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "Dựa vào cách sử dụng bàn phím hay con chuột"
 
-#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "T_rả lời tự động:"
 
-#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "Khi cả hai vắng mặt và nghỉ"
 
-#.Auto-away stuff
-#: ../pidgin/gtkprefs.c:2052
+#. Auto-away stuff
 msgid "Auto-away"
 msgstr "Tự động vắng mặt"
 
-#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Đổi trạng thá_i khi nghỉ"
 
-#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "Số _phút trước khi đi nghỉ:"
 
-#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Đổi t_rạng thái thành:"
 
-#.Signon status stuff
-#: ../pidgin/gtkprefs.c:2087
+#. Signon status stuff
 msgid "Status at Startup"
 msgstr "Trạng thái khi khởi chạy"
 
-#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "Khởi chạ_y thì dùng trạng thái từ lần thoát cuối"
 
-#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Trạng thái cần dùng khi _khởi chạy:"
 
-#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "Giao diện"
 
-#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Sắc thái hình cười"
 
-#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Trình duyệt"
 
-#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Trạng thái / Nghỉ"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Cho phép mọi người dùng liên lạc với bạn"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Chỉ cho phép người dùng trong danh sách buddy"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Chỉ cho phép những người dùng sau đây"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Chặn mọi người dùng"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Chặn chỉ những người dùng dưới đây"
 
-#: ../pidgin/gtkprivacy.c:373
 msgid "Privacy"
 msgstr "Riêng tư"
 
-#: ../pidgin/gtkprivacy.c:383
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Thay đổi thiết lập tính riêng tư có tác dụng ngay."
 
-#."Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:395
 msgid "Set privacy for:"
 msgstr "Đặt tính riêng tư cho:"
 
-#: ../pidgin/gtkprivacy.c:533
-#: ../pidgin/gtkprivacy.c:550
+#. Remove All button
+msgid "Remove Al_l"
+msgstr "Bỏ tất _cả"
+
 msgid "Permit User"
 msgstr "Cho phép người dùng"
 
-#: ../pidgin/gtkprivacy.c:534
 msgid "Type a user you permit to contact you."
 msgstr "Nhập người dùng mà bạn cho phép liên lạc với bạn."
 
-#: ../pidgin/gtkprivacy.c:535
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Hãy nhập tên của người dùng mà bạn cho phép liên lạc với bạn."
 
-#: ../pidgin/gtkprivacy.c:538
-#: ../pidgin/gtkprivacy.c:554
 msgid "_Permit"
 msgstr "Cho _phép"
 
-#: ../pidgin/gtkprivacy.c:544
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Có cho phép %s liên lạc với bạn không?"
 
-#: ../pidgin/gtkprivacy.c:546
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Bạn có chắc là muốn cho phép %s liên lạc với bạn không?"
 
-#: ../pidgin/gtkprivacy.c:575
-#: ../pidgin/gtkprivacy.c:589
 msgid "Block User"
 msgstr "Chặn người dùng"
 
-#: ../pidgin/gtkprivacy.c:576
 msgid "Type a user to block."
 msgstr "Nhập người dùng cần chặn."
 
-#: ../pidgin/gtkprivacy.c:577
 msgid "Please enter the name of the user you wish to block."
 msgstr "Hãy nhập tên của người dùng mà bạn muốn chặn."
 
-#: ../pidgin/gtkprivacy.c:585
 #, c-format
 msgid "Block %s?"
 msgstr "Chặn %s không?"
 
-#: ../pidgin/gtkprivacy.c:587
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Bạn có chắc là muốn chặn %s không?"
 
-#: ../pidgin/gtkrequest.c:273
 msgid "Apply"
 msgstr "Áp dụng"
 
-#: ../pidgin/gtkrequest.c:1497
 msgid "That file already exists"
 msgstr "Tập tin này đã có"
 
-#: ../pidgin/gtkrequest.c:1498
 msgid "Would you like to overwrite it?"
 msgstr "Bạn muốn ghi đè lên nó không?"
 
-#: ../pidgin/gtkrequest.c:1501
 msgid "Overwrite"
 msgstr "Ghi đè"
 
-#: ../pidgin/gtkrequest.c:1502
 msgid "Choose New Name"
 msgstr "Chọn tên mới"
 
-#: ../pidgin/gtkrequest.c:1642
-#: ../pidgin/gtkrequest.c:1656
 msgid "Select Folder..."
 msgstr "Chọn thư mục..."
 
-#.Create the window.
-#: ../pidgin/gtkroomlist.c:534
-msgid "Room List"
-msgstr "Danh sách phòng"
-
-#.list button
-#: ../pidgin/gtkroomlist.c:595
+#. list button
 msgid "_Get List"
 msgstr "_Lấy danh sách"
 
-#.add button
-#: ../pidgin/gtkroomlist.c:603
+#. add button
 msgid "_Add Chat"
 msgstr "Thê_m chát"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Bạn chắc chắn muốn xóa các trạng thái đã lưu được chọn không?"
 
-#.Use button
-#: ../pidgin/gtksavedstatuses.c:616
-#: ../pidgin/gtksavedstatuses.c:1251
+#. Use button
 msgid "_Use"
 msgstr "_Dùng"
 
-#: ../pidgin/gtksavedstatuses.c:763
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Tiêu đề này đang được dùng. Bạn phải chọn một tiêu đề không trùng"
 
-#: ../pidgin/gtksavedstatuses.c:959
 msgid "Different"
 msgstr "Khác"
 
-#: ../pidgin/gtksavedstatuses.c:1147
 msgid "_Title:"
 msgstr "_Tựa đề:"
 
-#: ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1475
 msgid "_Status:"
 msgstr "T_rạng thái:"
 
-#.Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1199
+#. Different status message expander
 msgid "Use a _different status for some accounts"
 msgstr "Đặt một trạng thái _khác cho một số tài khoản nào đó"
 
-#.Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1258
+#. Save & Use button
 msgid "Sa_ve & Use"
 msgstr "Lưu _và Dùng"
 
-#: ../pidgin/gtksavedstatuses.c:1459
 #, c-format
 msgid "Status for %s"
 msgstr "Trạng thái cho %s"
 
-#: ../pidgin/gtkstatusbox.c:664
+msgid "Custom Smiley"
+msgstr "Hình cười tự chọn"
+
+msgid "Duplicate Shortcut"
+msgstr "Nhân đôi lối tắt"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Đã có một hình cười tự chọn cho lối tắt đã chọn. Hãy ghi rõ một lối tắt khác."
+
+msgid "More Data needed"
+msgstr "Cần thêm dữ liệu"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Hãy cung cấp một lối tắt cần liên quan đến hình cười đó."
+
+msgid "Please select an image for the smiley."
+msgstr "Hãy chọn một ảnh cho hình cười đó."
+
+msgid "Edit Smiley"
+msgstr "Sửa hình cười"
+
+msgid "Add Smiley"
+msgstr "Thêm hình cười"
+
+msgid "Smiley _Image"
+msgstr "Ảnh cườ_i"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Lối tắt _hình cười"
+
+msgid "Smiley"
+msgstr "Hình cười"
+
+msgid "Custom Smiley Manager"
+msgstr "Bộ Quản lý Hình cười Tự chọn"
+
 msgid "Waiting for network connection"
 msgstr "Đợi kết nối đến mạng"
 
-#: ../pidgin/gtkstatusbox.c:1072
 msgid "New status..."
 msgstr "Trạng thái mới.."
 
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved statuses..."
 msgstr "Trạng thái đã lưu..."
 
-#: ../pidgin/gtkutils.c:683
+msgid "Status Selector"
+msgstr "Bộ chọn trạng thái"
+
 msgid "Google Talk"
 msgstr "Google Thoại"
 
-#: ../pidgin/gtkutils.c:1450
-#: ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Gặp lỗi theo đây khi nạp %s: %s"
 
-#: ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "Không nạp được ảnh"
 
-#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Không thể gửi thư mục %s."
 
-#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr "%s không thể truyền tải một thư mục. Bạn chỉ được chuyển từng tập tin trong đó mà thôi."
+msgstr ""
+"%s không thể truyền tải một thư mục. Bạn chỉ được chuyển từng tập tin trong "
+"đó mà thôi."
 
-#: ../pidgin/gtkutils.c:1584
-#: ../pidgin/gtkutils.c:1596
-#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "Bạn đã kéo một ảnh"
 
-#: ../pidgin/gtkutils.c:1585
 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 "Bạn có thể gửi ảnh này như một việc truyền tập tin, nhúng nó vào trong tin nhẳn này, hay dùng nó là biểu tượng bạn chát cho người dùng này."
+msgstr ""
+"Bạn có thể gửi ảnh này như một việc truyền tập tin, nhúng nó vào trong tin "
+"nhẳn này, hay dùng nó là biểu tượng bạn chát cho người dùng này."
 
-#: ../pidgin/gtkutils.c:1591
-#: ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "Đặt là biểu tượng bạn chát"
 
-#: ../pidgin/gtkutils.c:1592
-#: ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Gửi tập tin ảnh"
 
-#: ../pidgin/gtkutils.c:1593
-#: ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Chèn vào tin nhẳn"
 
-#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Bạn có muốn đặt nó làm biểu tượng bạn chát cho người dùng này không?"
 
-#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
-msgstr "Bạn có thể gửi ảnh này như một việc truyền tập tin, hay dùng nó làm biểu tượng bạn chát cho người dùng này."
+msgstr ""
+"Bạn có thể gửi ảnh này như một việc truyền tập tin, hay dùng nó làm biểu "
+"tượng bạn chát cho người dùng này."
 
-#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr "Bạn có thể chèn ảnh này vào trong tin nhẳn, hay dùng nó làm biểu tượng bạn chát cho người dùng này."
-
-#.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:1664
+msgstr ""
+"Bạn có thể chèn ảnh này vào trong tin nhẳn, hay dùng nó làm biểu tượng bạn "
+"chát cho người dùng này."
+
+#. 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
 msgid "Cannot send launcher"
 msgstr "Không thể gửi bộ khởi chạy"
 
-#: ../pidgin/gtkutils.c:1664
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
-msgstr "Bạn đã kéo một bộ khởi chạy của môi trường. Rất có thể là bạn muốn gửi đích của bộ khởi chạy, hơn là bộ khởi chạy chính nó."
+msgstr ""
+"Bạn đã kéo một bộ khởi chạy của môi trường. Rất có thể là bạn muốn gửi đích "
+"của bộ khởi chạy, hơn là bộ khởi chạy chính nó."
 
-#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
-msgstr "<b>Tập tin:</b> %s\n"
+msgstr ""
+"<b>Tập tin:</b> %s\n"
 "<b>Kích cỡ tập tin:</b> %s\n"
 "<b>Kích ỡ ảnh:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tập tin « %s » quá lớn cho %s. Hãy thử một ảnh nhỏ hơn.\n"
 
-#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "Lỗi biểu tượng"
 
-#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "Không thể đặt biểu tượng"
 
-#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Không mở được tập tin « %s »: %s"
 
-#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Không nạp được ảnh « %s »: không biết sao, rất có thể là tập tin ảnh bị hỏng"
+msgstr ""
+"Không nạp được ảnh « %s »: không biết sao, rất có thể là tập tin ảnh bị hỏng"
 
-#: ../pidgin/gtkwhiteboard.c:754
-#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Lưu tập tin"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Chọn màu"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "Bí d_anh:"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Đóng các _thẻ"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Lấy thông tin"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "Mờ_i"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Sửa"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Mở thư"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin Tooltip"
+msgstr "Gợi ý Công cụ Pidgin"
+
 msgid "Pidgin smileys"
-msgstr "Hình cười Pighin"
+msgstr "Hình cười Pidgin"
 
 # Name: don't translate/Tên: đừng dịch
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Penguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Chọn điều này thì tắt dùng biểu tượng xúc cảm kiểu đồ họa."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "không có"
 
-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr "Hiển thị thống kê"
-
-#: ../pidgin/plugins/cap/cap.c:464
-#: ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "Xác suất đáp ứng:"
 
-#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "Cấu hình thống kê"
 
-#.msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
+#. msg_difference spinner
 msgid "Maximum response timeout:"
 msgstr "Thời hạn đáp ứng tối đa:"
 
-#: ../pidgin/plugins/cap/cap.c:819
-#: ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833
-#: ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "phút"
 
-#.last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:823
+#. last_seen spinner
 msgid "Maximum last-seen difference:"
 msgstr "Hiệu thấy-cuối tối đa:"
 
-#.threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
+#. threshold spinner
 msgid "Threshold:"
 msgstr "Ngưỡng:"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/cap/cap.c:938
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Contact Availability Prediction"
 msgstr "Dự đoán liên lạc sẵn sàng"
 
-#.*< name
-#.*< version
-#: ../pidgin/plugins/cap/cap.c:940
+#. *< name
+#. *< version
 msgid "Contact Availability Prediction plugin."
 msgstr "Phần bổ sung để dự đoán nếu liên lạc sẵn sàng chưa."
 
-#.*  summary
-#: ../pidgin/plugins/cap/cap.c:941
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr "Phần bổ sung dự đoán liên lạc sẵn sàng (cap) được dùng để hiển thị thông tin thống kê về các bạn chát trên danh sách liên lạc của người dùng."
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+msgstr "Hiển thị thông tin thống kê về tình trạng có mặt của bạn bè"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Bạn chát đang nghỉ"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Bạn chát vắng mặt"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Bạn chát vắng mặt kéo dài"
 
-#.Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
+#. Not used yet.
 msgid "Buddy is mobile"
 msgstr "Bạn chát dùng thiết bị di động"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Bạn chát chưa kết nối"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Các giá trị điểm để dùng khi..."
 
-#: ../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 "Bạn chát có <i>nhiều điểm nhất</i> là bạn chát sẽ có mức ưu tiên cao nhất khi liên lạc.\n"
+msgstr ""
+"Bạn chát có <i>nhiều điểm nhất</i> là bạn chát sẽ có mức ưu tiên cao nhất "
+"khi liên lạc.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Dùng bạn chát cuối khi có điểm trùng"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Các giá trị điểm để dùng cho tài khoản..."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/contact_priority.c:188
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Contact Priority"
 msgstr "Ưu tiên liên lạc"
 
-#.*< name
-#.*< version
-#.*< summary
-#: ../pidgin/plugins/contact_priority.c:191
+#. *< name
+#. *< version
+#. *< summary
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr "Cho phép điều chỉnh các giá trị liên quan đến các trạng thái khác nhau của bạn chát."
+msgstr ""
+"Cho phép điều chỉnh các giá trị liên quan đến các trạng thái khác nhau của "
+"bạn chát."
 
-#.*< description
-#: ../pidgin/plugins/contact_priority.c:193
+#. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr "Cho phép thay đổi giá trị đặt cho các trạng thái nghỉ/vắng mặt/chưa kết nối cho các bạn chát trong việc tính mức ưu tiên liên lạc"
+msgstr ""
+"Cho phép thay đổi giá trị đặt cho các trạng thái nghỉ/vắng mặt/chưa kết nối "
+"cho các bạn chát trong việc tính mức ưu tiên liên lạc"
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Màu sắc cuộc thoại"
 
-#: ../pidgin/plugins/convcolors.c:25
-#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Tùy chỉnh màu sắc trong cửa sổ thoại"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Thông điệp lỗi"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Thông điệp đã tô sáng"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Thông điệp hệ thống"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Tin nhẳn đã gửi"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Tin nhẳn đã nhận"
 
-#: ../pidgin/plugins/convcolors.c:218
-#: ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Chọn màu cho %s"
 
-#: ../pidgin/plugins/convcolors.c:367
 msgid "Ignore incoming format"
 msgstr "Bỏ qua định dạng gửi đến"
 
-#: ../pidgin/plugins/convcolors.c:368
 msgid "Apply in Chats"
 msgstr "Áp dụng trong chát"
 
-#: ../pidgin/plugins/convcolors.c:369
 msgid "Apply in IMs"
 msgstr "Áp dụng trong Tin Nhắn"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Theo số đếm cuộc thoại"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Vị trí cuộc thoại"
 
-#.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
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr "Ghi chú : tùy thích về « Cuộc thoại mới » phải được đặt thành « Theo số đếm cuộc thoại »."
+msgstr ""
+"Ghi chú : tùy thích về « Cuộc thoại mới » phải được đặt thành « Theo số đếm "
+"cuộc thoại »."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Số cuộc thoại trong mỗi cửa sổ"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Tách biệt cửa sổ Tin Nhắn và Chát khi đặt vị trí theo số"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/extplacement.c:146
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "ExtPlacement"
 msgstr "Vị trí thêm"
 
-#.*< name
-#.*< version
-#: ../pidgin/plugins/extplacement.c:148
+#. *< name
+#. *< version
 msgid "Extra conversation placement options."
 msgstr "Tuỳ chọn thêm để định vị cuộc thoại."
 
-#.*< summary
-#.*  description
-#: ../pidgin/plugins/extplacement.c:150
+#. *< summary
+#. *  description
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr "Giới hạn số cuộc thoại trong mỗi cửa sổ, tuỳ chọn phân cách Tin Nhắn và Chát"
+msgstr ""
+"Giới hạn số cuộc thoại trong mỗi cửa sổ, tuỳ chọn phân cách Tin Nhắn và Chát"
 
-#.Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
+#. Configuration frame
 msgid "Mouse Gestures Configuration"
 msgstr "Cấu hình động tác con chuột"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Nút ở giữa trên chuột"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Nút bên phải trên chuột"
 
-#."Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
+#. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
 msgstr "_Hiển thị mỗi động tác"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/gestures/gestures.c:295
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Mouse Gestures"
 msgstr "Động tác con chuột"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
+#. *< name
+#. *< version
+#. *  summary
 msgid "Provides support for mouse gestures"
 msgstr "Cung cấp hỗ trợ động tác của con chuột"
 
-#.*  description
-#: ../pidgin/plugins/gestures/gestures.c:300
+#. *  description
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr "Cho phép hỗ trợ các động tác của con chuột trong cửa sổ cuộc thoại.\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Cho phép hỗ trợ các động tác của con chuột trong cửa sổ cuộc thoại.\n"
 "Kéo cái nút ở giữa trên con chuột để thực hiện những thao tác:\n"
 "\n"
 "Kéo xuống rồi sang bên phải để đóng cửa sổ thoại.\n"
 "Kéo lên rồi sang bên trái để chuyển đổi sang cứa sổ thoại trước.\n"
 "Kéo lên rồi sang bên phải để chuyển đổi sang cửa sổ cuộc thoại tiếp theo."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Tin Nhắn"
 
-#.Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+#. Add the label.
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Chọn một người trong sổ địa chỉ bên dưới, hay thêm người mới."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Nhóm:"
 
-#."New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
+#. "New Person" button
 msgid "New Person"
 msgstr "Người dùng mới"
 
-#."Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
+#. "Select Buddy" button
 msgid "Select Buddy"
 msgstr "Chọn bạn chát"
 
-#.Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
+#. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
-msgstr "Chọn một người trong sổ địa chỉ vào họ cần thêm bạn chát này, hay thêm một người mới."
+msgstr ""
+"Chọn một người trong sổ địa chỉ vào họ cần thêm bạn chát này, hay thêm một "
+"người mới."
 
-#.Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
+#. Add the expander
 msgid "User _details"
 msgstr "Ch_i tiết người dùng"
 
-#."Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
+#. "Associate Buddy" button
 msgid "_Associate Buddy"
 msgstr "Bạn chát liên qu_an"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send email"
-msgstr "Không thể gửi thư."
+msgstr "Không thể gửi thư"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
-msgstr "Không tìm thấy tập tin thực thi Evolution trên đường dẫn hệ thống mặc định (biến PATH)."
+msgstr ""
+"Không tìm thấy tập tin thực thi Evolution trên đường dẫn hệ thống mặc định "
+"(biến PATH)."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An email address was not found for this buddy."
 msgstr "Không tìm thấy địa chỉ thư cho bạn chát này."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Thêm vào sổ địa chỉ"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send Email"
 msgstr "Gửi thư"
 
-#.Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
+#. Configuration frame
 msgid "Evolution Integration Configuration"
 msgstr "Cấu hình hợp nhất với Evolution"
 
-#.Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
+#. Label
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Chọn tất cả các tài khoản vào chúng cần tự động thêm bạn chát."
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Evolution Integration"
 msgstr "Hợp nhất với Evolution"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Provides integration with Evolution."
 msgstr "Cung cấp cách hợp nhất với trình duyệt Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Hãy nhập vào đây thông tin về người này."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Nhập vào bên dưới tên hiển thị và kiểu tài khoản của bạn chát."
+msgid "Please enter the buddy's username and account type below."
+msgstr "Nhập vào bên dưới tên người dùng và kiểu tài khoản của bạn chát."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Kiểu tài khoản:"
 
-#.Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
+#. Optional Information section
 msgid "Optional information:"
 msgstr "Thông tin thêm:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Tên:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Họ :"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "Email:"
 msgstr "Địa chỉ thư :"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "GTK Signals Test"
 msgstr "Kiểm tra tín hiệu GTK"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Test to see that all ui signals are working properly."
 msgstr "Kiểm tra để biết là mọi tín hiệu của giao diện đang hoạt động tốt."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "\n"
+msgstr ""
+"\n"
 "<b>Ghi chú bạn chát</b>: %s"
 
-#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Lược sử"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/iconaway.c:82
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Iconify on Away"
 msgstr "Thu nhỏ khi đi vắng"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../pidgin/plugins/iconaway.c:85
-#: ../pidgin/plugins/iconaway.c:87
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Biểu tượng hóa danh sách bạn bẻ và các cuộc thoại khi bạn đi vắng."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Bộ kiểm tra thư"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Kiểm tra có thư cục bộ mới"
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "Thêm một hộp nhỏ trong danh sách bạn bè nếu bạn có thư mới."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Đường ngụ ý"
 
-#: ../pidgin/plugins/markerline.c:25
-#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Vẽ một đường để ngụ ý tin nhẳn mới trong cuộc thoại."
 
-#: ../pidgin/plugins/markerline.c:246
+msgid "Jump to markerline"
+msgstr "Nhảy tới đường ngụ ý"
+
 msgid "Draw Markerline in "
 msgstr "Vẽ đường ngụ ý trong "
 
-#: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Cửa sổ Nhắn T_in"
 
-#: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Cửa sổ C_hat"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
-msgstr "Một phiên chạy gửi tin nhẳn âm nhạc đã được yêu cầu. Hãy nhấn vào biểu tượng MM để chấp nhận."
+msgstr ""
+"Một phiên chạy gửi tin nhẳn âm nhạc đã được yêu cầu. Hãy nhấn vào biểu tượng "
+"MM để chấp nhận."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Phiên chạy gửi tin nhẳn âm nhạc đã được xác nhận."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Tin Nhẳn Nhạc"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Có xung đột khi chạy lệnh:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Lỗi chạy bộ chỉnh sửa"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Gặp lỗi theo đây:"
 
-#.Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
+#. Configuration frame
 msgid "Music Messaging Configuration"
 msgstr "Cấu hình tin nhẳn nhạc"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Đường dẫn bộ sửa điểm"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "Á_p dụng"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#.*< name
-#.*< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Phần bổ sung tin nhẳn nhạc để soạn nhạc một cách hợp tác."
 
-#.*  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
+#. *  summary
 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 "Phần bổ sung tin nhẳn nhạc thì cho phép một số người dùng soạn cùng thời một bản nhạc bằng cách chỉnh sửa một bản dàn bè chung trong thời gian thực."
+msgstr ""
+"Phần bổ sung tin nhẳn nhạc thì cho phép một số người dùng soạn cùng thời một "
+"bản nhạc bằng cách chỉnh sửa một bản dàn bè chung trong thời gian thực."
 
-#.---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
+#. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "Thông báo cho"
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Chỉ khi ai đó nói tên hiển thị của bạn"
+msgid "\t_Only when someone says your username"
+msgstr "\t_Chỉ khi ai đó nói tên người dùng của bạn"
 
-#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "Cử_a sổ được chú ý"
 
-#.---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
+#. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
 msgstr "Phương thức thông báo"
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Chèn một chuỗi vào trước tựa đề cửa _sổ:"
 
-#.Count method button
-#: ../pidgin/plugins/notify.c:741
+#. Count method button
 msgid "Insert c_ount of new messages into window title"
 msgstr "Chèn số đếm tin nhẳn mới và_o tựa đề cửa sổ"
 
-#.Count xprop method button
-#: ../pidgin/plugins/notify.c:750
+#. Count xprop method button
 msgid "Insert count of new message into _X property"
 msgstr "Chèn số đếm tin nhẳn mới vào thuộc tính _X"
 
-#.Urgent method button
-#: ../pidgin/plugins/notify.c:758
+#. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Lập ẩn ý « _Khẩn » của bộ quản lý cửa sổ"
 
-#.Raise window method button
-#: ../pidgin/plugins/notify.c:767
+#. Raise window method button
 msgid "R_aise conversation window"
 msgstr "Nâng cử_a sổ cuộc thoại lên"
 
-#.---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr "Hiển thị cửa sổ cuộc th_oại lên"
+
+#. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
 msgstr "Bỏ thông báo"
 
-#.Remove on focus button
-#: ../pidgin/plugins/notify.c:780
+#. Remove on focus button
 msgid "Remove when conversation window _gains focus"
 msgstr "_Gỡ bỏ khi cửa sổ cuộc thoại được chú ý"
 
-#.Remove on click button
-#: ../pidgin/plugins/notify.c:787
+#. Remove on click button
 msgid "Remove when conversation window _receives click"
 msgstr "Gỡ _bỏ khi cửa sổ cuộc thoại được nhấn chuột"
 
-#.Remove on type button
-#: ../pidgin/plugins/notify.c:795
+#. Remove on type button
 msgid "Remove when _typing in conversation window"
 msgstr "Gỡ bỏ khi gõ vào _trong cửa sổ cuộc thoại"
 
-#.Remove on message send button
-#: ../pidgin/plugins/notify.c:803
+#. Remove on message send button
 msgid "Remove when a _message gets sent"
 msgstr "Gỡ bỏ _khi gửi tin nhẳn"
 
-#.Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
+#. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
 msgstr "Gỡ bỏ khi chu_yển sang thẻ cuộc thoại"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/notify.c:907
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Message Notification"
 msgstr "Thông báo tin nhẳn"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../pidgin/plugins/notify.c:910
-#: ../pidgin/plugins/notify.c:912
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Cung cấp các cách khác nhau để thông báo cho bạn về các tin nhẳn chưa đọc."
-
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/pidgininc.c:91
+msgstr ""
+"Cung cấp các cách khác nhau để thông báo cho bạn về các tin nhẳn chưa đọc."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Pidgin Demonstration Plugin"
 msgstr "Phần bổ sung minh hoạ Pidgin"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../pidgin/plugins/pidgininc.c:94
+#. *< name
+#. *< version
+#. *  summary
 msgid "An example plugin that does stuff - see the description."
 msgstr "Một phần bổ sung thí dụ mà làm gì — xem mô tả."
 
-#.*  description
-#: ../pidgin/plugins/pidgininc.c:96
+#. *  description
 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 "Đây là một phần bổ sung tuyệt vời với nhiều tính năng:\n"
+msgstr ""
+"Đây là một phần bổ sung tuyệt vời với nhiều tính năng:\n"
 " • Cho biết ai viết chương trình khi bạn đăng nhập\n"
 " • Đảo ngược mọi câu viết được gửi đến\n"
 " • Gửi tin cho thành viên có trong danh sách của bạn ngay khi họ kết nối"
 
-#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Màu con trỏ"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Màu con trỏ phụ"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Màu siêu liên kết"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Màu tên tin nhẳn tô sáng"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Phân cách ngang GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Mục thoại"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Hộp thoại yêu cầu"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Hộp thoại thông báo"
 
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Chọn màu"
 
-#: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Chọn phông giao diện"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Chọn phông cho %s"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "Phông giao diện GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Sắc thái lối tắt văn bản GTK+"
 
 #.
-#.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);
+#. 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);
+#. 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]);
-#.}
+#. 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:434
 msgid "Interface colors"
 msgstr "Màu sắc giao diện"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Kích cỡ ô điều khiển"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Phông"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Công cụ tập tin Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Ghi thiết lập vào %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Đọc lại tập tin tài nguyên gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Điều khiển sắc thái GTK+ Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:557
-#: ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Cho phép vào các thiết lập gtkrc thông dụng."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Thô"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Để bạn gửi dữ liệu nhập thôi đến các giao thức dựa trên văn bản."
 
-#: ../pidgin/plugins/raw.c:178
 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 "Để bạn gửi dữ liệu nhập thô đến giao thức dựa trên văn bản (XMPP, MSN, IRC, TOC). Nhấn phím Enter trong hộp nhập để gửi đi. Theo dõi cửa sổ gỡ rối."
+msgstr ""
+"Để bạn gửi dữ liệu nhập thô đến giao thức dựa trên văn bản (XMPP, MSN, IRC, "
+"TOC). Nhấn phím Enter trong hộp nhập để gửi đi. Theo dõi cửa sổ gỡ rối."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
-msgstr "Bạn đang sử dụng %s phiên bản %s. Phiên bản hiện thời là %s. Bạn có thể lấy nó ở <a href=\"%s\">%s</a><hr>"
+msgstr ""
+"Bạn đang sử dụng %s phiên bản %s. Phiên bản hiện thời là %s. Bạn có thể lấy "
+"nó ở <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Bản ghi thay đổi:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84
-#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Hiện đang có phiên bản mới"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/relnot.c:143
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Release Notification"
 msgstr "Thông báo phát hành"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../pidgin/plugins/relnot.c:146
+#. *< name
+#. *< version
+#. *  summary
 msgid "Checks periodically for new releases."
 msgstr "Kiểm tra phiên bản mới theo định kỳ."
 
-#.*  description
-#: ../pidgin/plugins/relnot.c:148
+#. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
-msgstr "Kiểm tra phiên bản mới theo định kỳ và thông báo về thay đổi của phiên bản mới cho người dùng."
+msgstr ""
+"Kiểm tra phiên bản mới theo định kỳ và thông báo về thay đổi của phiên bản "
+"mới cho người dùng."
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr "Nút Gửi"
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr "Cái nút Gửi trong Cửa sổ Cuộc thoại."
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+"Thêm một cái nút Gửi vào vùng nhập của cửa sổ cuộc thoát. Dự định cho trường "
+"hợp không có bàn phím vật lý."
 
-#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Sửa chữa bản sao"
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Từ vừa nhập đã có sẵn trong danh sách tự sửa chữa."
 
-#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Thay thế văn bản"
 
-#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Bạn gõ phím"
 
-#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Bạn gửi"
 
-#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Chỉ nguyên từ"
 
-#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Phân biệt chữ hoa/thường"
 
-#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Thêm chuỗi thay thế mới"
 
-#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Bạn gõ _phím:"
 
-#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Bạn gửi:"
 
-#.Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "Phân biệt chính _xác chữ hoa/thường (bỏ chọn để quản lý chữ hoa/thường một cách tự động)"
+msgstr ""
+"Phân biệt chính _xác chữ hoa/thường (bỏ chọn để quản lý chữ hoa/thường một "
+"cách tự động)"
 
-#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Chỉ thay thế ngu_yên từ"
 
-#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Tùy chọn thay thế văn bản chung"
 
-#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Hiệu lực thay thế từ cuối khi gửi"
 
-#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "Thay thế văn bản"
 
-#: ../pidgin/plugins/spellchk.c:2374
-#: ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Thay thế văn bản trong tin nhẳn gửi đi theo qui tắc người dùng định ra."
-
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/ticker/ticker.c:74
-#: ../pidgin/plugins/ticker/ticker.c:356
+msgstr ""
+"Thay thế văn bản trong tin nhẳn gửi đi theo qui tắc người dùng định ra."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Thanh cuộn bạn bè"
 
-#.*< name
-#.*< version
-#.*  summary
-#.*  description
-#: ../pidgin/plugins/ticker/ticker.c:359
-#: ../pidgin/plugins/ticker/ticker.c:361
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Thanh cuộn ngang danh sách bạn bè."
 
-#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Ghi giờ mỗi"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/timestamp.c:200
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Timestamp"
 msgstr "Nhãn thời gian"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../pidgin/plugins/timestamp.c:203
+#. *< name
+#. *< version
+#. *  summary
 msgid "Display iChat-style timestamps"
 msgstr "Hiện nhãn thời gian kiểu iChat"
 
-#.*  description
-#: ../pidgin/plugins/timestamp.c:205
+#. *  description
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Thêm nhãn thời gian kiểu iChat vào cuộc thoại N phút một lần."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Tùy chọn định dạng nhãn thời gian"
 
-#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Buộc định dạng 24 giờ"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Hiển thị ngày tháng có..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "C_uộc thoại:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Cho tính năng bị hoãn"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Cho tính năng bị hoãn và trong cuộc chát"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "_Bản ghi tin nhẳn:"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/timestamp_format.c:151
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Message Timestamp Formats"
 msgstr "Định dạng nhãn thời gian tin nhẳn"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../pidgin/plugins/timestamp_format.c:154
+#. *< name
+#. *< version
+#. *  summary
 msgid "Customizes the message timestamp formats."
 msgstr "Tùy chỉnh định dạng của nhãn thời gian trong tin nhẳn."
 
-#.*  description
-#: ../pidgin/plugins/timestamp_format.c:156
+#. *  description
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
-msgstr "Phần bổ sung này cho phép người dùng tùy chỉnh các định dạng của nhãn thời gian trong tin nhẳn cuộc thoại và bản ghi."
+msgstr ""
+"Phần bổ sung này cho phép người dùng tùy chỉnh các định dạng của nhãn thời "
+"gian trong tin nhẳn cuộc thoại và bản ghi."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Tính mờ đục:"
 
-#.IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
+#. IM Convo trans options
 msgid "IM Conversation Windows"
 msgstr "Cửa sổ cuộc thoại Tin Nhắn"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Tính trong suốt của cửa sổ Nhắn T_in"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "Hiện thanh trượt trong cửa _sổ Nhắn Tin"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Gỡ bỏ tính trong suốt của cửa sổ Nhắn Tin khi được chú ý"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Luôn luôn phía trước"
 
-#.Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
+#. Buddy List trans options
 msgid "Buddy List Window"
 msgstr "Cửa sổ danh sách bạn bè"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Tính trong suốt của cửa sổ danh sách _bạn bè"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Gỡ bỏ tính trong suốt của cửa sổ danh sách bạn bè khi được chú ý"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Transparency"
 msgstr "Trong suốt"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
+#. *< name
+#. *< version
+#. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Độ trong suốt biến đổi đối với danh sách bạn bè và các cuộc thoại."
 
-#.*  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
+#. *  description
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
-msgstr "Phần bổ sung này tạo độ trong suốt alpha biến đổi trên cửa sổ cuộc thoại và danh sách bạn bè.\n"
+msgstr ""
+"Phần bổ sung này tạo độ trong suốt alpha biến đổi trên cửa sổ cuộc thoại và "
+"danh sách bạn bè.\n"
 "\n"
 "Chú ý: phần bổ sung này yêu cầu bạn dùng Win2000 hoặc sau."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Phiên bản GTK+ Runtime"
 
-#.Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
+#. Autostart
 msgid "Startup"
 msgstr "Khởi chạy"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Chạy %s khi khởi động Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Danh sách bạn bè có thể neo lại"
 
-#.Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#. Blist On Top
 msgid "_Keep Buddy List window on top:"
 msgstr "_Giữ cửa sổ danh sách bạn bè phía trước"
 
-#.XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
+#. XXX: Did this ever work?
 msgid "Only when docked"
 msgstr "Chỉ khi neo lại"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "Nhấp nhá_y cửa sổ khi nhận tin nhắn"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Tùy chọn Pidgin Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Tùy chọn riêng cho Pidgin trên Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "Cung cấo thiết lập đặc biệt cho Windows Pidgin, chẳng hạn như neo danh sách bạn bè."
+msgstr ""
+"Cung cấo thiết lập đặc biệt cho Windows Pidgin, chẳng hạn như neo danh sách "
+"bạn bè."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Đã đăng xuất.</font>"
 
-#.*< type
-#.*< ui_requirement
-#.*< flags
-#.*< dependencies
-#.*< priority
-#.*< id
-#: ../pidgin/plugins/xmppconsole.c:749
-#: ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "XMPP Console"
 msgstr "Bàn giao tiếp XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Tài khoản: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Chưa kết nối tới XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Chèn một đoạn dòng <iq/>"
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Chèn một đoạn dòng <presence/>"
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Chèn một đoạn dòng <message/>"
 
-#.*< name
-#.*< version
-#.*  summary
-#: ../pidgin/plugins/xmppconsole.c:866
+#. *< name
+#. *< version
+#. *  summary
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Gửi và nhận các đoạn dòng XMPP thô."
 
-#.*  description
-#: ../pidgin/plugins/xmppconsole.c:868
+#. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Phần bổ sung này có ích để gỡ lỗi máy phục vụ hay trình khách kiểu XMPP."
-
-#~ msgid "Sort by status"
-#~ msgstr "Sắp xếp theo trạng thái"
-
-#~ msgid "Sort alphabetically"
-#~ msgstr "Sắp xếp theo thứ tự abc"
-
-#~ msgid "Sort by log size"
-#~ msgstr "Sắp xếp theo kích cỡ bản ghi"
-
-#~ msgid "Error initializing session"
-#~ msgstr "Lỗi khởi tạo phiên làm việc"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "Bạn vừa gởi đi một lời kêu gọi!"
-
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Không thể tạo kết nối SSL tới máy phục vụ."
-
-#~ msgid "Invalid chat name specified."
-#~ msgstr "Chỉ định một tên chát không hợp lệ."
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "Bạn chắc muốn thoát khỏi Qun này không?"
-
-#~ msgid "Server ACK"
-#~ msgstr "ACK máy phục vụ"
-
-#~ msgid "Request login token error!"
-#~ msgstr "Lỗi hiệu bài đăng nhập yêu cầu"
-
-#~ msgid "%s Address"
-#~ msgstr "Địa chỉ"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: Có mặt"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: Vắng mặt"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: Giấu mặt"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: Chưa kết nối"
-
-#~ msgid "Modify My Information"
-#~ msgstr "Sửa đổi thông tin của tôi"
-
-#~ msgid "Socket send error"
-#~ msgstr "Lỗi gửi ổ cắm"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "Muốn thêm họ không?"
-
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s muốn gửi cho bạn %s (%s)"
-
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "Bạn vừa gởi đi một lời kêu gọi !"
-
-#~ msgid "Add Buddy _Pounce"
-#~ msgstr "Thêm thông _báo Buddy"
-
-#~ msgid "Add a _Buddy"
-#~ msgstr "Thêm _Buddy"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "Thêm C_hat"
+msgstr ""
+"Phần bổ sung này có ích để gỡ lỗi máy phục vụ hay trình khách kiểu XMPP."
 
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">%s đã ngắt kết nối.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
+#~ msgid "Error setting socket options"
+#~ msgstr "Lỗi đặt tùy chọn ổ cắm"
 
 #~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s will not attempt to reconnect the account until you correct the error "
-#~ "and re-enable the account."
-#~ msgstr "%s bị ngằt kết nối vì có lỗi. %s Tài khoản ngưng hoạt động. Sửa lỗi và "
-#~ "cho tài khoản hoạt động lại để kết nối."
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Tùy chọn/H_iện biểu tượng bạn chát"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Tùy chọn/Hiện biểu tượng bạn chát"
-
-#~ msgid "_Send To"
-#~ msgstr "_Gửi cho"
-
-#~ msgid "Norwegian"
-#~ msgstr "Tiếng Na-uy"
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Xác thực ID Windows Live: không tìm thấy hiệu bài xác thực trong đáp ứng "
+#~ "máy phục vụ"
 
-#~ msgid "_Bold"
-#~ msgstr "_Đậm"
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Không xác thực được ID Windows Live"
 
-#~ msgid "_Smaller"
-#~ msgstr "_Nhỏ hơn"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Mã [0x%02X]: %s"
 
-#~ msgid "_Reset font"
-#~ msgstr "Đặt _lại phông"
+#~ msgid "Group Operation Error"
+#~ msgstr "Lỗi thao tác nhóm"
 
-#~ msgid "_Smiley"
-#~ msgstr "_Hình cười"
+#~ msgid "Error requesting login token"
+#~ msgstr "Lỗi yêu cầu hiệu bài đăng nhập"
 
-#~ msgid "Conversation History"
-#~ msgstr "Lịch sử trao đổi"
+#~ msgid "TCP Address"
+#~ msgstr "Địa chỉ TCP"
 
-#~ msgid "Log Viewer"
-#~ msgstr "Sổ theo dõi"
+#~ msgid "UDP Address"
+#~ msgstr "Địa chỉ UDP"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1e422dc1a0..1e23b7bdf9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,11 +1,11 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.12 2008/05/12 02:04:30 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.14 2008/08/13 04:23:30 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
 # Copyright (C) 2003-2008, 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.537 2008/05/12 02:13:23 acli Exp $
+# $InternalId: zh_TW.po,v 1.540 2008/08/10 08:37:23 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -50,10 +50,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.4.2\n"
+"Project-Id-Version: Pidgin 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 08:57-0400\n"
-"PO-Revision-Date: 2008-05-11 18:00-0400\n"
+"POT-Creation-Date: 2008-08-15 11:51-0400\n"
+"PO-Revision-Date: 2008-08-09 16:16-0400\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
 "<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -143,6 +143,10 @@ msgstr "密碼："
 msgid "Alias:"
 msgstr "別名："
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "在伺服器上建立這個帳號"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -383,6 +387,7 @@ msgstr "切換標記"
 msgid "Nickname"
 msgstr "網名"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "閒置"
@@ -463,6 +468,9 @@ msgstr "加入聊天室..."
 msgid "View Log..."
 msgstr "觀看日誌..."
 
+msgid "View All Logs"
+msgstr "觀看所有日誌"
+
 msgid "Show"
 msgstr "顯示"
 
@@ -660,6 +668,17 @@ msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記
 msgid "Send To"
 msgstr "傳送到"
 
+msgid "Invite message"
+msgstr "邀請訊息"
+
+msgid "Invite"
+msgstr "邀請"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr "請輸入你想邀請的使用者名稱，以及選擇性填寫邀請的訊息。"
+
 msgid "Conversation"
 msgstr "交談"
 
@@ -672,6 +691,9 @@ msgstr "顯示時間戳記"
 msgid "Add Buddy Pounce..."
 msgstr "加入好友狀態捕捉..."
 
+msgid "Invite..."
+msgstr "邀請..."
+
 msgid "Enable Logging"
 msgstr "開始記錄日誌"
 
@@ -681,9 +703,12 @@ msgstr "啟動音效"
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "使用者列表：\n"
+# XXX 20080810
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "使用者列表（%d個使用者）：\n"
+msgstr[1] "使用者列表（%d個使用者）：\n"
 
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
@@ -698,6 +723,17 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s 不是有效的訊息類別，請輸入「/help msgcolor」指令列出所有有效的訊息類別。"
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s 不是有效的顏色，請輸入「/help msgcolor」指令列出所有有效的顏色。"
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -739,6 +775,19 @@ msgstr "prefs：顯示「偏好設定」視窗"
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;類別&gt; &lt;前景顏色&gt; &lt;背景顏色&gt;：為交談視窗中不同類別"
+"的訊息設定顏色。<br>    &lt;類別&gt;：receive、send、highlight、action、"
+"timestamp<br>    &lt;前景顏色/背景顏色&gt;：black、red、green、blue、white、"
+"gray、darkgray、magenta、cyan、default<br><br>例：<br>    msgcolor` send "
+"cyan default"
+
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
@@ -759,8 +808,10 @@ msgid "Pause"
 msgstr "暫停"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
+msgstr[1] "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
 
 #. Create the window.
 msgid "File Transfers"
@@ -875,6 +926,9 @@ msgstr "於 %s 的交談"
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
+msgid "All Conversations"
+msgstr "所有交談"
+
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -913,9 +967,6 @@ msgstr "繼續"
 msgid "IM"
 msgstr "即時訊息"
 
-msgid "Invite"
-msgstr "邀請"
-
 # TODO 要覆查 - 20061028
 msgid "(none)"
 msgstr "(沒有名字)"
@@ -1121,6 +1172,7 @@ msgstr "%s 已經離開。 (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給你。 (%s)"
 
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請匯報這個問題！"
 
@@ -1489,6 +1541,7 @@ msgid ""
 "conversation into the current conversation."
 msgstr "當新的交談開啟時，這個模組將會把上次的交談內容也顯示出來。"
 
+#, c-format
 msgid "Online"
 msgstr "上線"
 
@@ -1838,6 +1891,7 @@ msgstr ""
 "由解析程序讀取時發生錯誤：\n"
 "%s"
 
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "由解析程序讀取時碰到檔案結尾"
 
@@ -1928,6 +1982,7 @@ msgstr "開始自 %2$s 傳送 %1$s"
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
+#, c-format
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
@@ -1935,6 +1990,7 @@ msgstr "檔案傳輸完畢"
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
+#, c-format
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
@@ -2125,6 +2181,7 @@ msgstr "(%s) %s <自動回覆>：%s\n"
 msgid "You are using %s, but this plugin requires %s."
 msgstr "你目前使用的是 %s，但這模組需要 %s。"
 
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "這個模組未有定義它的 ID。"
 
@@ -2136,8 +2193,9 @@ msgstr "模組不符 %d (需要 %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI 版本不符 %d.%d.x (需要%d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "模組並未實作所有必要的功能"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr "模組並未提供所有必需的函數 (list_icon、login 及 close)"
 
 #, c-format
 msgid ""
@@ -2232,6 +2290,10 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
+# XXX 20080810 acli
+msgid "Create a new directory for each user"
+msgstr "給每個使用者建立該使用者專用的目綠"
+
 msgid "Notes"
 msgstr "備註"
 
@@ -2815,13 +2877,11 @@ msgstr ""
 
 # FIXME 沒有譯「toolkit」- 20071023 acli
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://developer."
-"pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 查"
-"閱 FAQ 部分。"
+"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱 FAQ 部分。"
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
@@ -2878,9 +2938,6 @@ msgstr "無法送出訊息，交談無法開始。"
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-msgid "Error setting socket options"
-msgstr "設定 Socket 選項時錯誤"
-
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
@@ -2930,6 +2987,9 @@ msgstr "好友清單讀取成功！"
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
+msgid "Load buddylist from file..."
+msgstr "自檔案讀取好友清單..."
+
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
@@ -3027,6 +3087,7 @@ msgstr "上線"
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
+#, c-format
 msgid "Away"
 msgstr "離開"
 
@@ -3106,9 +3167,6 @@ msgstr "將伺服器上的好友清單刪除"
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-msgid "Load buddylist from file..."
-msgstr "自檔案讀取好友清單..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -3226,6 +3284,9 @@ msgstr "通訊埠"
 msgid "Encodings"
 msgstr "編碼"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "自動偵測來訊 UTF-8"
+
 msgid "Real name"
 msgstr "姓名"
 
@@ -3242,8 +3303,8 @@ msgstr "模式無效"
 # NOTE 第一個 %s 為367碼的第二個參數，指定黑名單某一個ban的ban mask
 # NOTE 第二個 %s 為建立這個ban的帳號 (nick)
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "禁止 %s（由 %s 在 %ld 秒前設定）"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "禁止 %s（由 %s 在 %s前設定）"
 
 # NOTE %s 為367碼的第二個參數，指定黑名單某一個ban的ban mask
 #, c-format
@@ -3418,6 +3479,9 @@ msgid ""
 "away."
 msgstr "away [訊息]：設定一個離開訊息，或者在離開時不指定任何訊息。"
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp &lt;網名&gt; &lt;訊息&gt;：向指定的網名送出 ctcp 訊息"
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv：送出一個指令到 chanserv"
 
@@ -3667,11 +3731,13 @@ msgid "Region"
 msgstr "省／州"
 
 msgid "Postal Code"
-msgstr "郵遞區號"
+msgstr "郵遞編號"
 
 msgid "Country"
 msgstr "國家"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "電話"
 
@@ -3884,6 +3950,9 @@ msgstr "中繼段檢查"
 msgid "Capabilities"
 msgstr "兼容性"
 
+msgid "Priority"
+msgstr "優先次序"
+
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
@@ -3892,9 +3961,6 @@ msgstr "兼容性"
 msgid "Resource"
 msgstr ""
 
-msgid "Priority"
-msgstr "優先次序"
-
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 msgid "Middle Name"
@@ -3946,6 +4012,7 @@ msgstr "想聊天"
 msgid "Extended Away"
 msgstr "長時間離開"
 
+#, c-format
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -3982,7 +4049,7 @@ msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
 msgid "Email Address"
-msgstr "電子郵件"
+msgstr "電子郵件地址"
 
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
@@ -4135,7 +4202,7 @@ msgid "State"
 msgstr "省／州"
 
 msgid "Postal code"
-msgstr "郵遞區號"
+msgstr "郵遞編號"
 
 msgid "Phone"
 msgstr "電話"
@@ -4678,8 +4745,8 @@ msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (代碼 %s)"
+msgid "(Code %s)"
+msgstr "(代碼 %s)"
 
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
@@ -4702,14 +4769,14 @@ msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "聊天室 %s 發生錯誤"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
+
+#, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s，因為對方不支援檔案傳輸"
 
@@ -4798,170 +4865,223 @@ msgid ""
 msgstr ""
 "%s 在本地端的好友清單，郤不在伺服器上；你要新增這個好友至伺服器的好友清單嗎？"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤（可能是用戶端的 Bug）"
 
+#, c-format
 msgid "Invalid email address"
-msgstr "電子郵件位址無效"
+msgstr "電子郵件地址無效"
 
+#, c-format
 msgid "User does not exist"
 msgstr "使用者不存在"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
+#, c-format
 msgid "Already logged in"
 msgstr "已經登入"
 
+#, c-format
 msgid "Invalid username"
 msgstr "帳號無效。"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "網名無效"
 
+#, c-format
 msgid "List full"
 msgstr "好友清單已滿"
 
+#, c-format
 msgid "Already there"
 msgstr "已經在清單裏"
 
+#, c-format
 msgid "Not on list"
 msgstr "不在清單中"
 
+#, c-format
 msgid "User is offline"
 msgstr "使用者是離線的"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
+#, c-format
 msgid "Too many groups"
 msgstr "太多羣組"
 
+#, c-format
 msgid "Invalid group"
 msgstr "羣組無效"
 
+#, c-format
 msgid "User not in group"
 msgstr "使用者不在羣組內"
 
+#, c-format
 msgid "Group name too long"
 msgstr "羣組名稱過長"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號羣組"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "嘗試將一個使用者加入不存在的羣組"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "傳送通知失敗"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
+#, c-format
 msgid "Not logged in"
 msgstr "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
+#, c-format
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX 暫譯
+#, c-format
 msgid "Command disabled"
 msgstr "指令被停用"
 
+#, c-format
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
+#, c-format
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
+#, c-format
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
+#, c-format
 msgid "Unable to write"
 msgstr "無法寫入"
 
+#, c-format
 msgid "Session overload"
 msgstr "工作階段超載"
 
+#, c-format
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
+#, c-format
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "網名的更改過於急速"
 
+#, c-format
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "認證失敗"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
 #  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#, c-format
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
@@ -4984,6 +5104,9 @@ msgstr "%s 呼叫你！"
 msgid "Nudging %s..."
 msgstr "呼叫 %s 中..."
 
+msgid "Email Address..."
+msgstr "電子郵件..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "你的新 MSN 網名太長。"
 
@@ -5021,8 +5144,20 @@ msgstr "允許"
 msgid "Disallow"
 msgstr "不允許"
 
-msgid "This Hotmail account may not be active."
-msgstr "這個Hotmail帳號可能尚未被啟動。"
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "與 %s 相關的被封鎖的文字"
+
+msgid "No text is blocked for this account."
+msgstr "這個帳戶沒有文字被封鎖。"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN 的伺服器目前正在封鎖乎合下列 regular expression 的文字：<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "這個帳號的電子郵件功能未有啟動。"
 
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
@@ -5081,6 +5216,9 @@ msgstr "開啟 / 關閉流動通訊器材..."
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
+msgid "View Blocked Text..."
+msgstr "檢視被封鎖的文字..."
+
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
@@ -5283,14 +5421,8 @@ msgstr "nudge：呼叫使用者，引起他們的注意"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID 認證：無法連線"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr "Windows Live ID 認證：在伺服器傳來的回應無法找到認證符記"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID 認證失敗"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID 認證：回應無效"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5344,6 +5476,9 @@ msgstr "%s 不是一個有效的 Passport 帳號"
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "因為行動訊息過長，所以無法送出："
+
 msgid "Unable to rename group"
 msgstr "無法更改羣組名稱"
 
@@ -5378,6 +5513,22 @@ msgstr[1] ""
 "\n"
 "當維護工作結束，你將可以再度登入。"
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"因為系統不可用，所以訊息無法送出；這通常表示對方已被封鎖，或對方的帳號並不存"
+"在。"
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "因為傳送訊息的速度太快，所以訊息無法送出。"
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "因為發生不明的編碼錯誤，訊息無法送出："
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "因為發生不明的錯誤，訊息無法送出。"
+
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -5496,6 +5647,9 @@ msgstr "無法新增「%s」。"
 msgid "The username specified is invalid."
 msgstr "你所輸入的帳號無效。"
 
+msgid "This Hotmail account may not be active."
+msgstr "這個Hotmail帳號可能尚未被啟動。"
+
 msgid "Has you"
 msgstr "你在他（她）的好友清單裏"
 
@@ -5539,8 +5693,10 @@ msgid "Logging in"
 msgstr "登入中"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "與伺服器失去連線（%d 秒內收不到任何資料）"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "與伺服器失去連線（%d 秒內收不到任何資料）"
+msgstr[1] "與伺服器失去連線（%d 秒內收不到任何資料）"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5644,9 +5800,13 @@ msgstr "即時訊息的好友"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）"
+msgstr[0] "從伺服器新增或更新了 %d 個好友（包括伺服器上已在好友清單上的好友）"
+msgstr[1] "從伺服器新增或更新了 %d 個好友（包括伺服器上已在好友清單上的好友）"
 
 msgid "Add contacts from server"
 msgstr "從伺服器加入聯絡人"
@@ -6121,6 +6281,7 @@ msgstr "無法連線至伺服器。請輸入你希望連線至的伺服器的位
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6276,11 +6437,11 @@ msgstr "權限不夠"
 msgid "In local permit/deny"
 msgstr "本地端的允許／拒絕清單"
 
-msgid "Too evil (sender)"
-msgstr "太邪惡了（寄件人）"
+msgid "Warning level too high (sender)"
+msgstr "（發訊者）警告等級過高"
 
-msgid "Too evil (receiver)"
-msgstr "太邪惡了（收件人）"
+msgid "Warning level too high (receiver)"
+msgstr "（收訊者）警告等級過高"
 
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
@@ -6368,7 +6529,7 @@ msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
 msgid "Trillian Encryption"
-msgstr "Trillian 加密"
+msgstr "Trillian 式加密"
 
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
@@ -6395,19 +6556,28 @@ msgstr "動態視像"
 msgid "Camera"
 msgstr "照相機"
 
+# XXX 20080810 畫面分享 (Apple) / 螢幕共享 / 螢幕分享
+msgid "Screen Sharing"
+msgstr "螢幕共享"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
+#, c-format
 msgid "Not Available"
 msgstr "長時間離開"
 
+#, c-format
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#, c-format
 msgid "Web Aware"
 msgstr "允許其他使用者在網絡上查看你目前的狀態"
 
+#, c-format
 msgid "Invisible"
 msgstr "隱身"
 
@@ -6440,11 +6610,11 @@ msgid "Username sent"
 msgstr "已送出使用者名稱"
 
 msgid "Connection established, cookie sent"
-msgstr "連線已建立，並已送出 Cookie"
+msgstr "成功建立連線，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
-msgstr "完成連線"
+msgstr "完成連線中"
 
 #, c-format
 msgid ""
@@ -6460,7 +6630,7 @@ msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
 msgid "Incorrect password."
-msgstr "錯誤的密碼。"
+msgstr "密碼錯誤。"
 
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -6468,6 +6638,7 @@ msgstr "你的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#  NOTE 20080810 - cnscode.org.tw 譯「unavailable」為「不可用」
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
@@ -6481,7 +6652,6 @@ msgstr ""
 "你的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線，"
 "那麼你的等待時間將會更加的延長。"
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "你所使用的用戶端程式太過老舊。請到 %s 更新"
@@ -6523,10 +6693,11 @@ msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "你可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
 msgid "Unable to get a valid login hash."
-msgstr "無法取得有效的登入碼。"
+msgstr "無法取得有效的登入雜湊。"
 
+#. allow multple logins?
 msgid "Password sent"
-msgstr "密碼送出"
+msgstr "成功送出密碼"
 
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
@@ -6634,14 +6805,17 @@ msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 
 #, 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."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，因為你太邪惡了。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，因為你太邪惡了。"
 
@@ -6674,9 +6848,6 @@ msgstr "上線自"
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-msgid "Available Message"
-msgstr "尚有訊息"
-
 msgid "Your AIM connection may be lost."
 msgstr "你的 AIM 可能斷線了。"
 
@@ -6685,7 +6856,7 @@ msgstr "你的 AIM 可能斷線了。"
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
-msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字符。」"
+msgstr "（無法顯示來自這個使用者的訊息，因為它包含了無效字符。）"
 
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6704,11 +6875,16 @@ msgstr "流動電話"
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "其他資訊"
 
 msgid "Zip Code"
-msgstr "郵遞區號"
+msgstr "郵遞編號"
+
+msgid "Work Information"
+msgstr "工作資訊"
 
 msgid "Division"
 msgstr "部門"
@@ -6719,9 +6895,6 @@ msgstr "職位"
 msgid "Web Page"
 msgstr "網頁"
 
-msgid "Work Information"
-msgstr "工作資訊"
-
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
@@ -6917,13 +7090,6 @@ msgstr "頻道號碼(_E)："
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息圖像；AIM 聊天並不支援即時訊息圖像的傳送。"
 
-msgid "Away Message"
-msgstr "離開訊息"
-
-# XXX 好像不對，又好像沒問題
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(搜尋中)</i>"
-
 #  NOTE 蘋果自己的中文網站只寫「iTunes Store」（英文）了事 :P
 #  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
@@ -7004,6 +7170,7 @@ msgstr "以電子郵件地址來找尋好友"
 msgid "Search for a buddy by email address"
 msgstr "使用電子郵件地址搜尋好友"
 
+# XXX not exact
 msgid "Type the email address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
@@ -7051,6 +7218,9 @@ msgstr ""
 "務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸及\n"
 "直接的即時訊息（較慢，但不會暴露你的 IP 位址）"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "允許同時多次登入"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
@@ -7059,6 +7229,7 @@ msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s:%hu。"
 
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過代理伺服器連線。"
 
@@ -7104,7 +7275,7 @@ msgid "College"
 msgstr "大學／大專"
 
 msgid "Zipcode"
-msgstr "郵遞區號"
+msgstr "郵遞編號"
 
 msgid "Cellphone Number"
 msgstr "流動電話號碼"
@@ -7146,7 +7317,7 @@ msgid "Sagittarius"
 msgstr "人馬座"
 
 msgid "Capricorn"
-msgstr "魔羯座"
+msgstr "山羊座"
 
 msgid "Rat"
 msgstr "鼠"
@@ -7357,13 +7528,6 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr "請注意，假如你是創立者，這最終會把這個羣 (Qun) 移除。"
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "代碼 0x%02X：%s"
-
-msgid "Group Operation Error"
-msgstr "羣組操作錯誤"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "允許這個要求？"
@@ -7394,22 +7558,6 @@ msgstr "系統訊息"
 msgid "Failed to send IM."
 msgstr "送出即時訊息失敗。"
 
-msgid "Keep alive error"
-msgstr "Keep Alive 錯誤"
-
-msgid "Error requesting login token"
-msgstr "取得登入符記途中發生錯誤"
-
-msgid "Unable to login. Check debug log."
-msgstr "無法登入，請檢查除錯記錄。"
-
-msgid "Unable to login"
-msgstr "無法登入"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "無法連結。"
-
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
 # XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
@@ -7421,15 +7569,46 @@ msgstr "無法連結。"
 msgid "Unknown-%d"
 msgstr "未知（代碼 %d）"
 
-msgid "TCP Address"
-msgstr "TCP 位址"
-
-msgid "UDP Address"
-msgstr "UDP 位址"
-
 #  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
+#  XXX 現在似乎叫「等級」，參閱http://vip.qq.com/freedom/freedom_vipgrade.html
 msgid "Level"
-msgstr "成長階段"
+msgstr "等級"
+
+# XXX 20080810 acli - 不知這是什麼，因為QQ的會員等級制中，「會員」等同「VIP」，所以不知何謂「Member」
+# XXX 20080810 acli - 但原始碼中「Member」字串似乎是一定出現的，所以似乎應該是指「用戶」
+msgid "Member"
+msgstr "用戶"
+
+# NOTE QQ官方網站寫「VIP」（沒有官方中文名稱）
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+#, fuzzy
+msgid " FromMobile"
+msgstr " 使用流動通訊器材"
+
+#, fuzzy
+msgid " BindMobile"
+msgstr " 綁定流動通訊器材"
+
+#, fuzzy
+msgid " Video"
+msgstr " 視像"
+
+#, fuzzy
+msgid " Space"
+msgstr " Space"
+
+# FIXME 20080810 acli - 這是很差的譯文，但原文太差了，沒辦法
+msgid "Flag"
+msgstr "旗標"
+
+# NOTE 20080810 acli - 這只是除錯用的，其實可以不譯
+msgid "Ver"
+msgstr "版本"
 
 msgid "Invalid name"
 msgstr "名稱無效"
@@ -7444,12 +7623,17 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
+# XXX 20080810 acli - 是否「確實」位址？
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>伺服器真實位址：</b>%s：%d<br>\n"
 
 # XXX - 20061027
 #, c-format
@@ -7501,14 +7685,100 @@ msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
 msgid "Connect using TCP"
-msgstr "使用 TCP 連結"
+msgstr "使用 TCP 連線"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "resend interval(s)"
+msgstr "每隔多少秒重覆送出"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "Keep alive interval(s)"
+msgstr "每隔多少秒送出 Keep Alive"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "Update interval(s)"
+msgstr "每隔多少秒更新"
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "標題無效"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+#, fuzzy
+msgid "Keep alive error"
+msgstr "每隔多少秒送出 Keep Alive"
+
+msgid "Failed to connect server"
+msgstr "無法連線到伺服器"
 
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"與伺服器之間的連線突然中斷：\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
+msgid "Write Error"
+msgstr "寫入錯誤"
+
+msgid "Connection lost"
+msgstr "連線中斷"
+
+msgid "Couldn't resolve host"
+msgstr "無法解析主機"
+
+msgid "hostname is NULL or port is 0"
+msgstr "主機名稱數值為 NULL 或通訊埠數值為 0"
+
+#  XXX 20080810 acli - 原文好像有問題
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "連線伺服器 %s 中，將會嘗試 %d 次"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "無法連線。"
+
+msgid "Could not resolve hostname"
+msgstr "無法解析主機"
+
+msgid "Unable to login. Check debug log."
+msgstr "無法登入，請檢查除錯記錄。"
+
+msgid "Unable to login"
+msgstr "無法登入"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+# FIXME 譯文有待改進  - 20070912 acli
+#, fuzzy
+msgid "Failed room reply"
+msgstr "登入失敗，沒有回應"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "你 [%d] 已經被加入羣組 \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d 拒絕了檔案「%s」"
@@ -7520,13 +7790,6 @@ msgstr "傳送檔案"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-msgid "Connection lost"
-msgstr "連線中斷"
-
-# FIXME 譯文有待改進  - 20070912 acli
-msgid "Login failed, no reply"
-msgstr "登入失敗，沒有回應"
-
 msgid "Do you want to add this buddy?"
 msgstr "你要加入這個使用者到好友清單中嗎？"
 
@@ -7564,6 +7827,14 @@ msgstr "訊息：%s"
 msgid "%s is not in your buddy list"
 msgstr "%s 不在你的好友清單內"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "自 %s 發佈的通告"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "連線關閉（寫入）"
 
@@ -8162,6 +8433,7 @@ msgstr "<br><b>頻道身份驗證代碼 (HMAC)：</b>%s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>頻道主題：</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式：</b>"
 
@@ -8186,6 +8458,7 @@ msgstr "頻道密碼"
 msgid "Channel Public Keys List"
 msgstr "頻道公開密碼匙清單"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8580,9 +8853,15 @@ msgstr "無法初始化 SILC 協定"
 msgid "Error loading SILC key pair"
 msgstr "讀取 SILC 配對密碼匙途中出現錯誤"
 
+# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息（quit message），ui_name通常就是「pidgin」
+#, c-format
+msgid "Download %s: %s"
+msgstr "下載 %s，請瀏覽 %s"
+
 msgid "Your Current Mood"
 msgstr "你目前的心情"
 
+#, c-format
 msgid "Normal"
 msgstr "正常"
 
@@ -8962,35 +9241,45 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新你的用戶端程式"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗：遠端不信任／不支援你的公開密碼匙"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗：遠端不支援建議中的密碼匙交換羣組 (KE group)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗：遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗：遠端不支援建議中的公開密碼匙證書標準 (PKCS)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗：遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗：遠端不支援建議中的身份驗證代碼 (HMAC)"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "失敗：錯誤的簽署"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
@@ -9017,12 +9306,6 @@ msgstr "不明的伺服器回應。"
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-msgid "Couldn't resolve host"
-msgstr "無法解析主機"
-
-msgid "Could not resolve hostname"
-msgstr "無法解析主機"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字符或「@」符號"
 
@@ -9092,6 +9375,7 @@ msgstr "%s 目前並未登入。"
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄，因為你達到了伺服器所限制的發送速度。"
 
@@ -9111,32 +9395,41 @@ msgstr "你遺失了一個由 %s 送來的訊息，因為它太大了。"
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "你遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
 
+#, c-format
 msgid "Failure."
 msgstr "失敗。"
 
+#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
+#, c-format
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
+#, c-format
 msgid "Email lookup restricted."
-msgstr "禁止 Email 檢查。"
+msgstr "禁止 E-Mail 檢查。"
 
+#, c-format
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
+#, c-format
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
+#, c-format
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
+#, c-format
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
@@ -9144,17 +9437,21 @@ msgstr "這個國家不被支援。"
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因：%s。"
 
+#, c-format
 msgid "Incorrect username or password."
 msgstr "錯誤的帳號或密碼。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "你目前登入系統的警告等級太高，以致無法登入。"
 
+#, c-format
 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."
@@ -9473,9 +9770,6 @@ msgstr "無法建立檔案介紹。"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 提出一次過傳送 %d 個檔案。\n"
 
-msgid "Write Error"
-msgstr "寫入錯誤"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
@@ -9789,6 +10083,14 @@ msgstr "解析 %s 途中發生了錯誤"
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "要求 %s 的注意中..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s 要求您注意！"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9819,14 +10121,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s 改變網名為 %s。\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "要求 %s 的注意中..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s 要求你注意！"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9841,6 +10135,21 @@ msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "捷徑"
+
+msgid "The text-shortcut for the smiley"
+msgstr "與表情相關的文字捷徑"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "已儲存的圖像"
+
+# FIXME 20080810 acli - 我覺得我譯錯了，但不知其實這是什麼意思
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "已儲存（而目前會使用）的圖像"
+
 # FIXME ambiguous - 20061025
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
@@ -9900,6 +10209,12 @@ msgstr "+++ %s 更改狀態為閒置"
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9993,22 +10308,31 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "連線被電腦上的其他軟件中斷。"
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "遠端主機關閉了連線。"
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "連線已逾時"
 
 # XXX - 20061027
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "連線被拒。"
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "位址已在使用中"
+
 msgid "Internet Messenger"
 msgstr "網絡即時通"
 
@@ -10121,8 +10445,8 @@ msgstr "新增帳號"
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-msgid "Create this new account on the server"
-msgstr "在伺服器上建立這個新帳號"
+msgid "Create _this new account on the server"
+msgstr "在伺服器上建立這個新帳號(_T)"
 
 msgid "_Advanced"
 msgstr "進階設定(_A)"
@@ -10219,6 +10543,12 @@ msgstr "別名(_A)..."
 msgid "_Remove"
 msgstr "移除(_R)"
 
+msgid "Set Custom Icon"
+msgstr "設定自選圖示"
+
+msgid "Remove Custom Icon"
+msgstr "移除自定圖示"
+
 msgid "Add _Buddy..."
 msgstr "新增好友(_B)..."
 
@@ -10322,7 +10652,7 @@ msgstr "/好友/結束程式(_Q)"
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-msgid "/Accounts/Manage"
+msgid "/Accounts/Manage Accounts"
 msgstr "/帳號/管理"
 
 #. Tools
@@ -10344,6 +10674,9 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/私隱設定(_I)"
 
+msgid "/Tools/Smile_y"
+msgstr "/工具/表情(_Y)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
@@ -10508,14 +10841,14 @@ 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>歡迎使用 %s!</span>\n"
 "\n"
 "你未有啟動任何帳號，請透過好友清單上的「帳號->管理」指令，到「帳號清單」啟動"
-"帳號。帳號一經啟動，就隨時可以登入或更改狀態；這樣，你就可以跟你的好友通訊"
-"了！"
+"即時訊息帳號。帳號一經啟動，就隨時可以登入或更改狀態；這樣，你就可以跟你的好"
+"友通訊了！"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10573,6 +10906,13 @@ msgstr "關閉視窗時只將聊天隱藏(_H)。"
 msgid "Please enter the name of the group to be added."
 msgstr "請給你新增的羣組輸入名稱。"
 
+msgid "Enable Account"
+msgstr "啟動帳號"
+
+# XXX
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/帳號/啟動帳號"
+
 # XXX
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
@@ -10589,13 +10929,6 @@ msgstr "沒有相關指令"
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-msgid "Enable Account"
-msgstr "啟動帳號"
-
-# XXX
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/帳號/啟動帳號"
-
 msgid "/Tools"
 msgstr "/工具"
 
@@ -10682,9 +11015,6 @@ msgstr "自定圖示..."
 msgid "Change Size"
 msgstr "更改大小"
 
-msgid "Remove Custom Icon"
-msgstr "移除自定圖示"
-
 msgid "Show All"
 msgstr "全部顯示"
 
@@ -10962,12 +11292,13 @@ msgstr "錯誤訊息"
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-msgid "lead developer"
-msgstr "主要開發者"
-
 msgid "developer"
 msgstr "開發者"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "張家興"
+
 msgid "support"
 msgstr "支援"
 
@@ -10999,6 +11330,9 @@ msgstr "XMPP 開發者"
 msgid "original author"
 msgstr "原作者"
 
+msgid "lead developer"
+msgstr "主要開發者"
+
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -11041,7 +11375,7 @@ msgstr "德文"
 # NOTE 國名是「不丹」，中譯文依國名不依語文名
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
 msgid "Dzongkha"
-msgstr "不丹文"
+msgstr "宗卡文"
 
 msgid "Greek"
 msgstr "希臘文"
@@ -11164,6 +11498,9 @@ msgstr "荷蘭文／法蘭德斯文"
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
+msgid "Occitan"
+msgstr "奧克文"
+
 msgid "Punjabi"
 msgstr "旁遮普文"
 
@@ -11272,6 +11609,7 @@ msgstr ""
 "作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程"
 "式恕不提供任何保用。<BR><BR>"
 
+#, c-format
 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>"
@@ -11423,23 +11761,35 @@ msgstr "移除聊天室(_R)"
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-msgid "Change Status"
-msgstr "更改狀態"
+msgid "_Change Status"
+msgstr "更改狀態(_C)"
+
+msgid "Show Buddy _List"
+msgstr "顯示好友清單(_L)"
 
-msgid "Show Buddy List"
-msgstr "顯示好友清單"
+msgid "_Unread Messages"
+msgstr "未讀訊息(_U)"
 
-msgid "New Message..."
-msgstr "新訊息..."
+msgid "New _Message..."
+msgstr "新訊息(_M)..."
+
+msgid "_Accounts"
+msgstr "帳號(_A)"
 
-msgid "Mute Sounds"
-msgstr "靜音"
+msgid "Plu_gins"
+msgstr "模組清單(_G)"
 
-msgid "Blink on New Message"
-msgstr "有新訊息時閃動"
+msgid "Pr_eferences"
+msgstr "偏好設定(_E)"
 
-msgid "Quit"
-msgstr "結束程式"
+msgid "Mute _Sounds"
+msgstr "靜音(_S)"
+
+msgid "_Blink on New Message"
+msgstr "有新訊息時閃動(_B)"
+
+msgid "_Quit"
+msgstr "結束程式(_Q)"
 
 #  NOTE 這是指「未開始」傳輸檔案，不是「未啟動」
 msgid "Not started"
@@ -11505,6 +11855,14 @@ msgstr "清除已完成的傳輸(_C)"
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
+#. Pause button
+msgid "_Pause"
+msgstr "暫停(_P)"
+
+#. Resume button
+msgid "_Resume"
+msgstr "恢復(_R)"
+
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -11513,7 +11871,7 @@ msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "在選擇的範圍內停用表情(_S)"
 
 msgid "Hyperlink color"
 msgstr "連結顏色"
@@ -11540,16 +11898,23 @@ msgid "Color to draw the name of a message you received."
 msgstr "收到訊息時，用來顯示對方帳號的顏色。"
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "「請你注意」的帳號顏色"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "收到訊息內含有自己名稱的訊息時，用來顯示對方帳號的顏色。"
+msgstr "收到訊息內含有自己的名稱時，用來顯示對方帳號的顏色。"
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "動作訊息帳號顏色"
 
 msgid "Color to draw the name of an action message."
+msgstr "收到的訊息是代表對方發出的一個動作時，用來顯示對帳號的顏色。"
+
+msgid "Action Message Name Color for Whispered Message"
 msgstr ""
+"收到的訊息是對方以「輕聲的說」這種動作發出的訊息時，用來顯示對方帳號的顏色"
+
+msgid "Whisper Message Name Color"
+msgstr "輕聲訊息帳號顏色"
 
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
@@ -11619,9 +11984,14 @@ msgstr ""
 msgid "Save Image"
 msgstr "儲存圖像"
 
+#, c-format
 msgid "_Save Image..."
 msgstr "儲存圖像(_S)..."
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "插入自選表情(_A)..."
+
 msgid "Select Font"
 msgstr "選擇字型"
 
@@ -11658,9 +12028,20 @@ msgstr "無法儲存圖像：%s\n"
 msgid "Insert Image"
 msgstr "插入圖像"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"這個表情已被停用，因為相關的捷徑已有一個自選表情：\n"
+" %s"
+
 msgid "Smile!"
 msgstr "笑一個！"
 
+msgid "_Manage custom smileys"
+msgstr "管理自選表情(_M)"
+
 #  XXX 譯文不通順
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
@@ -12066,7 +12447,7 @@ msgid "Icon"
 msgstr "圖示"
 
 msgid "Keyboard Shortcuts"
-msgstr "鍵盤㨗徑"
+msgstr "鍵盤捷徑"
 
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
@@ -12153,7 +12534,7 @@ msgid "Minimi_ze new conversation windows"
 msgstr "最小化所有新交談視窗(_Z)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "文字輸入區的最少行數："
 
 msgid "Font"
 msgstr "字型"
@@ -12318,21 +12699,27 @@ msgstr "記錄所有狀態改變至系統日誌(_S)"
 msgid "Sound Selection"
 msgstr "選取音效"
 
+#, c-format
 msgid "Quietest"
 msgstr "最小聲"
 
+#, c-format
 msgid "Quieter"
 msgstr "再小聲"
 
+#, c-format
 msgid "Quiet"
 msgstr "小聲"
 
+#, c-format
 msgid "Loud"
 msgstr "大聲"
 
+#, c-format
 msgid "Louder"
 msgstr "再大聲"
 
+#, c-format
 msgid "Loudest"
 msgstr "最大聲"
 
@@ -12365,6 +12752,12 @@ msgstr "音量："
 msgid "Play"
 msgstr "播放"
 
+msgid "_Browse..."
+msgstr "瀏覽(_B)..."
+
+msgid "_Reset"
+msgstr "重置(_R)"
+
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
@@ -12537,6 +12930,46 @@ msgstr "儲存並使用(_V)"
 msgid "Status for %s"
 msgstr "狀態：%s"
 
+msgid "Custom Smiley"
+msgstr "自選表情"
+
+msgid "Duplicate Shortcut"
+msgstr "重覆的表情定義"
+
+# XXX 20080810 acli - 暫譯
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr "指定的捷徑已有相關的自選表情，請指定另一個捷徑。"
+
+msgid "More Data needed"
+msgstr "需要進一步的資料"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "請給這個表情給定一個相關的捷徑。"
+
+msgid "Please select an image for the smiley."
+msgstr "請給這個表情選擇一個圖像。"
+
+msgid "Edit Smiley"
+msgstr "修改表情"
+
+msgid "Add Smiley"
+msgstr "新增表情"
+
+msgid "Smiley _Image"
+msgstr "表情圖像(_I)"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "表情捷徑(_H)"
+
+msgid "Smiley"
+msgstr "表情"
+
+msgid "Custom Smiley Manager"
+msgstr "自選表情管理"
+
 msgid "Waiting for network connection"
 msgstr "等待網絡連線..."
 
@@ -12672,9 +13105,6 @@ msgstr "修改(_M)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-msgid "_Pause"
-msgstr "暫停(_P)"
-
 #  FIXME Tooltip中文怎寫？
 msgid "Pidgin Tooltip"
 msgstr "Pidgin Tooltip"
@@ -12694,9 +13124,6 @@ msgstr "不使用表情圖示，選擇這個主題即可。"
 msgid "none"
 msgstr "無"
 
-msgid "Display Statistics"
-msgstr "顯示統計資料"
-
 msgid "Response Probability:"
 msgstr "「回答」或然率："
 
@@ -13292,6 +13719,7 @@ msgstr "通知視窗 (Notify Dialog)"
 msgid "Select Color"
 msgstr "選擇顏色"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
@@ -13520,6 +13948,7 @@ msgstr "每隔 N 分鐘顯示 iChat 風格的時間戳記。"
 msgid "Timestamp Format Options"
 msgstr "時間戳記格式選項"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "強制使用24小時制時間格式(_F)"
 
@@ -13690,15 +14119,57 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#~ msgid "_Resume"
-#~ msgstr "恢復(_R)"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "代碼 0x%02X：%s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "羣組操作錯誤"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "設定 Socket 選項時錯誤"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr "Windows Live ID 認證：在伺服器傳來的回應無法找到認證符記"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Windows Live ID 認證失敗"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "太邪惡了（寄件人）"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "太邪惡了（收件人）"
+
+#~ msgid "Available Message"
+#~ msgstr "尚有訊息"
+
+#~ msgid "Away Message"
+#~ msgstr "離開訊息"
+
+# XXX 好像不對，又好像沒問題
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(搜尋中)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "取得登入符記途中發生錯誤"
+
+#~ msgid "TCP Address"
+#~ msgstr "TCP 位址"
+
+#~ msgid "UDP Address"
+#~ msgstr "UDP 位址"
+
+#~ msgid "E-Mail"
+#~ msgstr "電子郵件"
+
+#~ msgid "E-mail"
+#~ msgstr "電子郵件"
 
 #~ msgid "Screen name:"
 #~ msgstr "帳號："
 
-#~ msgid "Screen Name"
-#~ msgstr "帳號"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "有人在聊天室中提到您的名字"
 
@@ -13789,15 +14260,8 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "User has typed something and stopped"
 #~ msgstr "對方輸入了一些東西，不過暫停了"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "%s has typed something and stopped"
-#~ msgstr "對方輸入了一些東西，不過暫停了"
-
-#, fuzzy
-#~ msgid "S_mile!"
-#~ msgstr "笑一個！"
+#~ msgid "Display Statistics"
+#~ msgstr "顯示統計資料"
 
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s 從「%s」狀態改變為「%s」"
@@ -13871,10 +14335,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "/帳號(_A)/新增\\/編輯"
 
-#  XXX
-#~ msgid "_Smiley"
-#~ msgstr "笑一個！(_S)"
-
 #~ msgid "Conversation History"
 #~ msgstr "交談歷史"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e992127fa5..8df8aecd8d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2008, 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.537 2008/05/12 02:13:23 acli Exp $
+# $InternalId: zh_TW.po,v 1.540 2008/08/10 08:37:23 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -48,10 +48,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.4.2\n"
+"Project-Id-Version: Pidgin 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 08:57-0400\n"
-"PO-Revision-Date: 2008-05-11 18:00-0400\n"
+"POT-Creation-Date: 2008-08-15 22:30-0400\n"
+"PO-Revision-Date: 2008-08-09 16:16-0400\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
 "<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -141,6 +141,10 @@ msgstr "密碼："
 msgid "Alias:"
 msgstr "別名："
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "在伺服器上建立這個帳號"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -381,6 +385,7 @@ msgstr "切換標記"
 msgid "Nickname"
 msgstr "暱稱"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "閒置"
@@ -461,6 +466,9 @@ msgstr "加入聊天室..."
 msgid "View Log..."
 msgstr "觀看日誌..."
 
+msgid "View All Logs"
+msgstr "觀看所有日誌"
+
 msgid "Show"
 msgstr "顯示"
 
@@ -658,6 +666,17 @@ msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記
 msgid "Send To"
 msgstr "傳送到"
 
+msgid "Invite message"
+msgstr "邀請訊息"
+
+msgid "Invite"
+msgstr "邀請"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr "請輸入您想邀請的使用者名稱，以及選擇性填寫邀請的訊息。"
+
 msgid "Conversation"
 msgstr "交談"
 
@@ -670,6 +689,9 @@ msgstr "顯示時間戳記"
 msgid "Add Buddy Pounce..."
 msgstr "加入好友狀態捕捉..."
 
+msgid "Invite..."
+msgstr "邀請..."
+
 msgid "Enable Logging"
 msgstr "開始記錄日誌"
 
@@ -679,9 +701,12 @@ msgstr "啟動音效"
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "使用者列表：\n"
+# XXX 20080810
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "使用者列表（%d個使用者）：\n"
+msgstr[1] "使用者列表（%d個使用者）：\n"
 
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
@@ -696,6 +721,17 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s 不是有效的訊息類別，請輸入「/help msgcolor」指令列出所有有效的訊息類別。"
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s 不是有效的顏色，請輸入「/help msgcolor」指令列出所有有效的顏色。"
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -737,6 +773,19 @@ msgstr "prefs：顯示「偏好設定」視窗"
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;類別&gt; &lt;前景顏色&gt; &lt;背景顏色&gt;：為交談視窗中不同類別"
+"的訊息設定顏色。<br>    &lt;類別&gt;：receive、send、highlight、action、"
+"timestamp<br>    &lt;前景顏色/背景顏色&gt;：black、red、green、blue、white、"
+"gray、darkgray、magenta、cyan、default<br><br>例：<br>    msgcolor` send "
+"cyan default"
+
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
@@ -757,8 +806,10 @@ msgid "Pause"
 msgstr "暫停"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
+msgstr[1] "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
 
 #. Create the window.
 msgid "File Transfers"
@@ -873,6 +924,9 @@ msgstr "於 %s 的交談"
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
+msgid "All Conversations"
+msgstr "所有交談"
+
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -911,9 +965,6 @@ msgstr "繼續"
 msgid "IM"
 msgstr "即時訊息"
 
-msgid "Invite"
-msgstr "邀請"
-
 # TODO 要覆查 - 20061028
 msgid "(none)"
 msgstr "(沒有名字)"
@@ -1119,6 +1170,7 @@ msgstr "%s 已經離開。 (%s)"
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
@@ -1487,6 +1539,7 @@ msgid ""
 "conversation into the current conversation."
 msgstr "當新的交談開啟時，這個模組將會把上次的交談內容也顯示出來。"
 
+#, c-format
 msgid "Online"
 msgstr "上線"
 
@@ -1836,6 +1889,7 @@ msgstr ""
 "由解析程序讀取時發生錯誤：\n"
 "%s"
 
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "由解析程序讀取時碰到檔案結尾"
 
@@ -1926,6 +1980,7 @@ msgstr "開始自 %2$s 傳送 %1$s"
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
+#, c-format
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
@@ -1933,6 +1988,7 @@ msgstr "檔案傳輸完畢"
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
+#, c-format
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
@@ -2123,6 +2179,7 @@ msgstr "(%s) %s <自動回覆>：%s\n"
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您目前使用的是 %s，但這模組需要 %s。"
 
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "這個模組未有定義它的 ID。"
 
@@ -2134,8 +2191,9 @@ msgstr "模組不符 %d (需要 %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI 版本不符 %d.%d.x (需要%d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "模組並未實作所有必要的功能"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr "模組並未提供所有必需的函數 (list_icon、login 及 close)"
 
 #, c-format
 msgid ""
@@ -2230,6 +2288,10 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
+# XXX 20080810 acli
+msgid "Create a new directory for each user"
+msgstr "給每個使用者建立該使用者專用的目綠"
+
 msgid "Notes"
 msgstr "備註"
 
@@ -2813,13 +2875,11 @@ msgstr ""
 
 # FIXME 沒有譯「toolkit」- 20071023 acli
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://developer."
-"pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 查"
-"閱 FAQ 部分。"
+"找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱 FAQ 部分。"
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
@@ -2876,9 +2936,6 @@ msgstr "無法送出訊息，交談無法開始。"
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-msgid "Error setting socket options"
-msgstr "設定 Socket 選項時錯誤"
-
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
@@ -2928,6 +2985,9 @@ msgstr "好友清單讀取成功！"
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
+msgid "Load buddylist from file..."
+msgstr "自檔案讀取好友清單..."
+
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
@@ -3025,6 +3085,7 @@ msgstr "上線"
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
+#, c-format
 msgid "Away"
 msgstr "離開"
 
@@ -3104,9 +3165,6 @@ msgstr "將伺服器上的好友清單刪除"
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-msgid "Load buddylist from file..."
-msgstr "自檔案讀取好友清單..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -3224,6 +3282,9 @@ msgstr "通訊埠"
 msgid "Encodings"
 msgstr "編碼"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "自動偵測來訊 UTF-8"
+
 msgid "Real name"
 msgstr "姓名"
 
@@ -3240,8 +3301,8 @@ msgstr "模式無效"
 # NOTE 第一個 %s 為367碼的第二個參數，指定黑名單某一個ban的ban mask
 # NOTE 第二個 %s 為建立這個ban的帳號 (nick)
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "禁止 %s（由 %s 在 %ld 秒前設定）"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "禁止 %s（由 %s 在 %s前設定）"
 
 # NOTE %s 為367碼的第二個參數，指定黑名單某一個ban的ban mask
 #, c-format
@@ -3416,6 +3477,9 @@ msgid ""
 "away."
 msgstr "away [訊息]：設定一個離開訊息，或者在離開時不指定任何訊息。"
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp &lt;暱稱&gt; &lt;訊息&gt;：向給定的暱稱送出 ctcp 訊息"
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv：送出一個指令到 chanserv"
 
@@ -3670,6 +3734,8 @@ msgstr "郵遞區號"
 msgid "Country"
 msgstr "國家"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "電話"
 
@@ -3882,6 +3948,9 @@ msgstr "中繼段檢查"
 msgid "Capabilities"
 msgstr "相容性"
 
+msgid "Priority"
+msgstr "優先次序"
+
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
@@ -3890,9 +3959,6 @@ msgstr "相容性"
 msgid "Resource"
 msgstr ""
 
-msgid "Priority"
-msgstr "優先次序"
-
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 msgid "Middle Name"
@@ -3944,6 +4010,7 @@ msgstr "想聊天"
 msgid "Extended Away"
 msgstr "長時間離開"
 
+#, c-format
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -3980,7 +4047,7 @@ msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
 msgid "Email Address"
-msgstr "電子郵件"
+msgstr "電子郵件地址"
 
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
@@ -4676,8 +4743,8 @@ msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (代碼 %s)"
+msgid "(Code %s)"
+msgstr "(代碼 %s)"
 
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
@@ -4700,14 +4767,14 @@ msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "聊天室 %s 發生錯誤"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
+
+#, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s，因為對方不支援檔案傳輸"
 
@@ -4796,170 +4863,223 @@ msgid ""
 msgstr ""
 "%s 在本地端的好友清單，郤不在伺服器上；您要新增這個好友至伺服器的好友清單嗎？"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤（可能是用戶端的 Bug）"
 
+#, c-format
 msgid "Invalid email address"
-msgstr "電子郵件位址無效"
+msgstr "電子郵件地址無效"
 
+#, c-format
 msgid "User does not exist"
 msgstr "使用者不存在"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
+#, c-format
 msgid "Already logged in"
 msgstr "已經登入"
 
+#, c-format
 msgid "Invalid username"
 msgstr "帳號無效。"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "暱稱無效"
 
+#, c-format
 msgid "List full"
 msgstr "好友清單已滿"
 
+#, c-format
 msgid "Already there"
 msgstr "已經在清單裡"
 
+#, c-format
 msgid "Not on list"
 msgstr "不在清單中"
 
+#, c-format
 msgid "User is offline"
 msgstr "使用者是離線的"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
+#, c-format
 msgid "Too many groups"
 msgstr "太多群組"
 
+#, c-format
 msgid "Invalid group"
 msgstr "群組無效"
 
+#, c-format
 msgid "User not in group"
 msgstr "使用者不在群組內"
 
+#, c-format
 msgid "Group name too long"
 msgstr "群組名稱過長"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號群組"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "嘗試將一個使用者加入不存在的群組"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "傳送通知失敗"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
+#, c-format
 msgid "Not logged in"
 msgstr "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
+#, c-format
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX 暫譯
+#, c-format
 msgid "Command disabled"
 msgstr "指令被停用"
 
+#, c-format
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
+#, c-format
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
+#, c-format
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
+#, c-format
 msgid "Unable to write"
 msgstr "無法寫入"
 
+#, c-format
 msgid "Session overload"
 msgstr "工作階段超載"
 
+#, c-format
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
+#, c-format
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "暱稱的變更過於急速"
 
+#, c-format
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "認證失敗"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
 #  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#, c-format
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
@@ -4982,6 +5102,9 @@ msgstr "%s 呼叫您！"
 msgid "Nudging %s..."
 msgstr "呼叫 %s 中..."
 
+msgid "Email Address..."
+msgstr "電子郵件..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
@@ -5019,8 +5142,20 @@ msgstr "允許"
 msgid "Disallow"
 msgstr "不允許"
 
-msgid "This Hotmail account may not be active."
-msgstr "這個Hotmail帳號可能尚未被啟動。"
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "與 %s 相關的被封鎖的文字"
+
+msgid "No text is blocked for this account."
+msgstr "這個帳戶沒有文字被封鎖。"
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr "MSN 的伺服器目前正在封鎖乎合下列 regular expression 的文字：<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "這個帳號的電子郵件功能未有啟動。"
 
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
@@ -5079,6 +5214,9 @@ msgstr "開啟 / 關閉行動裝置..."
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
+msgid "View Blocked Text..."
+msgstr "檢視被封鎖的文字..."
+
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
@@ -5281,14 +5419,8 @@ msgstr "nudge：呼叫使用者，引起他們的注意"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID 認證：無法連線"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr "Windows Live ID 認證：在伺服器傳來的回應無法找到認證符記"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID 認證失敗"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID 認證：回應無效"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5342,6 +5474,9 @@ msgstr "%s 不是一個有效的 Passport 帳號"
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "因為行動訊息過長，所以無法送出："
+
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
@@ -5376,6 +5511,22 @@ msgstr[1] ""
 "\n"
 "當維護工作結束，您將可以再度登入。"
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"因為系統不可用，所以訊息無法送出；這通常表示對方已被封鎖，或對方的帳號並不存"
+"在。"
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "因為傳送訊息的速度太快，所以訊息無法送出。"
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr "因為發生不明的編碼錯誤，訊息無法送出："
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr "因為發生不明的錯誤，訊息無法送出。"
+
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -5494,6 +5645,9 @@ msgstr "無法新增「%s」。"
 msgid "The username specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
+msgid "This Hotmail account may not be active."
+msgstr "這個Hotmail帳號可能尚未被啟動。"
+
 msgid "Has you"
 msgstr "你在他（她）的好友清單裏"
 
@@ -5537,8 +5691,10 @@ msgid "Logging in"
 msgstr "登入中"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "與伺服器失去連線（%d 秒內收不到任何資料）"
+msgid "Connection to server lost (no data received within %d second)"
+msgid_plural "Connection to server lost (no data received within %d seconds)"
+msgstr[0] "與伺服器失去連線（%d 秒內收不到任何資料）"
+msgstr[1] "與伺服器失去連線（%d 秒內收不到任何資料）"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5642,9 +5798,13 @@ msgstr "即時訊息的好友"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）"
+msgstr[0] "從伺服器新增或更新了 %d 個好友（包括伺服器上已在好友清單上的好友）"
+msgstr[1] "從伺服器新增或更新了 %d 個好友（包括伺服器上已在好友清單上的好友）"
 
 msgid "Add contacts from server"
 msgstr "從伺服器加入聯絡人"
@@ -6119,6 +6279,7 @@ msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6274,11 +6435,11 @@ msgstr "權限不夠"
 msgid "In local permit/deny"
 msgstr "本地端的允許／拒絕清單"
 
-msgid "Too evil (sender)"
-msgstr "太邪惡了（寄件人）"
+msgid "Warning level too high (sender)"
+msgstr "（發訊者）警告等級過高"
 
-msgid "Too evil (receiver)"
-msgstr "太邪惡了（收件人）"
+msgid "Warning level too high (receiver)"
+msgstr "（收訊者）警告等級過高"
 
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
@@ -6366,7 +6527,7 @@ msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
 msgid "Trillian Encryption"
-msgstr "Trillian 加密"
+msgstr "Trillian 式加密"
 
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
@@ -6393,19 +6554,28 @@ msgstr "動態視訊"
 msgid "Camera"
 msgstr "照相機"
 
+# XXX 20080810 畫面分享 (Apple) / 螢幕共享 / 螢幕分享
+msgid "Screen Sharing"
+msgstr "螢幕共享"
+
+#, c-format
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
+#, c-format
 msgid "Not Available"
 msgstr "長時間離開"
 
+#, c-format
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#, c-format
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
+#, c-format
 msgid "Invisible"
 msgstr "隱身"
 
@@ -6438,11 +6608,11 @@ msgid "Username sent"
 msgstr "已送出使用者名稱"
 
 msgid "Connection established, cookie sent"
-msgstr "連線已建立，並已送出 Cookie"
+msgstr "成功建立連線，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
-msgstr "完成連線"
+msgstr "完成連線中"
 
 #, c-format
 msgid ""
@@ -6458,7 +6628,7 @@ msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
 msgid "Incorrect password."
-msgstr "錯誤的密碼。"
+msgstr "密碼錯誤。"
 
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -6466,6 +6636,7 @@ msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#  NOTE 20080810 - cnscode.org.tw 譯「unavailable」為「不可用」
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
@@ -6479,7 +6650,6 @@ msgstr ""
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
@@ -6521,10 +6691,11 @@ msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
 msgid "Unable to get a valid login hash."
-msgstr "無法取得有效的登入碼。"
+msgstr "無法取得有效的登入雜湊。"
 
+#. allow multple logins?
 msgid "Password sent"
-msgstr "密碼送出"
+msgstr "成功送出密碼"
 
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
@@ -6632,14 +6803,17 @@ msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 
 #, 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."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 
@@ -6672,9 +6846,6 @@ msgstr "上線自"
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-msgid "Available Message"
-msgstr "尚有訊息"
-
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
@@ -6683,7 +6854,7 @@ msgstr "您的 AIM 可能斷線了。"
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
-msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」"
+msgstr "（無法顯示來自這個使用者的訊息，因為它包含了無效字元。）"
 
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6702,12 +6873,17 @@ msgstr "行動電話"
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "其他資訊"
 
 msgid "Zip Code"
 msgstr "郵遞區號"
 
+msgid "Work Information"
+msgstr "工作資訊"
+
 msgid "Division"
 msgstr "部門"
 
@@ -6717,9 +6893,6 @@ msgstr "職位"
 msgid "Web Page"
 msgstr "網頁"
 
-msgid "Work Information"
-msgstr "工作資訊"
-
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
@@ -6915,13 +7088,6 @@ msgstr "頻道號碼(_E)："
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-msgid "Away Message"
-msgstr "離開訊息"
-
-# XXX 好像不對，又好像沒問題
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(搜尋中)</i>"
-
 #  NOTE 蘋果自己的中文網站只寫「iTunes Store」（英文）了事 :P
 #  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
@@ -7002,6 +7168,7 @@ msgstr "以電子郵件地址來找尋好友"
 msgid "Search for a buddy by email address"
 msgstr "使用電子郵件地址搜尋好友"
 
+# XXX not exact
 msgid "Type the email address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
@@ -7049,6 +7216,9 @@ msgstr ""
 "務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸及\n"
 "直接的即時訊息（較慢，但不會暴露您的 IP 位址）"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "允許同時多次登入"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
@@ -7057,6 +7227,7 @@ msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s:%hu。"
 
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過代理伺服器連線。"
 
@@ -7355,13 +7526,6 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。"
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "代碼 0x%02X：%s"
-
-msgid "Group Operation Error"
-msgstr "群組操作錯誤"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "允許這個要求？"
@@ -7392,22 +7556,6 @@ msgstr "系統訊息"
 msgid "Failed to send IM."
 msgstr "送出即時訊息失敗。"
 
-msgid "Keep alive error"
-msgstr "Keep Alive 錯誤"
-
-msgid "Error requesting login token"
-msgstr "取得登入符記途中發生錯誤"
-
-msgid "Unable to login. Check debug log."
-msgstr "無法登入，請檢查除錯記錄。"
-
-msgid "Unable to login"
-msgstr "無法登入"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "無法連結。"
-
 # XXX 問題：
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
 # XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
@@ -7419,15 +7567,46 @@ msgstr "無法連結。"
 msgid "Unknown-%d"
 msgstr "未知（代碼 %d）"
 
-msgid "TCP Address"
-msgstr "TCP 位址"
-
-msgid "UDP Address"
-msgstr "UDP 位址"
-
 #  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
+#  XXX 現在似乎叫「等級」，參閱http://vip.qq.com/freedom/freedom_vipgrade.html
 msgid "Level"
-msgstr "成長階段"
+msgstr "等級"
+
+# XXX 20080810 acli - 不知這是什麼，因為QQ的會員等級制中，「會員」等同「VIP」，所以不知何謂「Member」
+# XXX 20080810 acli - 但原始碼中「Member」字串似乎是一定出現的，所以似乎應該是指「用戶」
+msgid "Member"
+msgstr "用戶"
+
+# NOTE QQ官方網站寫「VIP」（沒有官方中文名稱）
+msgid " VIP"
+msgstr " VIP"
+
+msgid " TCP"
+msgstr " TCP"
+
+#, fuzzy
+msgid " FromMobile"
+msgstr " 使用行動裝置"
+
+#, fuzzy
+msgid " BindMobile"
+msgstr " 綁定行動裝置"
+
+#, fuzzy
+msgid " Video"
+msgstr " 視訊"
+
+#, fuzzy
+msgid " Space"
+msgstr " Space"
+
+# FIXME 20080810 acli - 這是很差的譯文，但原文太差了，沒辦法
+msgid "Flag"
+msgstr "旗標"
+
+# NOTE 20080810 acli - 這只是除錯用的，其實可以不譯
+msgid "Ver"
+msgstr "版本"
 
 msgid "Invalid name"
 msgstr "名稱無效"
@@ -7442,12 +7621,17 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
+# XXX 20080810 acli - 是否「確實」位址？
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>伺服器真實位址：</b>%s：%d<br>\n"
 
 # XXX - 20061027
 #, c-format
@@ -7499,14 +7683,100 @@ msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
 msgid "Connect using TCP"
-msgstr "使用 TCP 連結"
+msgstr "使用 TCP 連線"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "resend interval(s)"
+msgstr "每隔多少秒重覆送出"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "Keep alive interval(s)"
+msgstr "每隔多少秒送出 Keep Alive"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+msgid "Update interval(s)"
+msgstr "每隔多少秒更新"
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "標題無效"
+
+# XXX 20080810 acli - 譯文有待改進，原文也是
+#, fuzzy
+msgid "Keep alive error"
+msgstr "每隔多少秒送出 Keep Alive"
+
+msgid "Failed to connect server"
+msgstr "無法連線到伺服器"
 
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"與伺服器之間的連線突然中斷：\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
+msgid "Write Error"
+msgstr "寫入錯誤"
+
+msgid "Connection lost"
+msgstr "連線中斷"
+
+msgid "Couldn't resolve host"
+msgstr "無法解析主機"
+
+msgid "hostname is NULL or port is 0"
+msgstr "主機名稱數值為 NULL 或通訊埠數值為 0"
+
+#  XXX 20080810 acli - 原文好像有問題
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "連線伺服器 %s 中，將會嘗試 %d 次"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "無法連線。"
+
+msgid "Could not resolve hostname"
+msgstr "無法解析主機"
+
+msgid "Unable to login. Check debug log."
+msgstr "無法登入，請檢查除錯記錄。"
+
+msgid "Unable to login"
+msgstr "無法登入"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+# FIXME 譯文有待改進  - 20070912 acli
+#, fuzzy
+msgid "Failed room reply"
+msgstr "登入失敗，沒有回應"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "您 [%d] 已經被加入群組 \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d 拒絕了檔案「%s」"
@@ -7518,13 +7788,6 @@ msgstr "傳送檔案"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-msgid "Connection lost"
-msgstr "連線中斷"
-
-# FIXME 譯文有待改進  - 20070912 acli
-msgid "Login failed, no reply"
-msgstr "登入失敗，沒有回應"
-
 msgid "Do you want to add this buddy?"
 msgstr "您要加入這個使用者到好友清單中嗎？"
 
@@ -7562,6 +7825,14 @@ msgstr "訊息：%s"
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "自 %s 發佈的通告"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "連線關閉（寫入）"
 
@@ -8158,6 +8429,7 @@ msgstr "<br><b>頻道身份驗證代碼 (HMAC)：</b>%s"
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>頻道主題：</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式：</b>"
 
@@ -8182,6 +8454,7 @@ msgstr "頻道密碼"
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8574,9 +8847,15 @@ msgstr "無法初始化 SILC 協定"
 msgid "Error loading SILC key pair"
 msgstr "讀取 SILC 密鑰對途中出現錯誤"
 
+# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息（quit message），ui_name通常就是「pidgin」
+#, c-format
+msgid "Download %s: %s"
+msgstr "下載 %s，請瀏覽 %s"
+
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
+#, c-format
 msgid "Normal"
 msgstr "正常"
 
@@ -8956,35 +9235,45 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗：遠端不信任／不支援您的公鑰"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗：遠端不支援建議中的密鑰交換群組 (KE group)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗：遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗：遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗：遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗：遠端不支援建議中的身份驗證代碼 (HMAC)"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "失敗：錯誤的簽章"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
@@ -9011,12 +9300,6 @@ msgstr "不明的伺服器回應。"
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-msgid "Couldn't resolve host"
-msgstr "無法解析主機"
-
-msgid "Could not resolve hostname"
-msgstr "無法解析主機"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -9086,6 +9369,7 @@ msgstr "%s 目前並未登入。"
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄，因為您達到了伺服器所限制的發送速度。"
 
@@ -9105,32 +9389,41 @@ msgstr "您遺失了一個由 %s 送來的訊息，因為它太大了。"
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
 
+#, c-format
 msgid "Failure."
 msgstr "失敗。"
 
+#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
+#, c-format
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
+#, c-format
 msgid "Email lookup restricted."
-msgstr "禁止 Email 檢查。"
+msgstr "禁止 E-Mail 檢查。"
 
+#, c-format
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
+#, c-format
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
+#, c-format
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
+#, c-format
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
@@ -9138,17 +9431,21 @@ msgstr "這個國家不被支援。"
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因：%s。"
 
+#, c-format
 msgid "Incorrect username or password."
 msgstr "錯誤的帳號或密碼。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高，以致無法登入。"
 
+#, c-format
 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."
@@ -9467,9 +9764,6 @@ msgstr "無法建立檔案介紹。"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 提出一次過傳送 %d 個檔案。\n"
 
-msgid "Write Error"
-msgstr "寫入錯誤"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
@@ -9783,6 +10077,14 @@ msgstr "解析 %s 途中發生了錯誤"
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "要求 %s 的注意中..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s 要求您注意！"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9813,14 +10115,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "要求 %s 的注意中..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s 要求您注意！"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9835,6 +10129,21 @@ msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "捷徑"
+
+msgid "The text-shortcut for the smiley"
+msgstr "與表情相關的文字捷徑"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "已儲存的圖像"
+
+# FIXME 20080810 acli - 我覺得我譯錯了，但不知其實這是什麼意思
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "已儲存（而目前會使用）的圖像"
+
 # FIXME ambiguous - 20061025
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
@@ -9894,6 +10203,12 @@ msgstr "+++ %s 變更狀態為閒置"
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9987,22 +10302,31 @@ msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "連線被電腦上的其他軟體中斷。"
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "遠端主機關閉了連線。"
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "連線已逾時"
 
 # XXX - 20061027
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "連線被拒。"
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "位址已在使用中"
+
 msgid "Internet Messenger"
 msgstr "網路即時通"
 
@@ -10115,8 +10439,8 @@ msgstr "新增帳號"
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-msgid "Create this new account on the server"
-msgstr "在伺服器上建立這個新帳號"
+msgid "Create _this new account on the server"
+msgstr "在伺服器上建立這個新帳號(_T)"
 
 msgid "_Advanced"
 msgstr "進階設定(_A)"
@@ -10213,6 +10537,12 @@ msgstr "別名(_A)..."
 msgid "_Remove"
 msgstr "移除(_R)"
 
+msgid "Set Custom Icon"
+msgstr "設定自訂圖示"
+
+msgid "Remove Custom Icon"
+msgstr "移除自定圖示"
+
 msgid "Add _Buddy..."
 msgstr "新增好友(_B)..."
 
@@ -10316,7 +10646,7 @@ msgstr "/好友/結束程式(_Q)"
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-msgid "/Accounts/Manage"
+msgid "/Accounts/Manage Accounts"
 msgstr "/帳號/管理"
 
 #. Tools
@@ -10338,6 +10668,9 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
+msgid "/Tools/Smile_y"
+msgstr "/工具/表情(_Y)"
+
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
@@ -10502,14 +10835,14 @@ 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->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>歡迎使用 %s!</span>\n"
 "\n"
 "您未有啟動任何帳號，請透過好友清單上的「帳號->管理」指令，到「帳號清單」啟動"
-"帳號。帳號一經啟動，就隨時可以登入或變更狀態；這樣，您就可以跟您的好友通訊"
-"了！"
+"即時訊息帳號。帳號一經啟動，就隨時可以登入或變更狀態；這樣，您就可以跟您的好"
+"友通訊了！"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10567,6 +10900,13 @@ msgstr "關閉視窗時只將聊天隱藏(_H)。"
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
+msgid "Enable Account"
+msgstr "啟動帳號"
+
+# XXX
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/帳號/啟動帳號"
+
 # XXX
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
@@ -10583,13 +10923,6 @@ msgstr "沒有相關指令"
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-msgid "Enable Account"
-msgstr "啟動帳號"
-
-# XXX
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/帳號/啟動帳號"
-
 msgid "/Tools"
 msgstr "/工具"
 
@@ -10676,9 +11009,6 @@ msgstr "自定圖示..."
 msgid "Change Size"
 msgstr "更改大小"
 
-msgid "Remove Custom Icon"
-msgstr "移除自定圖示"
-
 msgid "Show All"
 msgstr "全部顯示"
 
@@ -10956,12 +11286,13 @@ msgstr "錯誤訊息"
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-msgid "lead developer"
-msgstr "主要開發者"
-
 msgid "developer"
 msgstr "開發者"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "張家興"
+
 msgid "support"
 msgstr "支援"
 
@@ -10993,6 +11324,9 @@ msgstr "XMPP 開發者"
 msgid "original author"
 msgstr "原作者"
 
+msgid "lead developer"
+msgstr "主要開發者"
+
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -11158,6 +11492,9 @@ msgstr "荷蘭文／法蘭德斯文"
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
+msgid "Occitan"
+msgstr "奧西坦文"
+
 msgid "Punjabi"
 msgstr "旁遮普文"
 
@@ -11266,6 +11603,7 @@ msgstr ""
 "作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程"
 "式恕不提供任何保用。<BR><BR>"
 
+#, c-format
 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>"
@@ -11417,23 +11755,35 @@ msgstr "移除聊天室(_R)"
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-msgid "Change Status"
-msgstr "變更狀態"
+msgid "_Change Status"
+msgstr "變更狀態(_C)"
+
+msgid "Show Buddy _List"
+msgstr "顯示好友清單(_L)"
 
-msgid "Show Buddy List"
-msgstr "顯示好友清單"
+msgid "_Unread Messages"
+msgstr "未讀訊息(_U)"
 
-msgid "New Message..."
-msgstr "新訊息..."
+msgid "New _Message..."
+msgstr "新訊息(_M)..."
+
+msgid "_Accounts"
+msgstr "帳號(_A)"
 
-msgid "Mute Sounds"
-msgstr "靜音"
+msgid "Plu_gins"
+msgstr "模組清單(_G)"
 
-msgid "Blink on New Message"
-msgstr "有新訊息時閃動"
+msgid "Pr_eferences"
+msgstr "偏好設定(_E)"
 
-msgid "Quit"
-msgstr "結束程式"
+msgid "Mute _Sounds"
+msgstr "靜音(_S)"
+
+msgid "_Blink on New Message"
+msgstr "有新訊息時閃動(_B)"
+
+msgid "_Quit"
+msgstr "結束程式(_Q)"
 
 #  NOTE 這是指「未開始」傳輸檔案，不是「未啟動」
 msgid "Not started"
@@ -11499,6 +11849,14 @@ msgstr "清除已完成的傳輸(_C)"
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
+#. Pause button
+msgid "_Pause"
+msgstr "暫停(_P)"
+
+#. Resume button
+msgid "_Resume"
+msgstr "恢復(_R)"
+
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -11507,7 +11865,7 @@ msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "在選擇的範圍內停用表情(_S)"
 
 msgid "Hyperlink color"
 msgstr "連結顏色"
@@ -11534,16 +11892,23 @@ msgid "Color to draw the name of a message you received."
 msgstr "收到訊息時，用來顯示對方帳號的顏色。"
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "「請您注意」的帳號顏色"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "收到訊息內含有自己名稱的訊息時，用來顯示對方帳號的顏色。"
+msgstr "收到訊息內含有自己的名稱時，用來顯示對方帳號的顏色。"
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "動作訊息帳號顏色"
 
 msgid "Color to draw the name of an action message."
+msgstr "收到的訊息是代表對方發出的一個動作時，用來顯示對帳號的顏色。"
+
+msgid "Action Message Name Color for Whispered Message"
 msgstr ""
+"收到的訊息是對方以「輕聲的說」這種動作發出的訊息時，用來顯示對方帳號的顏色"
+
+msgid "Whisper Message Name Color"
+msgstr "輕聲訊息帳號顏色"
 
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
@@ -11613,9 +11978,14 @@ msgstr ""
 msgid "Save Image"
 msgstr "儲存影像"
 
+#, c-format
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "插入自訂表情(_A)..."
+
 msgid "Select Font"
 msgstr "選擇字型"
 
@@ -11652,9 +12022,20 @@ msgstr "無法儲存影像：%s\n"
 msgid "Insert Image"
 msgstr "插入影像"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"這個表情已被停用，因為相關的捷徑已有一個自訂表情：\n"
+" %s"
+
 msgid "Smile!"
 msgstr "笑一個！"
 
+msgid "_Manage custom smileys"
+msgstr "管理自訂表情(_M)"
+
 #  XXX 譯文不通順
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
@@ -12060,7 +12441,7 @@ msgid "Icon"
 msgstr "圖示"
 
 msgid "Keyboard Shortcuts"
-msgstr "鍵盤㨗徑"
+msgstr "鍵盤捷徑"
 
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
@@ -12147,7 +12528,7 @@ msgid "Minimi_ze new conversation windows"
 msgstr "最小化所有新交談視窗(_Z)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "文字輸入區的最少行數："
 
 msgid "Font"
 msgstr "字型"
@@ -12312,21 +12693,27 @@ msgstr "記錄所有狀態改變至系統日誌(_S)"
 msgid "Sound Selection"
 msgstr "選取音效"
 
+#, c-format
 msgid "Quietest"
 msgstr "最小聲"
 
+#, c-format
 msgid "Quieter"
 msgstr "再小聲"
 
+#, c-format
 msgid "Quiet"
 msgstr "小聲"
 
+#, c-format
 msgid "Loud"
 msgstr "大聲"
 
+#, c-format
 msgid "Louder"
 msgstr "再大聲"
 
+#, c-format
 msgid "Loudest"
 msgstr "最大聲"
 
@@ -12359,6 +12746,12 @@ msgstr "音量："
 msgid "Play"
 msgstr "播放"
 
+msgid "_Browse..."
+msgstr "瀏覽(_B)..."
+
+msgid "_Reset"
+msgstr "重置(_R)"
+
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
@@ -12531,6 +12924,46 @@ msgstr "儲存並使用(_V)"
 msgid "Status for %s"
 msgstr "狀態：%s"
 
+msgid "Custom Smiley"
+msgstr "自訂表情"
+
+msgid "Duplicate Shortcut"
+msgstr "重覆的表情定義"
+
+# XXX 20080810 acli - 暫譯
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr "給定的捷徑已有相關的自訂表情，請指定另一個捷徑。"
+
+msgid "More Data needed"
+msgstr "需要進一步的資料"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "請給這個表情給定一個相關的捷徑。"
+
+msgid "Please select an image for the smiley."
+msgstr "請給這個表情選擇一個圖像。"
+
+msgid "Edit Smiley"
+msgstr "修改表情"
+
+msgid "Add Smiley"
+msgstr "新增表情"
+
+msgid "Smiley _Image"
+msgstr "表情圖像(_I)"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "表情捷徑(_H)"
+
+msgid "Smiley"
+msgstr "表情"
+
+msgid "Custom Smiley Manager"
+msgstr "自訂表情管理"
+
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
@@ -12666,9 +13099,6 @@ msgstr "修改(_M)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-msgid "_Pause"
-msgstr "暫停(_P)"
-
 #  FIXME Tooltip中文怎寫？
 msgid "Pidgin Tooltip"
 msgstr "Pidgin Tooltip"
@@ -12688,9 +13118,6 @@ msgstr "不使用表情圖示，選擇這個主題即可。"
 msgid "none"
 msgstr "無"
 
-msgid "Display Statistics"
-msgstr "顯示統計資料"
-
 msgid "Response Probability:"
 msgstr "「回答」或然率："
 
@@ -13286,6 +13713,7 @@ msgstr "通知視窗 (Notify Dialog)"
 msgid "Select Color"
 msgstr "選擇顏色"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
@@ -13514,6 +13942,7 @@ msgstr "每隔 N 分鐘顯示 iChat 風格的時間戳記。"
 msgid "Timestamp Format Options"
 msgstr "時間戳記格式選項"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "強制使用24小時制時間格式(_F)"
 
@@ -13684,20 +14113,57 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#. feel free to not translate this
-#: ../pidgin/gtkdialogs.c:77
-msgid "Ka-Hing Cheung"
-msgstr "張家興"
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "代碼 0x%02X：%s"
 
-#~ msgid "_Resume"
-#~ msgstr "恢復(_R)"
+#~ msgid "Group Operation Error"
+#~ msgstr "群組操作錯誤"
+
+#~ msgid "Error setting socket options"
+#~ msgstr "設定 Socket 選項時錯誤"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr "Windows Live ID 認證：在伺服器傳來的回應無法找到認證符記"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Windows Live ID 認證失敗"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "太邪惡了（寄件人）"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "太邪惡了（收件人）"
+
+#~ msgid "Available Message"
+#~ msgstr "尚有訊息"
+
+#~ msgid "Away Message"
+#~ msgstr "離開訊息"
+
+# XXX 好像不對，又好像沒問題
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(搜尋中)</i>"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "取得登入符記途中發生錯誤"
+
+#~ msgid "TCP Address"
+#~ msgstr "TCP 位址"
+
+#~ msgid "UDP Address"
+#~ msgstr "UDP 位址"
+
+#~ msgid "E-Mail"
+#~ msgstr "電子郵件"
+
+#~ msgid "E-mail"
+#~ msgstr "電子郵件"
 
 #~ msgid "Screen name:"
 #~ msgstr "帳號："
 
-#~ msgid "Screen Name"
-#~ msgstr "帳號"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "有人在聊天室中提到您的名字"
 
@@ -13788,15 +14254,8 @@ msgstr "張家興"
 #~ msgid "User has typed something and stopped"
 #~ msgstr "對方輸入了一些東西，不過暫停了"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "%s has typed something and stopped"
-#~ msgstr "對方輸入了一些東西，不過暫停了"
-
-#, fuzzy
-#~ msgid "S_mile!"
-#~ msgstr "笑一個！"
+#~ msgid "Display Statistics"
+#~ msgstr "顯示統計資料"
 
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s 從「%s」狀態改變為「%s」"
@@ -13870,10 +14329,6 @@ msgstr "張家興"
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "/帳號(_A)/新增\\/編輯"
 
-#  XXX
-#~ msgid "_Smiley"
-#~ msgstr "笑一個！(_S)"
-
 #~ msgid "Conversation History"
 #~ msgstr "交談歷史"